V0.9.6: move groupId up one level (to standard spot).