reorganized ingest scripts