Re-organized namespaces