Re-organising templates with includes.