Updates to structure of templates and overall app structure