data-import refactoring phase-3 + controller, WIP