Reformed the json structure

Fixes #1