Some minor changes to templates structure.