Reorganize

Kind of a big change, so I'm pull-requesting it and such.