initial cleanup and refactoring for the importer overhaul
overhaul wip