diff --git a/po/POTFILES.in b/po/POTFILES.in
index ced432360..d4412dc03 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -242,7 +242,6 @@ src/plugins/ExportCd.py
 src/plugins/ExportXml.py
 src/plugins/ImportGpkg.py
 src/plugins/ImportXml.py
-src/plugins/NarrativeWeb.py
 src/plugins/Records.py
 src/plugins/WebCal.py
 
@@ -356,6 +355,9 @@ src/plugins/tool/SortEvents.py
 src/plugins/tool/SoundGen.py
 src/plugins/tool/Verify.py
 
+# plugins/webreport directory
+src/plugins/webreport/NarrativeWeb.py
+
 # PluginUtils package
 src/PluginUtils/_GuiOptions.py
 src/PluginUtils/_Options.py
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 660aa8a6b..8f0d807d7 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -5,50 +5,33 @@
 
 SUBDIRS = \
 	drawreport \
+	export \
 	gramplet \
+	graph \
+	import \
 	quickview \
 	rel \
-	tool
+	textreport \
+	tool \
+	webreport
 
 pkgdatadir = $(datadir)/@PACKAGE@/plugins
 
 pkgdata_PYTHON = \
 	AgeStats.py\
-	AncestorReport.py\
 	BookReport.py\
 	Calendar.py \
-	CustomBookText.py\
-	DescendReport.py\
-	DetAncestralReport.py\
-	DetDescendantReport.py\
-	EndOfLineReport.py\
 	ExportXml.py\
-	FamilyGroup.py\
 	ImportGpkg.py\
 	ImportXml.py\
-	IndivComplete.py\
-	KinshipReport.py\
-	MarkerReport.py\
-	NarrativeWeb.py\
-	NumberOfAncestorsReport.py\
-	PlaceReport.py\
 	Records.py\
-	SimpleBookTitle.py\
-	Summary.py\
 	WebCal.py\
-	WhatsNext.py
 
 pkgpyexecdir = @pkgpyexecdir@/plugins
 pkgpythondir = @pkgpythondir@/plugins
 
 GLADEFILES = \
-	book.glade\
-	ExportCsv.glade\
-	ExportFtree.glade\
-	ExportGeneWeb.glade\
-	ExportVCalendar.glade\
-	ExportVCard.glade\
-	ImportGedcom.glade
+	book.glade
 
 GRAPHICS = 
 
diff --git a/src/plugins/export/Makefile.am b/src/plugins/export/Makefile.am
index 028171106..b0f608499 100644
--- a/src/plugins/export/Makefile.am
+++ b/src/plugins/export/Makefile.am
@@ -18,6 +18,19 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/plugins/export
 pkgpythondir = @pkgpythondir@/plugins/export
 
+GLADEFILES = \
+	ExportCsv.glade \
+	ExportFtree.glade \
+	ExportGeneWeb.glade \
+	ExportVCalendar.glade \
+	ExportVCard.glade
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
 
diff --git a/src/plugins/ImportGedcom.glade b/src/plugins/import/ImportGedcom.glade
similarity index 100%
rename from src/plugins/ImportGedcom.glade
rename to src/plugins/import/ImportGedcom.glade
diff --git a/src/plugins/import/Makefile.am b/src/plugins/import/Makefile.am
index 3f0cff3c4..394fc29cc 100644
--- a/src/plugins/import/Makefile.am
+++ b/src/plugins/import/Makefile.am
@@ -16,6 +16,15 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/plugins/import
 pkgpythondir = @pkgpythondir@/plugins/import
 
+GLADEFILES = \
+	ImportGedcom.glade
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
 
diff --git a/src/plugins/webreport/Makefile.am b/src/plugins/webreport/Makefile.am
new file mode 100644
index 000000000..9472b7a48
--- /dev/null
+++ b/src/plugins/webreport/Makefile.am
@@ -0,0 +1,21 @@
+# This is the src/plugins/webreport 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/webreport
+
+pkgdata_PYTHON = \
+	NarrativeWeb.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/webreport
+pkgpythondir = @pkgpythondir@/plugins/webreport
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
similarity index 100%
rename from src/plugins/NarrativeWeb.py
rename to src/plugins/webreport/NarrativeWeb.py