Refactoring of namespaces