data-import phase-3 refactoring begin; WIP commit for DataImporter