restructuring JSON again