REP-188 refactored main importer using classes