Further namespace refactoring.