Move stuff around, and split out the different phases of the build