Restructured namespaces