Reorganize tiny templates