Reorder command mappings and groupings