Namespace refactoring