CMS-2730 Site Templates - Adjustments to folder structure