more namespace re-org

I left this a few separate commits because I thought it would be cleaner/easier to review that way.