Namespace refactorings
Final refactorings for namespaces