moved templates into different namespaces