JSON simplified

Data arrangement has been set in order to make easier data retrieval