namespace refactoring