Changed build directory structure around to make it easier to migrate data for comparison.