Moving around templates to suit kalite conventions

It should be automatically mergeable. 
Do test it out once before merging.