Updated to new build script layout