Reorganised templates