Importer refactor

fist draft at orphan_importer refactor