New grouping for the m4, regenerated json and updated the grouping tool