Finished JSON conversions and updated sample JSON files accordingly.