Updated JSON format; changes to files to reflect change.