reorganized templates