Namespace re-org