Grouping commits

Complete refactor for a new format and better useage