Updated Json Structure for SOR

These changes keep the old structure as well, to ensure it doesn’t
break anything.