cleaning up class groups

Signed-off-by: James Molet <jmolet@redhat.com>