Moved around some gems to different groups