Changed the organization of the templates directory