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

dimagi/javarosa,dimagi/javarosa,dimagi/javarosa