Rearrange a bunch of stuff, and start working on new bits