Namespace refactoring after restructuring