Changed template folder structure