Refactor movie importer