Prepare for new build system