Change handling of the template folder location