json restructured
Merge pull request #54 from ipeirotis/TROIA-287_json_restructured

json restructured