Organize imports in GeoCollect module