Move categories into a group.
All the tests pass!