Refactorings and reorganized namespaces