Re-organised template structure