Reorganize namespaces.