The Great Refactoring II: Namespaces