Geometry classes to structs p2d and s2d renamed