changed BulkImport and Import classes -- refactoring