Namespaces refactoring