Rework JSON structure.