CHG: Changed the structure for apps and templates
Merge pull request #1 from damianpv/feature-structure

CHG: Changed the structure for apps and templates