Refactoring of Namespaces