Remove json-fix.el, and improve structure of archive.json

Fixes #1743