Reorganize to match problem "locations."