completing work in refactor of the build system