Refactoring namespaces.