Neatened up and separated build script.