JSON Importer fixes

This PR updates the JSONImporter to follow the changes made to have the groups ordered.

This means we have to update the few JSON files we ship with the project.