Reorganize namespaces