Refactor groups, update CHANGELOG.