diff --git a/po/POTFILES.in b/po/POTFILES.in
index f503cff7c..15addbb1c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -228,12 +228,10 @@ src/Selectors/__init__.py
 
 # plugins directory
 src/plugins/BookReport.py
-src/plugins/Calendar.py
 src/plugins/ExportXml.py
 src/plugins/ImportGpkg.py
 src/plugins/ImportXml.py
 src/plugins/Records.py
-src/plugins/WebCal.py
 
 # plugins/docgen directory
 src/plugins/docgen/AsciiDoc.py
@@ -247,6 +245,7 @@ src/plugins/docgen/SvgDrawDoc.py
 
 # plugins/drawreport directory
 src/plugins/drawreport/AncestorTree.py
+src/plugins/drawreport/Calendar.py
 src/plugins/drawreport/DescendTree.py
 src/plugins/drawreport/FanChart.py
 src/plugins/drawreport/StatisticsChart.py
@@ -284,6 +283,9 @@ src/plugins/import/ImportGrdb.py
 src/plugins/import/ImportProGen.py
 src/plugins/import/ImportVCard.py
 
+# plugins/lib directory
+src/plugins/lib/libholiday.py
+
 # plugins/quickview directory
 src/plugins/quickview/AgeOnDate.py
 src/plugins/quickview/all_events.py
@@ -315,6 +317,7 @@ src/plugins/rel/rel_sv.py
 
 # plugins/textreport directory
 src/plugins/textreport/AncestorReport.py
+src/plugins/textreport/BirthdayReport.py
 src/plugins/textreport/CustomBookText.py
 src/plugins/textreport/DescendReport.py
 src/plugins/textreport/DetAncestralReport.py
@@ -358,6 +361,7 @@ src/plugins/tool/Verify.py
 
 # plugins/webreport directory
 src/plugins/webreport/NarrativeWeb.py
+src/plugins/webreport/WebCal.py
 
 # PluginUtils package
 src/PluginUtils/_GuiOptions.py
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 9210c9389..47a5b364b 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -24,8 +24,7 @@ pkgdata_PYTHON = \
 	ExportXml.py\
 	ImportGpkg.py\
 	ImportXml.py\
-	Records.py\
-	WebCal.py
+	Records.py
 
 pkgpyexecdir = @pkgpyexecdir@/plugins
 pkgpythondir = @pkgpythondir@/plugins
@@ -35,8 +34,7 @@ GLADEFILES = \
 
 GRAPHICS = 
 
-DATAFILES = \
-	holidays.xml
+DATAFILES = 
 
 dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
 
diff --git a/src/plugins/lib/Makefile.am b/src/plugins/lib/Makefile.am
index 6a3c1e012..ed3970b9c 100644
--- a/src/plugins/lib/Makefile.am
+++ b/src/plugins/lib/Makefile.am
@@ -11,6 +11,15 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/plugins/lib
 pkgpythondir = @pkgpythondir@/plugins/lib
 
+GLADEFILES = 
+
+GRAPHICS = 
+
+DATAFILES = \
+	holidays.xml
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
 
diff --git a/src/plugins/holidays.xml b/src/plugins/lib/holidays.xml
similarity index 100%
rename from src/plugins/holidays.xml
rename to src/plugins/lib/holidays.xml
diff --git a/src/plugins/webreport/Makefile.am b/src/plugins/webreport/Makefile.am
index 9472b7a48..cb9e0bb87 100644
--- a/src/plugins/webreport/Makefile.am
+++ b/src/plugins/webreport/Makefile.am
@@ -6,7 +6,8 @@
 pkgdatadir = $(datadir)/@PACKAGE@/plugins/webreport
 
 pkgdata_PYTHON = \
-	NarrativeWeb.py
+	NarrativeWeb.py \
+	WebCal.py
 
 pkgpyexecdir = @pkgpyexecdir@/plugins/webreport
 pkgpythondir = @pkgpythondir@/plugins/webreport
diff --git a/src/plugins/WebCal.py b/src/plugins/webreport/WebCal.py
similarity index 100%
rename from src/plugins/WebCal.py
rename to src/plugins/webreport/WebCal.py