Edits the json results to match the new hierarchy

Moves the lvac xc results into one file as well
Moves the National Senior results into one file