Rework json format

is this my final form?