diff --git a/src/plugins/ExportXml.py b/src/plugins/export/ExportXml.py
similarity index 100%
rename from src/plugins/ExportXml.py
rename to src/plugins/export/ExportXml.py
diff --git a/src/plugins/export/Makefile.am b/src/plugins/export/Makefile.am
index b0f608499..1f2a7ba15 100644
--- a/src/plugins/export/Makefile.am
+++ b/src/plugins/export/Makefile.am
@@ -13,7 +13,8 @@ pkgdata_PYTHON = \
 	ExportGeneWeb.py \
 	ExportPkg.py \
 	ExportVCalendar.py \
-	ExportVCard.py
+	ExportVCard.py \
+	ExportXml.py
 
 pkgpyexecdir = @pkgpyexecdir@/plugins/export
 pkgpythondir = @pkgpythondir@/plugins/export
diff --git a/src/plugins/ImportGpkg.py b/src/plugins/import/ImportGpkg.py
similarity index 100%
rename from src/plugins/ImportGpkg.py
rename to src/plugins/import/ImportGpkg.py
diff --git a/src/plugins/ImportXml.py b/src/plugins/import/ImportXml.py
similarity index 100%
rename from src/plugins/ImportXml.py
rename to src/plugins/import/ImportXml.py
diff --git a/src/plugins/import/Makefile.am b/src/plugins/import/Makefile.am
index 394fc29cc..21aa3c8fe 100644
--- a/src/plugins/import/Makefile.am
+++ b/src/plugins/import/Makefile.am
@@ -9,9 +9,11 @@ pkgdata_PYTHON = \
 	ImportCsv.py \
 	ImportGedcom.py \
 	ImportGeneWeb.py \
+	ImportGpkg.py \
 	ImportGrdb.py \
 	ImportProGen.py \
-	ImportVCard.py
+	ImportVCard.py \
+	ImportXml.py
 
 pkgpyexecdir = @pkgpyexecdir@/plugins/import
 pkgpythondir = @pkgpythondir@/plugins/import