Refactored old code
Added JSON file to project