Add separate pair.{h,cpp} file, and refactor type/types.cpp into nothingness
Remove now-empty types.cpp file
Actually track newly created pair.cpp file