Rework Build System Aug 11