[WIP] Reorganize

Reorganizing the namespace a bit. Disruptive to the layout of the code, but from a user perspective the changes shouldn't be too much.