diff --git a/po/POTFILES.in b/po/POTFILES.in
index d0d3b30a2..d572d8b83 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -239,17 +239,7 @@ src/plugins/AgeStats.py
 src/plugins/BookReport.py
 src/plugins/Calendar.py
 src/plugins/ExportCd.py
-src/plugins/ExportCsv.py
-src/plugins/ExportFtree.py
-src/plugins/ExportGedcom.py
-src/plugins/ExportGeneWeb.py
-src/plugins/ExportPkg.py
-src/plugins/ExportVCalendar.py
-src/plugins/ExportVCard.py
 src/plugins/ExportXml.py
-src/plugins/GVFamilyLines.py
-src/plugins/GVHourGlass.py
-src/plugins/GVRelGraph.py
 src/plugins/ImportCsv.py
 src/plugins/ImportGedcom.py
 src/plugins/ImportGeneWeb.py
@@ -269,6 +259,15 @@ src/plugins/drawreport/FanChart.py
 src/plugins/drawreport/StatisticsChart.py
 src/plugins/drawreport/TimeLine.py
 
+# plugins/export directory
+src/plugins/export/ExportCsv.py
+src/plugins/export/ExportFtree.py
+src/plugins/export/ExportGedcom.py
+src/plugins/export/ExportGeneWeb.py
+src/plugins/export/ExportPkg.py
+src/plugins/export/ExportVCalendar.py
+src/plugins/export/ExportVCard.py
+
 # plugins/gramplet directory
 src/plugins/gramplet/AttributesGramplet.py
 src/plugins/gramplet/DefaultGramplets.py
@@ -277,6 +276,11 @@ src/plugins/gramplet/GivenNameGramplet.py
 src/plugins/gramplet/NoteGramplet.py
 src/plugins/gramplet/WhatsNext.py
 
+# plugins/graph directory
+src/plugins/graph/GVFamilyLines.py
+src/plugins/graph/GVHourGlass.py
+src/plugins/graph/GVRelGraph.py
+
 # plugins/quickview directory
 src/plugins/quickview/AgeOnDate.py
 src/plugins/quickview/all_events.py
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index eaa122621..312732096 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -22,14 +22,6 @@ pkgdata_PYTHON = \
 	DetAncestralReport.py\
 	DetDescendantReport.py\
 	EndOfLineReport.py\
-	ExportCd.py\
-	ExportCsv.py\
-	ExportFtree.py\
-	ExportGedcom.py\
-	ExportGeneWeb.py\
-	ExportPkg.py\
-	ExportVCalendar.py\
-	ExportVCard.py\
 	ExportXml.py\
 	FamilyGroup.py\
 	ImportCsv.py\
diff --git a/src/plugins/ExportCd.py b/src/plugins/export/ExportCd.py
similarity index 100%
rename from src/plugins/ExportCd.py
rename to src/plugins/export/ExportCd.py
diff --git a/src/plugins/ExportCsv.glade b/src/plugins/export/ExportCsv.glade
similarity index 100%
rename from src/plugins/ExportCsv.glade
rename to src/plugins/export/ExportCsv.glade
diff --git a/src/plugins/ExportCsv.py b/src/plugins/export/ExportCsv.py
similarity index 100%
rename from src/plugins/ExportCsv.py
rename to src/plugins/export/ExportCsv.py
diff --git a/src/plugins/ExportFtree.glade b/src/plugins/export/ExportFtree.glade
similarity index 100%
rename from src/plugins/ExportFtree.glade
rename to src/plugins/export/ExportFtree.glade
diff --git a/src/plugins/ExportFtree.py b/src/plugins/export/ExportFtree.py
similarity index 100%
rename from src/plugins/ExportFtree.py
rename to src/plugins/export/ExportFtree.py
diff --git a/src/plugins/ExportGedcom.py b/src/plugins/export/ExportGedcom.py
similarity index 100%
rename from src/plugins/ExportGedcom.py
rename to src/plugins/export/ExportGedcom.py
diff --git a/src/plugins/ExportGeneWeb.glade b/src/plugins/export/ExportGeneWeb.glade
similarity index 100%
rename from src/plugins/ExportGeneWeb.glade
rename to src/plugins/export/ExportGeneWeb.glade
diff --git a/src/plugins/ExportGeneWeb.py b/src/plugins/export/ExportGeneWeb.py
similarity index 100%
rename from src/plugins/ExportGeneWeb.py
rename to src/plugins/export/ExportGeneWeb.py
diff --git a/src/plugins/ExportPkg.py b/src/plugins/export/ExportPkg.py
similarity index 100%
rename from src/plugins/ExportPkg.py
rename to src/plugins/export/ExportPkg.py
diff --git a/src/plugins/ExportVCalendar.glade b/src/plugins/export/ExportVCalendar.glade
similarity index 100%
rename from src/plugins/ExportVCalendar.glade
rename to src/plugins/export/ExportVCalendar.glade
diff --git a/src/plugins/ExportVCalendar.py b/src/plugins/export/ExportVCalendar.py
similarity index 100%
rename from src/plugins/ExportVCalendar.py
rename to src/plugins/export/ExportVCalendar.py
diff --git a/src/plugins/ExportVCard.glade b/src/plugins/export/ExportVCard.glade
similarity index 100%
rename from src/plugins/ExportVCard.glade
rename to src/plugins/export/ExportVCard.glade
diff --git a/src/plugins/ExportVCard.py b/src/plugins/export/ExportVCard.py
similarity index 100%
rename from src/plugins/ExportVCard.py
rename to src/plugins/export/ExportVCard.py
diff --git a/src/plugins/export/Makefile.am b/src/plugins/export/Makefile.am
new file mode 100644
index 000000000..028171106
--- /dev/null
+++ b/src/plugins/export/Makefile.am
@@ -0,0 +1,28 @@
+# This is the src/plugins/export level Makefile for Gramps
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/export
+
+pkgdata_PYTHON = \
+	ExportCd.py \
+	ExportCsv.py \
+	ExportFtree.py \
+	ExportGedcom.py \
+	ExportGeneWeb.py \
+	ExportPkg.py \
+	ExportVCalendar.py \
+	ExportVCard.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/export
+pkgpythondir = @pkgpythondir@/plugins/export
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));