Data json

refactor code to take in reformatted json
Resolve merge conflict after changing the data.json format