Reorganize template sections