Split up a bunch of files

And a few other immediate pre-launch changes