Refactor Ingest, preparing for GDAL ingest.