Re-organised templates.