Simple Reorg

Moved some things around so that the repo can be pushed into the main one easily.