Reorganized python ingest module infrastructure classes