reorganized namespaces