Reworking Build Script