[CLEANUP] ImportExport classes