Refactoring namespaces