Move Pair to util package