Refactored namespaces
Updated templates