namespaces refactored