Build Script Improvements

This does a little refactoring of the main build script to better organize the steps and see build times.