Reorganised the template.