Move the pair classes into their own package.
Rename the PairN classes to more intuitive names.