Move JSON to /data/ folder and minor changes