buildscript overhaul