Removing Suite classes, condensing group interfaces