Reorg class into a group