Replaced all ordered pair classes with a unified OrderedPair class