More namespace refactoring