Reorganization

Moved some packages around. It's not quite complete but the submodules are causing a lot of problems. I want to see if a PR helps at all.