Make JSON more like the standardised JSON structure

- Move non-standard bits into "details" hash
- I've left out anything we're not currently using