move geom2d and geom3d to new package