Reshuffle DataImport code as preparation for cleaner interaction with the importer