Build Scripts: Version 2 - Update to overall format