Use new exporter and importer and remove old ones.
Fixed broken tests.