Reorganize template files and includes.