Namespaces should consist of both vendor and package

4 files changed, 189 insertions, 189 deletions

diff --git a/vendor/autoload.php b/vendor/autoload.php
index 03fa682dd3..9ed11bc67a 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit002d0c63e1c9900778d6e17e1b0c5f9c::getLoader();
+return ComposerAutoloaderInit3803e916a17b8b8045b88e17e316ad58::getLoader();
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 4c64c60251..760fb3e533 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -16,6 +16,188 @@ return array(
     'Fisharebest\\ExtCalendar\\JulianCalendar' => $vendorDir . '/fisharebest/ext-calendar/src/JulianCalendar.php',
     'Fisharebest\\ExtCalendar\\PersianCalendar' => $vendorDir . '/fisharebest/ext-calendar/src/PersianCalendar.php',
     'Fisharebest\\ExtCalendar\\Shim' => $vendorDir . '/fisharebest/ext-calendar/src/Shim.php',
+    'Fisharebest\\Webtrees\\AdministrationTheme' => $baseDir . '/app/Theme/AdministrationTheme.php',
+    'Fisharebest\\Webtrees\\AdvancedSearchController' => $baseDir . '/app/Controller/AdvancedSearchController.php',
+    'Fisharebest\\Webtrees\\AjaxController' => $baseDir . '/app/Controller/AjaxController.php',
+    'Fisharebest\\Webtrees\\AncestryController' => $baseDir . '/app/Controller/AncestryController.php',
+    'Fisharebest\\Webtrees\\Auth' => $baseDir . '/app/Auth.php',
+    'Fisharebest\\Webtrees\\BaseController' => $baseDir . '/app/Controller/BaseController.php',
+    'Fisharebest\\Webtrees\\BaseTheme' => $baseDir . '/app/Theme/BaseTheme.php',
+    'Fisharebest\\Webtrees\\BatchUpdateBasePlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateBasePlugin.php',
+    'Fisharebest\\Webtrees\\BatchUpdateDuplicateLinksPlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateDuplicateLinksPlugin.php',
+    'Fisharebest\\Webtrees\\BatchUpdateMarriedNamesPlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateMarriedNamesPlugin.php',
+    'Fisharebest\\Webtrees\\BatchUpdateMissingDeathPlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateMissingDeathPlugin.php',
+    'Fisharebest\\Webtrees\\BatchUpdateNameFormatPlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateNameFormatPlugin.php',
+    'Fisharebest\\Webtrees\\BatchUpdateSearchReplacePlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateSearchReplacePlugin.php',
+    'Fisharebest\\Webtrees\\BranchesController' => $baseDir . '/app/Controller/BranchesController.php',
+    'Fisharebest\\Webtrees\\CalendarDate' => $baseDir . '/app/Date/CalendarDate.php',
+    'Fisharebest\\Webtrees\\ChartController' => $baseDir . '/app/Controller/ChartController.php',
+    'Fisharebest\\Webtrees\\ClippingsCart' => $baseDir . '/modules_v3/clippings/ClippingsCart.php',
+    'Fisharebest\\Webtrees\\CloudsTheme' => $baseDir . '/app/Theme/CloudsTheme.php',
+    'Fisharebest\\Webtrees\\ColorsTheme' => $baseDir . '/app/Theme/ColorsTheme.php',
+    'Fisharebest\\Webtrees\\CompactController' => $baseDir . '/app/Controller/CompactController.php',
+    'Fisharebest\\Webtrees\\Database' => $baseDir . '/app/Database.php',
+    'Fisharebest\\Webtrees\\Date' => $baseDir . '/app/Date.php',
+    'Fisharebest\\Webtrees\\DescendancyController' => $baseDir . '/app/Controller/DescendancyController.php',
+    'Fisharebest\\Webtrees\\FabTheme' => $baseDir . '/app/Theme/FabTheme.php',
+    'Fisharebest\\Webtrees\\Fact' => $baseDir . '/app/Fact.php',
+    'Fisharebest\\Webtrees\\Family' => $baseDir . '/app/Family.php',
+    'Fisharebest\\Webtrees\\FamilyController' => $baseDir . '/app/Controller/FamilyController.php',
+    'Fisharebest\\Webtrees\\FamilybookController' => $baseDir . '/app/Controller/Familybook.php',
+    'Fisharebest\\Webtrees\\FanchartController' => $baseDir . '/app/Controller/FanchartController.php',
+    'Fisharebest\\Webtrees\\File' => $baseDir . '/app/File.php',
+    'Fisharebest\\Webtrees\\Filter' => $baseDir . '/app/Filter.php',
+    'Fisharebest\\Webtrees\\FlashMessages' => $baseDir . '/app/FlashMessages.php',
+    'Fisharebest\\Webtrees\\FrenchDate' => $baseDir . '/app/Date/FrenchDate.php',
+    'Fisharebest\\Webtrees\\GEDFact_assistant_WT_Module' => $baseDir . '/modules_v3/GEDFact_assistant/module.php',
+    'Fisharebest\\Webtrees\\GedcomRecord' => $baseDir . '/app/GedcomRecord.php',
+    'Fisharebest\\Webtrees\\GedcomRecordController' => $baseDir . '/app/Controller/GedcomRecordController.php',
+    'Fisharebest\\Webtrees\\GregorianDate' => $baseDir . '/app/Date/GregorianDate.php',
+    'Fisharebest\\Webtrees\\HijriDate' => $baseDir . '/app/Date/HijriDate.php',
+    'Fisharebest\\Webtrees\\HourglassController' => $baseDir . '/app/Controller/HourglassController.php',
+    'Fisharebest\\Webtrees\\I18N' => $baseDir . '/app/I18N.php',
+    'Fisharebest\\Webtrees\\Individual' => $baseDir . '/app/Individual.php',
+    'Fisharebest\\Webtrees\\IndividualController' => $baseDir . '/app/Controller/IndividualController.php',
+    'Fisharebest\\Webtrees\\JalaliDate' => $baseDir . '/app/Date/JalaliDate.php',
+    'Fisharebest\\Webtrees\\JewishDate' => $baseDir . '/app/Date/JewishDate.php',
+    'Fisharebest\\Webtrees\\JulianDate' => $baseDir . '/app/Date/JulianDate.php',
+    'Fisharebest\\Webtrees\\LifespanController' => $baseDir . '/app/Controller/LifespanController.php',
+    'Fisharebest\\Webtrees\\Log' => $baseDir . '/app/Log.php',
+    'Fisharebest\\Webtrees\\Mail' => $baseDir . '/app/Mail.php',
+    'Fisharebest\\Webtrees\\Media' => $baseDir . '/app/Media.php',
+    'Fisharebest\\Webtrees\\MediaController' => $baseDir . '/app/Controller/MediaController.php',
+    'Fisharebest\\Webtrees\\Menu' => $baseDir . '/app/Menu.php',
+    'Fisharebest\\Webtrees\\MinimalTheme' => $baseDir . '/app/Theme/MinimalTheme.php',
+    'Fisharebest\\Webtrees\\Module' => $baseDir . '/app/Module.php',
+    'Fisharebest\\Webtrees\\ModuleBlockInterface' => $baseDir . '/app/Module/ModuleBlockInterface.php',
+    'Fisharebest\\Webtrees\\ModuleChartInterface' => $baseDir . '/app/Module/ModuleChartInterface.php',
+    'Fisharebest\\Webtrees\\ModuleConfigInterface' => $baseDir . '/app/Module/ModuleConfigInterface.php',
+    'Fisharebest\\Webtrees\\ModuleMenuInterface' => $baseDir . '/app/Module/ModuleMenuInterface.php',
+    'Fisharebest\\Webtrees\\ModuleReportInterface' => $baseDir . '/app/Module/ModuleReportInterface.php',
+    'Fisharebest\\Webtrees\\ModuleSidebarInterface' => $baseDir . '/app/Module/ModuleSidebarInterface.php',
+    'Fisharebest\\Webtrees\\ModuleTabInterface' => $baseDir . '/app/Module/ModuleTabInterface.php',
+    'Fisharebest\\Webtrees\\ModuleThemeInterface' => $baseDir . '/app/Module/ModuleThemeInterface.php',
+    'Fisharebest\\Webtrees\\Note' => $baseDir . '/app/Note.php',
+    'Fisharebest\\Webtrees\\NoteController' => $baseDir . '/app/Controller/NoteController.php',
+    'Fisharebest\\Webtrees\\PageController' => $baseDir . '/app/Controller/PageController.php',
+    'Fisharebest\\Webtrees\\PedigreeController' => $baseDir . '/app/Controller/PedigreeController.php',
+    'Fisharebest\\Webtrees\\Place' => $baseDir . '/app/Place.php',
+    'Fisharebest\\Webtrees\\ReportBase' => $baseDir . '/app/Report/ReportBase.php',
+    'Fisharebest\\Webtrees\\ReportBaseCell' => $baseDir . '/app/Report/ReportBaseCell.php',
+    'Fisharebest\\Webtrees\\ReportBaseElement' => $baseDir . '/app/Report/ReportBaseElement.php',
+    'Fisharebest\\Webtrees\\ReportBaseFootnote' => $baseDir . '/app/Report/ReportBaseFootnote.php',
+    'Fisharebest\\Webtrees\\ReportBaseHtml' => $baseDir . '/app/Report/ReportBaseHtml.php',
+    'Fisharebest\\Webtrees\\ReportBaseImage' => $baseDir . '/app/Report/ReportBaseImage.php',
+    'Fisharebest\\Webtrees\\ReportBaseLine' => $baseDir . '/app/Report/ReportBaseLine.php',
+    'Fisharebest\\Webtrees\\ReportBasePageheader' => $baseDir . '/app/Report/ReportBasePageheader.php',
+    'Fisharebest\\Webtrees\\ReportBaseText' => $baseDir . '/app/Report/ReportBaseText.php',
+    'Fisharebest\\Webtrees\\ReportBaseTextbox' => $baseDir . '/app/Report/ReportBaseTextbox.php',
+    'Fisharebest\\Webtrees\\ReportHtml' => $baseDir . '/app/Report/ReportHtml.php',
+    'Fisharebest\\Webtrees\\ReportHtmlCell' => $baseDir . '/app/Report/ReportHtmlCell.php',
+    'Fisharebest\\Webtrees\\ReportHtmlFootnote' => $baseDir . '/app/Report/ReportHtmlFootnote.php',
+    'Fisharebest\\Webtrees\\ReportHtmlHtml' => $baseDir . '/app/Report/ReportHtmlHtml.php',
+    'Fisharebest\\Webtrees\\ReportHtmlImage' => $baseDir . '/app/Report/ReportHtmlImage.php',
+    'Fisharebest\\Webtrees\\ReportHtmlLine' => $baseDir . '/app/Report/ReportHtmlLine.php',
+    'Fisharebest\\Webtrees\\ReportHtmlPageheader' => $baseDir . '/app/Report/ReportHtmlPageheader.php',
+    'Fisharebest\\Webtrees\\ReportHtmlText' => $baseDir . '/app/Report/ReportHtmlText.php',
+    'Fisharebest\\Webtrees\\ReportHtmlTextbox' => $baseDir . '/app/Report/ReportHtmlTextbox.php',
+    'Fisharebest\\Webtrees\\ReportPdf' => $baseDir . '/app/Report/ReportPdf.php',
+    'Fisharebest\\Webtrees\\ReportPdfCell' => $baseDir . '/app/Report/ReportPdfCell.php',
+    'Fisharebest\\Webtrees\\ReportPdfFootnote' => $baseDir . '/app/Report/ReportPdfFootnote.php',
+    'Fisharebest\\Webtrees\\ReportPdfHtml' => $baseDir . '/app/Report/ReportPdfHtml.php',
+    'Fisharebest\\Webtrees\\ReportPdfImage' => $baseDir . '/app/Report/ReportPdfImage.php',
+    'Fisharebest\\Webtrees\\ReportPdfLine' => $baseDir . '/app/Report/ReportPdfLine.php',
+    'Fisharebest\\Webtrees\\ReportPdfPageheader' => $baseDir . '/app/Report/ReportPdfPageheader.php',
+    'Fisharebest\\Webtrees\\ReportPdfText' => $baseDir . '/app/Report/ReportPdfText.php',
+    'Fisharebest\\Webtrees\\ReportPdfTextbox' => $baseDir . '/app/Report/ReportPdfTextbox.php',
+    'Fisharebest\\Webtrees\\ReportTcpdf' => $baseDir . '/app/Report/ReportTcpdf.php',
+    'Fisharebest\\Webtrees\\Repository' => $baseDir . '/app/Repository.php',
+    'Fisharebest\\Webtrees\\RepositoryController' => $baseDir . '/app/Controller/RepositoryController.php',
+    'Fisharebest\\Webtrees\\RomanDate' => $baseDir . '/app/Date/RomanDate.php',
+    'Fisharebest\\Webtrees\\SearchController' => $baseDir . '/app/Controller/SearchController.php',
+    'Fisharebest\\Webtrees\\SimpleController' => $baseDir . '/app/Controller/SimpleController.php',
+    'Fisharebest\\Webtrees\\Site' => $baseDir . '/app/Site.php',
+    'Fisharebest\\Webtrees\\Soundex' => $baseDir . '/app/Soundex.php',
+    'Fisharebest\\Webtrees\\Source' => $baseDir . '/app/Source.php',
+    'Fisharebest\\Webtrees\\SourceController' => $baseDir . '/app/Controller/SourceController.php',
+    'Fisharebest\\Webtrees\\Statement' => $baseDir . '/app/Statement.php',
+    'Fisharebest\\Webtrees\\Stats' => $baseDir . '/app/Stats.php',
+    'Fisharebest\\Webtrees\\Theme' => $baseDir . '/app/Theme.php',
+    'Fisharebest\\Webtrees\\TimelineController' => $baseDir . '/app/Controller/TimelineController.php',
+    'Fisharebest\\Webtrees\\Tree' => $baseDir . '/app/Tree.php',
+    'Fisharebest\\Webtrees\\TreeView' => $baseDir . '/modules_v3/tree/class_treeview.php',
+    'Fisharebest\\Webtrees\\User' => $baseDir . '/app/User.php',
+    'Fisharebest\\Webtrees\\WT_Gedcom_Code_Adop' => $baseDir . '/app/Gedcom/Code/Adop.php',
+    'Fisharebest\\Webtrees\\WT_Gedcom_Code_Name' => $baseDir . '/app/Gedcom/Code/Name.php',
+    'Fisharebest\\Webtrees\\WT_Gedcom_Code_Pedi' => $baseDir . '/app/Gedcom/Code/Pedi.php',
+    'Fisharebest\\Webtrees\\WT_Gedcom_Code_Quay' => $baseDir . '/app/Gedcom/Code/Quay.php',
+    'Fisharebest\\Webtrees\\WT_Gedcom_Code_Rela' => $baseDir . '/app/Gedcom/Code/Rela.php',
+    'Fisharebest\\Webtrees\\WT_Gedcom_Code_Stat' => $baseDir . '/app/Gedcom/Code/Stat.php',
+    'Fisharebest\\Webtrees\\WT_Gedcom_Code_Temp' => $baseDir . '/app/Gedcom/Code/Temp.php',
+    'Fisharebest\\Webtrees\\WT_Gedcom_Tag' => $baseDir . '/app/Gedcom/Tag.php',
+    'Fisharebest\\Webtrees\\WT_Query_Media' => $baseDir . '/app/Query/Media.php',
+    'Fisharebest\\Webtrees\\WT_Query_Name' => $baseDir . '/app/Query/Name.php',
+    'Fisharebest\\Webtrees\\WebtreesTheme' => $baseDir . '/app/Theme/WebtreesTheme.php',
+    'Fisharebest\\Webtrees\\XeneaTheme' => $baseDir . '/app/Theme/XeneaTheme.php',
+    'Fisharebest\\Webtrees\\ahnentafel_report_WT_Module' => $baseDir . '/modules_v3/ahnentafel_report/module.php',
+    'Fisharebest\\Webtrees\\batch_update_WT_Module' => $baseDir . '/modules_v3/batch_update/module.php',
+    'Fisharebest\\Webtrees\\bdm_report_WT_Module' => $baseDir . '/modules_v3/bdm_report/module.php',
+    'Fisharebest\\Webtrees\\birth_report_WT_Module' => $baseDir . '/modules_v3/birth_report/module.php',
+    'Fisharebest\\Webtrees\\cemetery_report_WT_Module' => $baseDir . '/modules_v3/cemetery_report/module.php',
+    'Fisharebest\\Webtrees\\change_report_WT_Module' => $baseDir . '/modules_v3/change_report/module.php',
+    'Fisharebest\\Webtrees\\charts_WT_Module' => $baseDir . '/modules_v3/charts/module.php',
+    'Fisharebest\\Webtrees\\ckeditor_WT_Module' => $baseDir . '/modules_v3/ckeditor/module.php',
+    'Fisharebest\\Webtrees\\clippings_WT_Module' => $baseDir . '/modules_v3/clippings/module.php',
+    'Fisharebest\\Webtrees\\death_report_WT_Module' => $baseDir . '/modules_v3/death_report/module.php',
+    'Fisharebest\\Webtrees\\descendancy_WT_Module' => $baseDir . '/modules_v3/descendancy/module.php',
+    'Fisharebest\\Webtrees\\descendancy_report_WT_Module' => $baseDir . '/modules_v3/descendancy_report/module.php',
+    'Fisharebest\\Webtrees\\extra_info_WT_Module' => $baseDir . '/modules_v3/extra_info/module.php',
+    'Fisharebest\\Webtrees\\fact_sources_WT_Module' => $baseDir . '/modules_v3/fact_sources/module.php',
+    'Fisharebest\\Webtrees\\families_WT_Module' => $baseDir . '/modules_v3/families/module.php',
+    'Fisharebest\\Webtrees\\family_group_report_WT_Module' => $baseDir . '/modules_v3/family_group_report/module.php',
+    'Fisharebest\\Webtrees\\family_nav_WT_Module' => $baseDir . '/modules_v3/family_nav/module.php',
+    'Fisharebest\\Webtrees\\faq_WT_Module' => $baseDir . '/modules_v3/faq/module.php',
+    'Fisharebest\\Webtrees\\gedcom_block_WT_Module' => $baseDir . '/modules_v3/gedcom_block/module.php',
+    'Fisharebest\\Webtrees\\gedcom_favorites_WT_Module' => $baseDir . '/modules_v3/gedcom_favorites/module.php',
+    'Fisharebest\\Webtrees\\gedcom_news_WT_Module' => $baseDir . '/modules_v3/gedcom_news/module.php',
+    'Fisharebest\\Webtrees\\gedcom_stats_WT_Module' => $baseDir . '/modules_v3/gedcom_stats/module.php',
+    'Fisharebest\\Webtrees\\googlemap_WT_Module' => $baseDir . '/modules_v3/googlemap/module.php',
+    'Fisharebest\\Webtrees\\html_WT_Module' => $baseDir . '/modules_v3/html/module.php',
+    'Fisharebest\\Webtrees\\individual_ext_report_WT_Module' => $baseDir . '/modules_v3/individual_ext_report/module.php',
+    'Fisharebest\\Webtrees\\individual_report_WT_Module' => $baseDir . '/modules_v3/individual_report/module.php',
+    'Fisharebest\\Webtrees\\individuals_WT_Module' => $baseDir . '/modules_v3/individuals/module.php',
+    'Fisharebest\\Webtrees\\lightbox_WT_Module' => $baseDir . '/modules_v3/lightbox/module.php',
+    'Fisharebest\\Webtrees\\logged_in_WT_Module' => $baseDir . '/modules_v3/logged_in/module.php',
+    'Fisharebest\\Webtrees\\login_block_WT_Module' => $baseDir . '/modules_v3/login_block/module.php',
+    'Fisharebest\\Webtrees\\marriage_report_WT_Module' => $baseDir . '/modules_v3/marriage_report/module.php',
+    'Fisharebest\\Webtrees\\media_WT_Module' => $baseDir . '/modules_v3/media/module.php',
+    'Fisharebest\\Webtrees\\missing_facts_report_WT_Module' => $baseDir . '/modules_v3/missing_facts_report/module.php',
+    'Fisharebest\\Webtrees\\notes_WT_Module' => $baseDir . '/modules_v3/notes/module.php',
+    'Fisharebest\\Webtrees\\occupation_report_WT_Module' => $baseDir . '/modules_v3/occupation_report/module.php',
+    'Fisharebest\\Webtrees\\page_menu_WT_Module' => $baseDir . '/modules_v3/page_menu/module.php',
+    'Fisharebest\\Webtrees\\pedigree_report_WT_Module' => $baseDir . '/modules_v3/pedigree_report/module.php',
+    'Fisharebest\\Webtrees\\personal_facts_WT_Module' => $baseDir . '/modules_v3/personal_facts/module.php',
+    'Fisharebest\\Webtrees\\random_media_WT_Module' => $baseDir . '/modules_v3/random_media/module.php',
+    'Fisharebest\\Webtrees\\recent_changes_WT_Module' => $baseDir . '/modules_v3/recent_changes/module.php',
+    'Fisharebest\\Webtrees\\relative_ext_report_WT_Module' => $baseDir . '/modules_v3/relative_ext_report/module.php',
+    'Fisharebest\\Webtrees\\relatives_WT_Module' => $baseDir . '/modules_v3/relatives/module.php',
+    'Fisharebest\\Webtrees\\review_changes_WT_Module' => $baseDir . '/modules_v3/review_changes/module.php',
+    'Fisharebest\\Webtrees\\sitemap_WT_Module' => $baseDir . '/modules_v3/sitemap/module.php',
+    'Fisharebest\\Webtrees\\sources_tab_WT_Module' => $baseDir . '/modules_v3/sources_tab/module.php',
+    'Fisharebest\\Webtrees\\stories_WT_Module' => $baseDir . '/modules_v3/stories/module.php',
+    'Fisharebest\\Webtrees\\theme_select_WT_Module' => $baseDir . '/modules_v3/theme_select/module.php',
+    'Fisharebest\\Webtrees\\todays_events_WT_Module' => $baseDir . '/modules_v3/todays_events/module.php',
+    'Fisharebest\\Webtrees\\todo_WT_Module' => $baseDir . '/modules_v3/todo/module.php',
+    'Fisharebest\\Webtrees\\top10_givnnames_WT_Module' => $baseDir . '/modules_v3/top10_givnnames/module.php',
+    'Fisharebest\\Webtrees\\top10_pageviews_WT_Module' => $baseDir . '/modules_v3/top10_pageviews/module.php',
+    'Fisharebest\\Webtrees\\top10_surnames_WT_Module' => $baseDir . '/modules_v3/top10_surnames/module.php',
+    'Fisharebest\\Webtrees\\tree_WT_Module' => $baseDir . '/modules_v3/tree/module.php',
+    'Fisharebest\\Webtrees\\upcoming_events_WT_Module' => $baseDir . '/modules_v3/upcoming_events/module.php',
+    'Fisharebest\\Webtrees\\user_blog_WT_Module' => $baseDir . '/modules_v3/user_blog/module.php',
+    'Fisharebest\\Webtrees\\user_favorites_WT_Module' => $baseDir . '/modules_v3/user_favorites/module.php',
+    'Fisharebest\\Webtrees\\user_messages_WT_Module' => $baseDir . '/modules_v3/user_messages/module.php',
+    'Fisharebest\\Webtrees\\user_welcome_WT_Module' => $baseDir . '/modules_v3/user_welcome/module.php',
+    'Fisharebest\\Webtrees\\yahrzeit_WT_Module' => $baseDir . '/modules_v3/yahrzeit/module.php',
     'HTMLPurifier' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.php',
     'HTMLPurifier_Arborize' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php',
     'HTMLPurifier_AttrCollections' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php',
@@ -283,188 +465,6 @@ return array(
     'TCPDF_IMPORT' => $vendorDir . '/tecnick.com/tcpdf/tcpdf_import.php',
     'TCPDF_PARSER' => $vendorDir . '/tecnick.com/tcpdf/tcpdf_parser.php',
     'TCPDF_STATIC' => $vendorDir . '/tecnick.com/tcpdf/include/tcpdf_static.php',
-    'Webtrees\\AdministrationTheme' => $baseDir . '/app/Theme/AdministrationTheme.php',
-    'Webtrees\\AdvancedSearchController' => $baseDir . '/app/Controller/AdvancedSearchController.php',
-    'Webtrees\\AjaxController' => $baseDir . '/app/Controller/AjaxController.php',
-    'Webtrees\\AncestryController' => $baseDir . '/app/Controller/AncestryController.php',
-    'Webtrees\\Auth' => $baseDir . '/app/Auth.php',
-    'Webtrees\\BaseController' => $baseDir . '/app/Controller/BaseController.php',
-    'Webtrees\\BaseTheme' => $baseDir . '/app/Theme/BaseTheme.php',
-    'Webtrees\\BatchUpdateBasePlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateBasePlugin.php',
-    'Webtrees\\BatchUpdateDuplicateLinksPlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateDuplicateLinksPlugin.php',
-    'Webtrees\\BatchUpdateMarriedNamesPlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateMarriedNamesPlugin.php',
-    'Webtrees\\BatchUpdateMissingDeathPlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateMissingDeathPlugin.php',
-    'Webtrees\\BatchUpdateNameFormatPlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateNameFormatPlugin.php',
-    'Webtrees\\BatchUpdateSearchReplacePlugin' => $baseDir . '/modules_v3/batch_update/BatchUpdateSearchReplacePlugin.php',
-    'Webtrees\\BranchesController' => $baseDir . '/app/Controller/BranchesController.php',
-    'Webtrees\\CalendarDate' => $baseDir . '/app/Date/CalendarDate.php',
-    'Webtrees\\ChartController' => $baseDir . '/app/Controller/ChartController.php',
-    'Webtrees\\ClippingsCart' => $baseDir . '/modules_v3/clippings/ClippingsCart.php',
-    'Webtrees\\CloudsTheme' => $baseDir . '/app/Theme/CloudsTheme.php',
-    'Webtrees\\ColorsTheme' => $baseDir . '/app/Theme/ColorsTheme.php',
-    'Webtrees\\CompactController' => $baseDir . '/app/Controller/CompactController.php',
-    'Webtrees\\Database' => $baseDir . '/app/Database.php',
-    'Webtrees\\Date' => $baseDir . '/app/Date.php',
-    'Webtrees\\DescendancyController' => $baseDir . '/app/Controller/DescendancyController.php',
-    'Webtrees\\FabTheme' => $baseDir . '/app/Theme/FabTheme.php',
-    'Webtrees\\Fact' => $baseDir . '/app/Fact.php',
-    'Webtrees\\Family' => $baseDir . '/app/Family.php',
-    'Webtrees\\FamilyController' => $baseDir . '/app/Controller/FamilyController.php',
-    'Webtrees\\FamilybookController' => $baseDir . '/app/Controller/Familybook.php',
-    'Webtrees\\FanchartController' => $baseDir . '/app/Controller/FanchartController.php',
-    'Webtrees\\File' => $baseDir . '/app/File.php',
-    'Webtrees\\Filter' => $baseDir . '/app/Filter.php',
-    'Webtrees\\FlashMessages' => $baseDir . '/app/FlashMessages.php',
-    'Webtrees\\FrenchDate' => $baseDir . '/app/Date/FrenchDate.php',
-    'Webtrees\\GEDFact_assistant_WT_Module' => $baseDir . '/modules_v3/GEDFact_assistant/module.php',
-    'Webtrees\\GedcomRecord' => $baseDir . '/app/GedcomRecord.php',
-    'Webtrees\\GedcomRecordController' => $baseDir . '/app/Controller/GedcomRecordController.php',
-    'Webtrees\\GregorianDate' => $baseDir . '/app/Date/GregorianDate.php',
-    'Webtrees\\HijriDate' => $baseDir . '/app/Date/HijriDate.php',
-    'Webtrees\\HourglassController' => $baseDir . '/app/Controller/HourglassController.php',
-    'Webtrees\\I18N' => $baseDir . '/app/I18N.php',
-    'Webtrees\\Individual' => $baseDir . '/app/Individual.php',
-    'Webtrees\\IndividualController' => $baseDir . '/app/Controller/IndividualController.php',
-    'Webtrees\\JalaliDate' => $baseDir . '/app/Date/JalaliDate.php',
-    'Webtrees\\JewishDate' => $baseDir . '/app/Date/JewishDate.php',
-    'Webtrees\\JulianDate' => $baseDir . '/app/Date/JulianDate.php',
-    'Webtrees\\LifespanController' => $baseDir . '/app/Controller/LifespanController.php',
-    'Webtrees\\Log' => $baseDir . '/app/Log.php',
-    'Webtrees\\Mail' => $baseDir . '/app/Mail.php',
-    'Webtrees\\Media' => $baseDir . '/app/Media.php',
-    'Webtrees\\MediaController' => $baseDir . '/app/Controller/MediaController.php',
-    'Webtrees\\Menu' => $baseDir . '/app/Menu.php',
-    'Webtrees\\MinimalTheme' => $baseDir . '/app/Theme/MinimalTheme.php',
-    'Webtrees\\Module' => $baseDir . '/app/Module.php',
-    'Webtrees\\ModuleBlockInterface' => $baseDir . '/app/Module/ModuleBlockInterface.php',
-    'Webtrees\\ModuleChartInterface' => $baseDir . '/app/Module/ModuleChartInterface.php',
-    'Webtrees\\ModuleConfigInterface' => $baseDir . '/app/Module/ModuleConfigInterface.php',
-    'Webtrees\\ModuleMenuInterface' => $baseDir . '/app/Module/ModuleMenuInterface.php',
-    'Webtrees\\ModuleReportInterface' => $baseDir . '/app/Module/ModuleReportInterface.php',
-    'Webtrees\\ModuleSidebarInterface' => $baseDir . '/app/Module/ModuleSidebarInterface.php',
-    'Webtrees\\ModuleTabInterface' => $baseDir . '/app/Module/ModuleTabInterface.php',
-    'Webtrees\\ModuleThemeInterface' => $baseDir . '/app/Module/ModuleThemeInterface.php',
-    'Webtrees\\Note' => $baseDir . '/app/Note.php',
-    'Webtrees\\NoteController' => $baseDir . '/app/Controller/NoteController.php',
-    'Webtrees\\PageController' => $baseDir . '/app/Controller/PageController.php',
-    'Webtrees\\PedigreeController' => $baseDir . '/app/Controller/PedigreeController.php',
-    'Webtrees\\Place' => $baseDir . '/app/Place.php',
-    'Webtrees\\ReportBase' => $baseDir . '/app/Report/ReportBase.php',
-    'Webtrees\\ReportBaseCell' => $baseDir . '/app/Report/ReportBaseCell.php',
-    'Webtrees\\ReportBaseElement' => $baseDir . '/app/Report/ReportBaseElement.php',
-    'Webtrees\\ReportBaseFootnote' => $baseDir . '/app/Report/ReportBaseFootnote.php',
-    'Webtrees\\ReportBaseHtml' => $baseDir . '/app/Report/ReportBaseHtml.php',
-    'Webtrees\\ReportBaseImage' => $baseDir . '/app/Report/ReportBaseImage.php',
-    'Webtrees\\ReportBaseLine' => $baseDir . '/app/Report/ReportBaseLine.php',
-    'Webtrees\\ReportBasePageheader' => $baseDir . '/app/Report/ReportBasePageheader.php',
-    'Webtrees\\ReportBaseText' => $baseDir . '/app/Report/ReportBaseText.php',
-    'Webtrees\\ReportBaseTextbox' => $baseDir . '/app/Report/ReportBaseTextbox.php',
-    'Webtrees\\ReportHtml' => $baseDir . '/app/Report/ReportHtml.php',
-    'Webtrees\\ReportHtmlCell' => $baseDir . '/app/Report/ReportHtmlCell.php',
-    'Webtrees\\ReportHtmlFootnote' => $baseDir . '/app/Report/ReportHtmlFootnote.php',
-    'Webtrees\\ReportHtmlHtml' => $baseDir . '/app/Report/ReportHtmlHtml.php',
-    'Webtrees\\ReportHtmlImage' => $baseDir . '/app/Report/ReportHtmlImage.php',
-    'Webtrees\\ReportHtmlLine' => $baseDir . '/app/Report/ReportHtmlLine.php',
-    'Webtrees\\ReportHtmlPageheader' => $baseDir . '/app/Report/ReportHtmlPageheader.php',
-    'Webtrees\\ReportHtmlText' => $baseDir . '/app/Report/ReportHtmlText.php',
-    'Webtrees\\ReportHtmlTextbox' => $baseDir . '/app/Report/ReportHtmlTextbox.php',
-    'Webtrees\\ReportPdf' => $baseDir . '/app/Report/ReportPdf.php',
-    'Webtrees\\ReportPdfCell' => $baseDir . '/app/Report/ReportPdfCell.php',
-    'Webtrees\\ReportPdfFootnote' => $baseDir . '/app/Report/ReportPdfFootnote.php',
-    'Webtrees\\ReportPdfHtml' => $baseDir . '/app/Report/ReportPdfHtml.php',
-    'Webtrees\\ReportPdfImage' => $baseDir . '/app/Report/ReportPdfImage.php',
-    'Webtrees\\ReportPdfLine' => $baseDir . '/app/Report/ReportPdfLine.php',
-    'Webtrees\\ReportPdfPageheader' => $baseDir . '/app/Report/ReportPdfPageheader.php',
-    'Webtrees\\ReportPdfText' => $baseDir . '/app/Report/ReportPdfText.php',
-    'Webtrees\\ReportPdfTextbox' => $baseDir . '/app/Report/ReportPdfTextbox.php',
-    'Webtrees\\ReportTcpdf' => $baseDir . '/app/Report/ReportTcpdf.php',
-    'Webtrees\\Repository' => $baseDir . '/app/Repository.php',
-    'Webtrees\\RepositoryController' => $baseDir . '/app/Controller/RepositoryController.php',
-    'Webtrees\\RomanDate' => $baseDir . '/app/Date/RomanDate.php',
-    'Webtrees\\SearchController' => $baseDir . '/app/Controller/SearchController.php',
-    'Webtrees\\SimpleController' => $baseDir . '/app/Controller/SimpleController.php',
-    'Webtrees\\Site' => $baseDir . '/app/Site.php',
-    'Webtrees\\Soundex' => $baseDir . '/app/Soundex.php',
-    'Webtrees\\Source' => $baseDir . '/app/Source.php',
-    'Webtrees\\SourceController' => $baseDir . '/app/Controller/SourceController.php',
-    'Webtrees\\Statement' => $baseDir . '/app/Statement.php',
-    'Webtrees\\Stats' => $baseDir . '/app/Stats.php',
-    'Webtrees\\Theme' => $baseDir . '/app/Theme.php',
-    'Webtrees\\TimelineController' => $baseDir . '/app/Controller/TimelineController.php',
-    'Webtrees\\Tree' => $baseDir . '/app/Tree.php',
-    'Webtrees\\TreeView' => $baseDir . '/modules_v3/tree/class_treeview.php',
-    'Webtrees\\User' => $baseDir . '/app/User.php',
-    'Webtrees\\WT_Gedcom_Code_Adop' => $baseDir . '/app/Gedcom/Code/Adop.php',
-    'Webtrees\\WT_Gedcom_Code_Name' => $baseDir . '/app/Gedcom/Code/Name.php',
-    'Webtrees\\WT_Gedcom_Code_Pedi' => $baseDir . '/app/Gedcom/Code/Pedi.php',
-    'Webtrees\\WT_Gedcom_Code_Quay' => $baseDir . '/app/Gedcom/Code/Quay.php',
-    'Webtrees\\WT_Gedcom_Code_Rela' => $baseDir . '/app/Gedcom/Code/Rela.php',
-    'Webtrees\\WT_Gedcom_Code_Stat' => $baseDir . '/app/Gedcom/Code/Stat.php',
-    'Webtrees\\WT_Gedcom_Code_Temp' => $baseDir . '/app/Gedcom/Code/Temp.php',
-    'Webtrees\\WT_Gedcom_Tag' => $baseDir . '/app/Gedcom/Tag.php',
-    'Webtrees\\WT_Query_Media' => $baseDir . '/app/Query/Media.php',
-    'Webtrees\\WT_Query_Name' => $baseDir . '/app/Query/Name.php',
-    'Webtrees\\WebtreesTheme' => $baseDir . '/app/Theme/WebtreesTheme.php',
-    'Webtrees\\XeneaTheme' => $baseDir . '/app/Theme/XeneaTheme.php',
-    'Webtrees\\ahnentafel_report_WT_Module' => $baseDir . '/modules_v3/ahnentafel_report/module.php',
-    'Webtrees\\batch_update_WT_Module' => $baseDir . '/modules_v3/batch_update/module.php',
-    'Webtrees\\bdm_report_WT_Module' => $baseDir . '/modules_v3/bdm_report/module.php',
-    'Webtrees\\birth_report_WT_Module' => $baseDir . '/modules_v3/birth_report/module.php',
-    'Webtrees\\cemetery_report_WT_Module' => $baseDir . '/modules_v3/cemetery_report/module.php',
-    'Webtrees\\change_report_WT_Module' => $baseDir . '/modules_v3/change_report/module.php',
-    'Webtrees\\charts_WT_Module' => $baseDir . '/modules_v3/charts/module.php',
-    'Webtrees\\ckeditor_WT_Module' => $baseDir . '/modules_v3/ckeditor/module.php',
-    'Webtrees\\clippings_WT_Module' => $baseDir . '/modules_v3/clippings/module.php',
-    'Webtrees\\death_report_WT_Module' => $baseDir . '/modules_v3/death_report/module.php',
-    'Webtrees\\descendancy_WT_Module' => $baseDir . '/modules_v3/descendancy/module.php',
-    'Webtrees\\descendancy_report_WT_Module' => $baseDir . '/modules_v3/descendancy_report/module.php',
-    'Webtrees\\extra_info_WT_Module' => $baseDir . '/modules_v3/extra_info/module.php',
-    'Webtrees\\fact_sources_WT_Module' => $baseDir . '/modules_v3/fact_sources/module.php',
-    'Webtrees\\families_WT_Module' => $baseDir . '/modules_v3/families/module.php',
-    'Webtrees\\family_group_report_WT_Module' => $baseDir . '/modules_v3/family_group_report/module.php',
-    'Webtrees\\family_nav_WT_Module' => $baseDir . '/modules_v3/family_nav/module.php',
-    'Webtrees\\faq_WT_Module' => $baseDir . '/modules_v3/faq/module.php',
-    'Webtrees\\gedcom_block_WT_Module' => $baseDir . '/modules_v3/gedcom_block/module.php',
-    'Webtrees\\gedcom_favorites_WT_Module' => $baseDir . '/modules_v3/gedcom_favorites/module.php',
-    'Webtrees\\gedcom_news_WT_Module' => $baseDir . '/modules_v3/gedcom_news/module.php',
-    'Webtrees\\gedcom_stats_WT_Module' => $baseDir . '/modules_v3/gedcom_stats/module.php',
-    'Webtrees\\googlemap_WT_Module' => $baseDir . '/modules_v3/googlemap/module.php',
-    'Webtrees\\html_WT_Module' => $baseDir . '/modules_v3/html/module.php',
-    'Webtrees\\individual_ext_report_WT_Module' => $baseDir . '/modules_v3/individual_ext_report/module.php',
-    'Webtrees\\individual_report_WT_Module' => $baseDir . '/modules_v3/individual_report/module.php',
-    'Webtrees\\individuals_WT_Module' => $baseDir . '/modules_v3/individuals/module.php',
-    'Webtrees\\lightbox_WT_Module' => $baseDir . '/modules_v3/lightbox/module.php',
-    'Webtrees\\logged_in_WT_Module' => $baseDir . '/modules_v3/logged_in/module.php',
-    'Webtrees\\login_block_WT_Module' => $baseDir . '/modules_v3/login_block/module.php',
-    'Webtrees\\marriage_report_WT_Module' => $baseDir . '/modules_v3/marriage_report/module.php',
-    'Webtrees\\media_WT_Module' => $baseDir . '/modules_v3/media/module.php',
-    'Webtrees\\missing_facts_report_WT_Module' => $baseDir . '/modules_v3/missing_facts_report/module.php',
-    'Webtrees\\notes_WT_Module' => $baseDir . '/modules_v3/notes/module.php',
-    'Webtrees\\occupation_report_WT_Module' => $baseDir . '/modules_v3/occupation_report/module.php',
-    'Webtrees\\page_menu_WT_Module' => $baseDir . '/modules_v3/page_menu/module.php',
-    'Webtrees\\pedigree_report_WT_Module' => $baseDir . '/modules_v3/pedigree_report/module.php',
-    'Webtrees\\personal_facts_WT_Module' => $baseDir . '/modules_v3/personal_facts/module.php',
-    'Webtrees\\random_media_WT_Module' => $baseDir . '/modules_v3/random_media/module.php',
-    'Webtrees\\recent_changes_WT_Module' => $baseDir . '/modules_v3/recent_changes/module.php',
-    'Webtrees\\relative_ext_report_WT_Module' => $baseDir . '/modules_v3/relative_ext_report/module.php',
-    'Webtrees\\relatives_WT_Module' => $baseDir . '/modules_v3/relatives/module.php',
-    'Webtrees\\review_changes_WT_Module' => $baseDir . '/modules_v3/review_changes/module.php',
-    'Webtrees\\sitemap_WT_Module' => $baseDir . '/modules_v3/sitemap/module.php',
-    'Webtrees\\sources_tab_WT_Module' => $baseDir . '/modules_v3/sources_tab/module.php',
-    'Webtrees\\stories_WT_Module' => $baseDir . '/modules_v3/stories/module.php',
-    'Webtrees\\theme_select_WT_Module' => $baseDir . '/modules_v3/theme_select/module.php',
-    'Webtrees\\todays_events_WT_Module' => $baseDir . '/modules_v3/todays_events/module.php',
-    'Webtrees\\todo_WT_Module' => $baseDir . '/modules_v3/todo/module.php',
-    'Webtrees\\top10_givnnames_WT_Module' => $baseDir . '/modules_v3/top10_givnnames/module.php',
-    'Webtrees\\top10_pageviews_WT_Module' => $baseDir . '/modules_v3/top10_pageviews/module.php',
-    'Webtrees\\top10_surnames_WT_Module' => $baseDir . '/modules_v3/top10_surnames/module.php',
-    'Webtrees\\tree_WT_Module' => $baseDir . '/modules_v3/tree/module.php',
-    'Webtrees\\upcoming_events_WT_Module' => $baseDir . '/modules_v3/upcoming_events/module.php',
-    'Webtrees\\user_blog_WT_Module' => $baseDir . '/modules_v3/user_blog/module.php',
-    'Webtrees\\user_favorites_WT_Module' => $baseDir . '/modules_v3/user_favorites/module.php',
-    'Webtrees\\user_messages_WT_Module' => $baseDir . '/modules_v3/user_messages/module.php',
-    'Webtrees\\user_welcome_WT_Module' => $baseDir . '/modules_v3/user_welcome/module.php',
-    'Webtrees\\yahrzeit_WT_Module' => $baseDir . '/modules_v3/yahrzeit/module.php',
     'Zend_Acl' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Acl.php',
     'Zend_Acl_Assert_Interface' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Acl/Assert/Interface.php',
     'Zend_Acl_Exception' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Acl/Exception.php',
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 20b92cfb94..1280ac6abc 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -6,7 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Webtrees\\' => array($baseDir . '/app', $baseDir . '/modules_v3'),
     'Rhumsaa\\Uuid\\' => array($vendorDir . '/rhumsaa/uuid/src'),
+    'Fisharebest\\Webtrees\\' => array($baseDir . '/app', $baseDir . '/modules_v3'),
     'Fisharebest\\ExtCalendar\\' => array($vendorDir . '/fisharebest/ext-calendar/src'),
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 9036ce1a0c..4f547c6df8 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit002d0c63e1c9900778d6e17e1b0c5f9c
+class ComposerAutoloaderInit3803e916a17b8b8045b88e17e316ad58
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit002d0c63e1c9900778d6e17e1b0c5f9c
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit002d0c63e1c9900778d6e17e1b0c5f9c', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit3803e916a17b8b8045b88e17e316ad58', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit002d0c63e1c9900778d6e17e1b0c5f9c', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit3803e916a17b8b8045b88e17e316ad58', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         array_push($includePaths, get_include_path());
@@ -46,14 +46,14 @@ class ComposerAutoloaderInit002d0c63e1c9900778d6e17e1b0c5f9c
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequire002d0c63e1c9900778d6e17e1b0c5f9c($file);
+            composerRequire3803e916a17b8b8045b88e17e316ad58($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire002d0c63e1c9900778d6e17e1b0c5f9c($file)
+function composerRequire3803e916a17b8b8045b88e17e316ad58($file)
 {
     require $file;
 }