Reorganized templates.