Cleanup
Add grouping fold
Update json loader
Add missing deps
Add criterion