Change templates structure