Refactor importer application.