Make the buildscript more modular