Change all the JSON

I'll do the other modules later, but this is all we need for today's deployment and I'm sad with how our tests work.