Code to covert old separate-file results to current format