Reorganize templates