Consolidate JSON files

Closes #29