Moving templates to where they belong