Moved Templating folder from Core
Adjust namespaces