gis: the geometry objects and collections were placed into these modules, missing in the last commit.