reorganize namespaces