Standardise on JSON

Also fix the copyrights