ENH: New-style class
REF: Refactor grouping class
TST: Test grouping class