[r322] [branches/dev] Final restructure, making sure that conventions are followed
[r322] [branches/dev] Final restructure, making sure that conventions are followed

Jonathan727/javarosa,Jonathan727/javarosa,Jonathan727/javarosa