Pair and NeighborhoodVector moved to index package