move models and scripts to module
fix failing tests
Merge branch 'develop' into batch-ingest