namespaces refactoring