reorganize templates