Rework the build system a bit