* namespace refactoring.