Reworked file structure for templates