refactoring namespaces