Changed template file structure