Reorganized batch ingest toolset to work in a more unified manner