refactored namespaces