everything working with new template folder structure