Re-arranged namespaces.