Modernize the buildscript