Reorganizing the namespaces.