just a bunch of misc reorg stuff
fix import
Merge pull request #383 from SuperCowPowers/some_reorg

Some reorg