Reorganize importer/exporter to a single directory; update submodule.