Move templates to namespaced dirs