separate Point, Vector from Geometry
more reorganization