Move P2, T2 in TwoD.Types.

And T3 into ThreeD.Types.