Rearrange namespaces.