Make output JSON actually work with app
Improved JSON structure and file naming