reorganize namespaces (again)