Repo structure

Lots of moving things around, but things are much better in the end.