more namespace re-organization