Reorganized templates