refactoring of namespaces