Namespaces refactored and pruned