Reorganizing public templates.