namespace refactor