Reorganize some namespaces.