Template refactoring begins