reorganization of namespaces