CHG: Changed the structure for apps and templates