Namespace refactor