moving templates to packages