Consolidate the build system. There can be only 1!