refactoring of the etl process and some data model changes