Refactor importer

Thank you for yur contribution!