Reorganising templates.