Reformed the json structure

Addresses Issue #1