refactor importer into new files