Updated to new JSON structure and updated fields
Removed unused file