change json structure
Merge branch change-json-structure