Reorganised the template structure