From 71a963376e3d2e9ad6bcd5b37ac52532a1791bde Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 4 Jan 2013 14:41:06 -0500
Subject: [PATCH] Now that theme logic has its own module, changed the
 namespace of the view helpers to something more logical.

---
 .../Helper/Blueprint}/LayoutClass.php         |  2 +-
 .../Helper/Blueprint}/Search.php              |  2 +-
 .../Helper/Root}/AbstractServiceLocator.php   |  2 +-
 .../Helper/Root}/AbstractSyndetics.php        |  2 +-
 .../Helper/Root}/AddEllipsis.php              |  2 +-
 .../Helper => View/Helper/Root}/AddThis.php   |  2 +-
 .../Root/Helper => View/Helper/Root}/Auth.php |  2 +-
 .../Helper/Root}/AuthorNotes.php              |  2 +-
 .../Helper => View/Helper/Root}/Browse.php    |  2 +-
 .../Root/Helper => View/Helper/Root}/Cart.php |  2 +-
 .../Helper => View/Helper/Root}/Citation.php  |  4 +-
 .../Helper => View/Helper/Root}/Context.php   |  2 +-
 .../Helper/Root}/CurrentPath.php              |  2 +-
 .../Helper => View/Helper/Root}/DateTime.php  |  2 +-
 .../Helper/Root}/DisplayLanguageOption.php    |  2 +-
 .../Helper => View/Helper/Root}/Excerpt.php   |  2 +-
 .../Helper/Root}/Flashmessages.php            |  2 +-
 .../Helper/Root}/GetLastSearchLink.php        |  2 +-
 .../Helper => View/Helper/Root}/HeadLink.php  |  2 +-
 .../Helper/Root}/HeadScript.php               |  2 +-
 .../Helper/Root}/HeadThemeResources.php       |  2 +-
 .../Helper => View/Helper/Root}/Highlight.php |  2 +-
 .../Root/Helper => View/Helper/Root}/Ils.php  |  2 +-
 .../Helper => View/Helper/Root}/ImageLink.php |  2 +-
 .../Helper/Root}/InlineScript.php             |  4 +-
 .../Helper/Root}/JqueryValidation.php         |  2 +-
 .../Helper => View/Helper/Root}/MobileUrl.php |  2 +-
 .../Helper => View/Helper/Root}/OpenUrl.php   |  2 +-
 .../Helper => View/Helper/Root}/Printms.php   |  2 +-
 .../Helper => View/Helper/Root}/ProxyUrl.php  |  2 +-
 .../Helper => View/Helper/Root}/Recommend.php |  2 +-
 .../Helper => View/Helper/Root}/Record.php    |  4 +-
 .../Helper/Root}/RecordLink.php               |  2 +-
 .../Helper => View/Helper/Root}/Related.php   |  2 +-
 .../Helper/Root}/RenderArray.php              |  2 +-
 .../Helper/Root}/ResultFeed.php               |  2 +-
 .../Helper => View/Helper/Root}/Reviews.php   |  2 +-
 .../Helper/Root}/SafeMoneyFormat.php          |  2 +-
 .../Helper/Root}/SearchOptions.php            |  2 +-
 .../Helper/Root}/SortFacetList.php            |  2 +-
 .../Helper => View/Helper/Root}/Summon.php    |  2 +-
 .../Helper/Root}/SyndeticsPlus.php            |  4 +-
 .../Helper/Root}/SystemEmail.php              |  2 +-
 .../Helper => View/Helper/Root}/TransEsc.php  |  2 +-
 .../Helper => View/Helper/Root}/Translate.php |  2 +-
 .../Helper => View/Helper/Root}/Truncate.php  |  2 +-
 .../Helper => View/Helper/Root}/UserList.php  |  2 +-
 .../Helper/Root}/VideoClips.php               |  2 +-
 .../Helper/jQueryMobile}/MobileMenu.php       |  2 +-
 .../Helper/Root}/ResultFeedTest.php           |  4 +-
 .../Helper/Root}/CitationTest.php             |  4 +-
 themes/blueprint/theme.config.php             |  4 +-
 themes/jquerymobile/theme.config.php          |  2 +-
 themes/root/theme.config.php                  | 88 +++++++++----------
 54 files changed, 104 insertions(+), 104 deletions(-)
 rename module/VuFind/src/VuFind/{Theme/Blueprint/Helper => View/Helper/Blueprint}/LayoutClass.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Blueprint/Helper => View/Helper/Blueprint}/Search.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/AbstractServiceLocator.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/AbstractSyndetics.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/AddEllipsis.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/AddThis.php (97%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Auth.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/AuthorNotes.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Browse.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Cart.php (97%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Citation.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Context.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/CurrentPath.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/DateTime.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/DisplayLanguageOption.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Excerpt.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Flashmessages.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/GetLastSearchLink.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/HeadLink.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/HeadScript.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/HeadThemeResources.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Highlight.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Ils.php (97%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/ImageLink.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/InlineScript.php (96%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/JqueryValidation.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/MobileUrl.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/OpenUrl.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Printms.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/ProxyUrl.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Recommend.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Record.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/RecordLink.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Related.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/RenderArray.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/ResultFeed.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Reviews.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/SafeMoneyFormat.php (99%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/SearchOptions.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/SortFacetList.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Summon.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/SyndeticsPlus.php (96%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/SystemEmail.php (97%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/TransEsc.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Translate.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/Truncate.php (98%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/UserList.php (97%)
 rename module/VuFind/src/VuFind/{Theme/Root/Helper => View/Helper/Root}/VideoClips.php (99%)
 rename module/VuFind/src/VuFind/{Theme/jQueryMobile/Helper => View/Helper/jQueryMobile}/MobileMenu.php (98%)
 rename module/VuFind/tests/integration-tests/src/{Theme/Root/Helper => View/Helper/Root}/ResultFeedTest.php (97%)
 rename module/VuFind/tests/unit-tests/src/{Theme/Root/Helper => View/Helper/Root}/CitationTest.php (99%)

diff --git a/module/VuFind/src/VuFind/Theme/Blueprint/Helper/LayoutClass.php b/module/VuFind/src/VuFind/View/Helper/Blueprint/LayoutClass.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Blueprint/Helper/LayoutClass.php
rename to module/VuFind/src/VuFind/View/Helper/Blueprint/LayoutClass.php
index 109386a355a..4fbabf43622 100644
--- a/module/VuFind/src/VuFind/Theme/Blueprint/Helper/LayoutClass.php
+++ b/module/VuFind/src/VuFind/View/Helper/Blueprint/LayoutClass.php
@@ -26,7 +26,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/system_classes Wiki
  */
-namespace VuFind\Theme\Blueprint\Helper;
+namespace VuFind\View\Helper\Blueprint;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Blueprint/Helper/Search.php b/module/VuFind/src/VuFind/View/Helper/Blueprint/Search.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Blueprint/Helper/Search.php
rename to module/VuFind/src/VuFind/View/Helper/Blueprint/Search.php
index ad6d1891cc4..80186d4bcd5 100644
--- a/module/VuFind/src/VuFind/Theme/Blueprint/Helper/Search.php
+++ b/module/VuFind/src/VuFind/View/Helper/Blueprint/Search.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/system_classes Wiki
  */
-namespace VuFind\Theme\Blueprint\Helper;
+namespace VuFind\View\Helper\Blueprint;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/AbstractServiceLocator.php b/module/VuFind/src/VuFind/View/Helper/Root/AbstractServiceLocator.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/AbstractServiceLocator.php
rename to module/VuFind/src/VuFind/View/Helper/Root/AbstractServiceLocator.php
index aafa5012f94..5c944ad49fb 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/AbstractServiceLocator.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/AbstractServiceLocator.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\ServiceManager\ServiceLocatorInterface,
     Zend\ServiceManager\ServiceLocatorAwareInterface,
     Zend\View\Helper\AbstractHelper;
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/AbstractSyndetics.php b/module/VuFind/src/VuFind/View/Helper/Root/AbstractSyndetics.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/AbstractSyndetics.php
rename to module/VuFind/src/VuFind/View/Helper/Root/AbstractSyndetics.php
index 83b31de9fc1..21a0c6071c3 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/AbstractSyndetics.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/AbstractSyndetics.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/AddEllipsis.php b/module/VuFind/src/VuFind/View/Helper/Root/AddEllipsis.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/AddEllipsis.php
rename to module/VuFind/src/VuFind/View/Helper/Root/AddEllipsis.php
index f3716c5fb99..a2d94375295 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/AddEllipsis.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/AddEllipsis.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/AddThis.php b/module/VuFind/src/VuFind/View/Helper/Root/AddThis.php
similarity index 97%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/AddThis.php
rename to module/VuFind/src/VuFind/View/Helper/Root/AddThis.php
index d885805c1e5..8e938e37429 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/AddThis.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/AddThis.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php b/module/VuFind/src/VuFind/View/Helper/Root/Auth.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Auth.php
index 048fdbc80c4..52bf19d4d03 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Auth.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Exception\RuntimeException;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/AuthorNotes.php b/module/VuFind/src/VuFind/View/Helper/Root/AuthorNotes.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/AuthorNotes.php
rename to module/VuFind/src/VuFind/View/Helper/Root/AuthorNotes.php
index c243f22d076..dc3025011d2 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/AuthorNotes.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/AuthorNotes.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use DOMDocument;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Browse.php b/module/VuFind/src/VuFind/View/Helper/Root/Browse.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Browse.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Browse.php
index 1656a88c9e7..8e0f2c7edff 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Browse.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Browse.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Cart.php b/module/VuFind/src/VuFind/View/Helper/Root/Cart.php
similarity index 97%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Cart.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Cart.php
index 29fe5e03903..788bfdf607d 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Cart.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Cart.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 
 /**
  * Cart view helper
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Citation.php b/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Citation.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Citation.php
index 07d7445df14..02743c432fe 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Citation.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use VuFind\Date\Converter as DateConverter, VuFind\Exception\Date as DateException,
     Zend\View\Helper\AbstractHelper;
 
@@ -49,7 +49,7 @@ class Citation extends AbstractHelper
      *
      * @param \VuFind\RecordDriver\Base $driver Record driver object.
      *
-     * @return \VuFind\Theme\Root\Helper\Citation
+     * @return Citation
      */
     public function __invoke($driver)
     {
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Context.php b/module/VuFind/src/VuFind/View/Helper/Root/Context.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Context.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Context.php
index 9da5e0dc025..87a7aac802c 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Context.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Context.php
@@ -27,7 +27,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper, Zend\View\Renderer\RendererInterface;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/CurrentPath.php b/module/VuFind/src/VuFind/View/Helper/Root/CurrentPath.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/CurrentPath.php
rename to module/VuFind/src/VuFind/View/Helper/Root/CurrentPath.php
index 12e39538660..6d069857650 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/CurrentPath.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/CurrentPath.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/DateTime.php b/module/VuFind/src/VuFind/View/Helper/Root/DateTime.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/DateTime.php
rename to module/VuFind/src/VuFind/View/Helper/Root/DateTime.php
index 4ccaf2dd2fc..5fe04d40e01 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/DateTime.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/DateTime.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use VuFind\Date\Converter as DateConverter, Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/DisplayLanguageOption.php b/module/VuFind/src/VuFind/View/Helper/Root/DisplayLanguageOption.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/DisplayLanguageOption.php
rename to module/VuFind/src/VuFind/View/Helper/Root/DisplayLanguageOption.php
index ea212b6ff3b..b4539e01071 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/DisplayLanguageOption.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/DisplayLanguageOption.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 
 /**
  * DisplayLanguageOption view helper
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Excerpt.php b/module/VuFind/src/VuFind/View/Helper/Root/Excerpt.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Excerpt.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Excerpt.php
index 300b6a89165..5ab58621480 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Excerpt.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Excerpt.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use DOMDocument;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Flashmessages.php b/module/VuFind/src/VuFind/View/Helper/Root/Flashmessages.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Flashmessages.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Flashmessages.php
index 7f62451dc73..e3a9c1751a0 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Flashmessages.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Flashmessages.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/GetLastSearchLink.php b/module/VuFind/src/VuFind/View/Helper/Root/GetLastSearchLink.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/GetLastSearchLink.php
rename to module/VuFind/src/VuFind/View/Helper/Root/GetLastSearchLink.php
index 520f244f24b..9a78eb8425c 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/GetLastSearchLink.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/GetLastSearchLink.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use VuFind\Search\Memory, Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/HeadLink.php b/module/VuFind/src/VuFind/View/Helper/Root/HeadLink.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/HeadLink.php
rename to module/VuFind/src/VuFind/View/Helper/Root/HeadLink.php
index ad7910271b7..eeb4a25bdc3 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/HeadLink.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/HeadLink.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\ServiceManager\ServiceLocatorInterface,
     Zend\ServiceManager\ServiceLocatorAwareInterface;
 
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/HeadScript.php b/module/VuFind/src/VuFind/View/Helper/Root/HeadScript.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/HeadScript.php
rename to module/VuFind/src/VuFind/View/Helper/Root/HeadScript.php
index 830240c5561..1929204bd4a 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/HeadScript.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/HeadScript.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\ServiceManager\ServiceLocatorInterface,
     Zend\ServiceManager\ServiceLocatorAwareInterface;
 
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/HeadThemeResources.php b/module/VuFind/src/VuFind/View/Helper/Root/HeadThemeResources.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/HeadThemeResources.php
rename to module/VuFind/src/VuFind/View/Helper/Root/HeadThemeResources.php
index 31abed9e5db..6c006933478 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/HeadThemeResources.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/HeadThemeResources.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Highlight.php b/module/VuFind/src/VuFind/View/Helper/Root/Highlight.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Highlight.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Highlight.php
index e9ac2509a46..e1993afba23 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Highlight.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Highlight.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Ils.php b/module/VuFind/src/VuFind/View/Helper/Root/Ils.php
similarity index 97%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Ils.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Ils.php
index c337b61568d..d819a28efc9 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Ils.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Ils.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/ImageLink.php b/module/VuFind/src/VuFind/View/Helper/Root/ImageLink.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/ImageLink.php
rename to module/VuFind/src/VuFind/View/Helper/Root/ImageLink.php
index a73ad8836f9..23183d68af1 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/ImageLink.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/ImageLink.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/InlineScript.php b/module/VuFind/src/VuFind/View/Helper/Root/InlineScript.php
similarity index 96%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/InlineScript.php
rename to module/VuFind/src/VuFind/View/Helper/Root/InlineScript.php
index 58a8ce414a4..dfd865e25d6 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/InlineScript.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/InlineScript.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 
 /**
  * Inline script view helper (extended for VuFind's theme system)
@@ -56,7 +56,7 @@ class InlineScript extends HeadScript
      * @param array  $attrs     Array of script attributes
      * @param string $type      Script type and/or array of script attributes
      *
-     * @return \VuFind\Theme\Root\Helper\InlineScript
+     * @return InlineScript
      */
     public function __invoke($mode = HeadScript::FILE, $spec = null,
         $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript'
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/JqueryValidation.php b/module/VuFind/src/VuFind/View/Helper/Root/JqueryValidation.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/JqueryValidation.php
rename to module/VuFind/src/VuFind/View/Helper/Root/JqueryValidation.php
index 0e4f518462f..1ab81068be3 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/JqueryValidation.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/JqueryValidation.php
@@ -26,7 +26,7 @@
  * @link     http://www.vufind.org   Main Site
  * @link     http://www.jquery.com   jQuery Project Page
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/MobileUrl.php b/module/VuFind/src/VuFind/View/Helper/Root/MobileUrl.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/MobileUrl.php
rename to module/VuFind/src/VuFind/View/Helper/Root/MobileUrl.php
index 546b54943a5..6217748e22b 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/MobileUrl.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/MobileUrl.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 
 /**
  * Mobile URL view helper
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/OpenUrl.php b/module/VuFind/src/VuFind/View/Helper/Root/OpenUrl.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/OpenUrl.php
rename to module/VuFind/src/VuFind/View/Helper/Root/OpenUrl.php
index 4109ddf5393..b9c80ed0042 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/OpenUrl.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/OpenUrl.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Printms.php b/module/VuFind/src/VuFind/View/Helper/Root/Printms.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Printms.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Printms.php
index e5c52a920ba..820b40ddb3b 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Printms.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Printms.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/ProxyUrl.php b/module/VuFind/src/VuFind/View/Helper/Root/ProxyUrl.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/ProxyUrl.php
rename to module/VuFind/src/VuFind/View/Helper/Root/ProxyUrl.php
index 6ed4ab0b2d8..48b87629fb5 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/ProxyUrl.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/ProxyUrl.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Recommend.php b/module/VuFind/src/VuFind/View/Helper/Root/Recommend.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Recommend.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Recommend.php
index f10de410eb4..3242aad1031 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Recommend.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Recommend.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Exception\RuntimeException, Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Record.php b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Record.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Record.php
index f53d864b064..0efe8fc5b58 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Record.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Exception\RuntimeException,
     Zend\View\Helper\AbstractHelper;
 
@@ -97,7 +97,7 @@ class Record extends AbstractHelper
      *
      * @param \VuFind\RecordDriver\AbstractBase $driver Record driver object.
      *
-     * @return \VuFind\Theme\Root\Helper\Record
+     * @return Record
      */
     public function __invoke($driver)
     {
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/RecordLink.php b/module/VuFind/src/VuFind/View/Helper/Root/RecordLink.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/RecordLink.php
rename to module/VuFind/src/VuFind/View/Helper/Root/RecordLink.php
index 05f3d748b21..9060f5a7b38 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/RecordLink.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/RecordLink.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Related.php b/module/VuFind/src/VuFind/View/Helper/Root/Related.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Related.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Related.php
index 8758eca8d34..2bd301ec893 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Related.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Related.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Exception\RuntimeException, Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/RenderArray.php b/module/VuFind/src/VuFind/View/Helper/Root/RenderArray.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/RenderArray.php
rename to module/VuFind/src/VuFind/View/Helper/Root/RenderArray.php
index c9e3772ce13..b159ce7ccef 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/RenderArray.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/RenderArray.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/ResultFeed.php b/module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/ResultFeed.php
rename to module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php
index 50ec36c89a8..7fd09c7fc69 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/ResultFeed.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use DateTime, Zend\Feed\Writer\Writer as FeedWriter, Zend\Feed\Writer\Feed,
     Zend\View\Helper\AbstractHelper;
 
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Reviews.php b/module/VuFind/src/VuFind/View/Helper/Root/Reviews.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Reviews.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Reviews.php
index d4cd48b7905..426b0281ebf 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Reviews.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Reviews.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use DOMDocument, ZendService\Amazon\Amazon;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/SafeMoneyFormat.php b/module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/SafeMoneyFormat.php
rename to module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php
index bfb1ca63b3f..dc4f19c0461 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/SafeMoneyFormat.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/SearchOptions.php b/module/VuFind/src/VuFind/View/Helper/Root/SearchOptions.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/SearchOptions.php
rename to module/VuFind/src/VuFind/View/Helper/Root/SearchOptions.php
index e93c7a92d0c..d8b68532d23 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/SearchOptions.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SearchOptions.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 
 /**
  * "Retrieve search options" view helper
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/SortFacetList.php b/module/VuFind/src/VuFind/View/Helper/Root/SortFacetList.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/SortFacetList.php
rename to module/VuFind/src/VuFind/View/Helper/Root/SortFacetList.php
index 4867306bc92..892c6d2991a 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/SortFacetList.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SortFacetList.php
@@ -26,7 +26,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Summon.php b/module/VuFind/src/VuFind/View/Helper/Root/Summon.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Summon.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Summon.php
index 1e73c76827b..c80ac784009 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Summon.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Summon.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/SyndeticsPlus.php b/module/VuFind/src/VuFind/View/Helper/Root/SyndeticsPlus.php
similarity index 96%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/SyndeticsPlus.php
rename to module/VuFind/src/VuFind/View/Helper/Root/SyndeticsPlus.php
index 887682bcdc0..3fd33e623c7 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/SyndeticsPlus.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SyndeticsPlus.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
 
 /**
@@ -44,7 +44,7 @@ class SyndeticsPlus extends AbstractHelper
     /**
      * Provides access to other class methods.
      *
-     * @return \VuFind\Theme\Root\Helper\SyndeticsPlus
+     * @return SyndeticsPlus
      */
     public function __invoke()
     {
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/SystemEmail.php b/module/VuFind/src/VuFind/View/Helper/Root/SystemEmail.php
similarity index 97%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/SystemEmail.php
rename to module/VuFind/src/VuFind/View/Helper/Root/SystemEmail.php
index cfe0c81911d..69acab38a3f 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/SystemEmail.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SystemEmail.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/TransEsc.php b/module/VuFind/src/VuFind/View/Helper/Root/TransEsc.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/TransEsc.php
rename to module/VuFind/src/VuFind/View/Helper/Root/TransEsc.php
index d3a62ae1e30..86f14de189c 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/TransEsc.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/TransEsc.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Translate.php b/module/VuFind/src/VuFind/View/Helper/Root/Translate.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Translate.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Translate.php
index 8d695a46843..ba1758411df 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Translate.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Translate.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\I18n\Exception\RuntimeException,
     Zend\I18n\View\Helper\AbstractTranslatorHelper;
 
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Truncate.php b/module/VuFind/src/VuFind/View/Helper/Root/Truncate.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/Truncate.php
rename to module/VuFind/src/VuFind/View/Helper/Root/Truncate.php
index 440d504739a..6faada51fdb 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Truncate.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Truncate.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/UserList.php b/module/VuFind/src/VuFind/View/Helper/Root/UserList.php
similarity index 97%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/UserList.php
rename to module/VuFind/src/VuFind/View/Helper/Root/UserList.php
index 284d49d7108..63c976c7604 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/UserList.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/UserList.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use VuFind\Db\Row\UserList as UserListRow, Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/VideoClips.php b/module/VuFind/src/VuFind/View/Helper/Root/VideoClips.php
similarity index 99%
rename from module/VuFind/src/VuFind/Theme/Root/Helper/VideoClips.php
rename to module/VuFind/src/VuFind/View/Helper/Root/VideoClips.php
index c1f9da03fae..3abb9706d75 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/VideoClips.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/VideoClips.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\Root\Helper;
+namespace VuFind\View\Helper\Root;
 use DOMDocument;
 
 /**
diff --git a/module/VuFind/src/VuFind/Theme/jQueryMobile/Helper/MobileMenu.php b/module/VuFind/src/VuFind/View/Helper/jQueryMobile/MobileMenu.php
similarity index 98%
rename from module/VuFind/src/VuFind/Theme/jQueryMobile/Helper/MobileMenu.php
rename to module/VuFind/src/VuFind/View/Helper/jQueryMobile/MobileMenu.php
index dd886883e90..e44f9f24391 100644
--- a/module/VuFind/src/VuFind/Theme/jQueryMobile/Helper/MobileMenu.php
+++ b/module/VuFind/src/VuFind/View/Helper/jQueryMobile/MobileMenu.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-namespace VuFind\Theme\jQueryMobile\Helper;
+namespace VuFind\View\Helper\jQueryMobile;
 use Zend\View\Helper\AbstractHelper;
 
 /**
diff --git a/module/VuFind/tests/integration-tests/src/Theme/Root/Helper/ResultFeedTest.php b/module/VuFind/tests/integration-tests/src/View/Helper/Root/ResultFeedTest.php
similarity index 97%
rename from module/VuFind/tests/integration-tests/src/Theme/Root/Helper/ResultFeedTest.php
rename to module/VuFind/tests/integration-tests/src/View/Helper/Root/ResultFeedTest.php
index e090dd9412f..dd67e495f7a 100644
--- a/module/VuFind/tests/integration-tests/src/Theme/Root/Helper/ResultFeedTest.php
+++ b/module/VuFind/tests/integration-tests/src/View/Helper/Root/ResultFeedTest.php
@@ -25,8 +25,8 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFind\IntegrationTest\Theme\Root\Helper;
-use VuFind\Theme\Root\Helper\ResultFeed;
+namespace VuFind\IntegrationTest\View\Helper\Root;
+use VuFind\View\Helper\Root\ResultFeed;
 
 /**
  * ResultFeed Test Class
diff --git a/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php b/module/VuFind/tests/unit-tests/src/View/Helper/Root/CitationTest.php
similarity index 99%
rename from module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php
rename to module/VuFind/tests/unit-tests/src/View/Helper/Root/CitationTest.php
index a36da54e010..5ee9a9bfc69 100644
--- a/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php
+++ b/module/VuFind/tests/unit-tests/src/View/Helper/Root/CitationTest.php
@@ -25,8 +25,8 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFind\Test\Theme\Root\Helper;
-use VuFind\Theme\Root\Helper\Citation;
+namespace VuFind\Test\View\Helper\Root;
+use VuFind\View\Helper\Root\Citation;
 
 /**
  * CitationBuilder Test Class
diff --git a/themes/blueprint/theme.config.php b/themes/blueprint/theme.config.php
index 979db456d4b..cc04d0335c6 100644
--- a/themes/blueprint/theme.config.php
+++ b/themes/blueprint/theme.config.php
@@ -22,8 +22,8 @@ return array(
     'favicon' => 'vufind-favicon.ico',
     'helpers' => array(
         'invokables' => array(
-            'layoutclass' => 'VuFind\Theme\Blueprint\Helper\LayoutClass',
-            'search' => 'VuFind\Theme\Blueprint\Helper\Search',
+            'layoutclass' => 'VuFind\View\Helper\Blueprint\LayoutClass',
+            'search' => 'VuFind\View\Helper\Blueprint\Search',
         )
     )
 );
\ No newline at end of file
diff --git a/themes/jquerymobile/theme.config.php b/themes/jquerymobile/theme.config.php
index 8a2ccefd0db..036199dd2de 100644
--- a/themes/jquerymobile/theme.config.php
+++ b/themes/jquerymobile/theme.config.php
@@ -18,7 +18,7 @@ return array(
     'favicon' => 'vufind-favicon.ico',
     'helpers' => array(
         'invokables' => array(
-            'mobilemenu' => 'VuFind\Theme\jQueryMobile\Helper\MobileMenu'
+            'mobilemenu' => 'VuFind\View\Helper\jQueryMobile\MobileMenu'
         )
     ),
 );
\ No newline at end of file
diff --git a/themes/root/theme.config.php b/themes/root/theme.config.php
index 5a88177e3d5..380594b4f2f 100644
--- a/themes/root/theme.config.php
+++ b/themes/root/theme.config.php
@@ -3,50 +3,50 @@ return array(
     'extends' => false,
     'helpers' => array(
         'invokables' => array(
-            'addellipsis' => 'VuFind\Theme\Root\Helper\AddEllipsis',
-            'addthis' => 'VuFind\Theme\Root\Helper\AddThis',
-            'auth' => 'VuFind\Theme\Root\Helper\Auth',
-            'authornotes' => 'VuFind\Theme\Root\Helper\AuthorNotes',
-            'browse' => 'VuFind\Theme\Root\Helper\Browse',
-            'cart' => 'VuFind\Theme\Root\Helper\Cart',
-            'citation' => 'VuFind\Theme\Root\Helper\Citation',
-            'context' => 'VuFind\Theme\Root\Helper\Context',
-            'currentpath' => 'VuFind\Theme\Root\Helper\CurrentPath',
-            'datetime' => 'VuFind\Theme\Root\Helper\DateTime',
-            'displaylanguageoption' => 'VuFind\Theme\Root\Helper\DisplayLanguageOption',
-            'excerpt' => 'VuFind\Theme\Root\Helper\Excerpt',
-            'flashmessages' => 'VuFind\Theme\Root\Helper\Flashmessages',
-            'getlastsearchlink' => 'VuFind\Theme\Root\Helper\GetLastSearchLink',
-            'headlink' => 'VuFind\Theme\Root\Helper\HeadLink',
-            'headscript' => 'VuFind\Theme\Root\Helper\HeadScript',
-            'headthemeresources' => 'VuFind\Theme\Root\Helper\HeadThemeResources',
-            'highlight' => 'VuFind\Theme\Root\Helper\Highlight',
-            'ils' => 'VuFind\Theme\Root\Helper\Ils',
-            'imagelink' => 'VuFind\Theme\Root\Helper\ImageLink',
-            'inlinescript' => 'VuFind\Theme\Root\Helper\InlineScript',
-            'jqueryvalidation' => 'VuFind\Theme\Root\Helper\JqueryValidation',
-            'mobileurl' => 'VuFind\Theme\Root\Helper\MobileUrl',
-            'openurl' => 'VuFind\Theme\Root\Helper\OpenUrl',
-            'printms' => 'VuFind\Theme\Root\Helper\Printms',
-            'proxyurl' => 'VuFind\Theme\Root\Helper\ProxyUrl',
-            'recommend' => 'VuFind\Theme\Root\Helper\Recommend',
-            'record' => 'VuFind\Theme\Root\Helper\Record',
-            'recordlink' => 'VuFind\Theme\Root\Helper\RecordLink',
-            'related' => 'VuFind\Theme\Root\Helper\Related',
-            'renderarray' => 'VuFind\Theme\Root\Helper\RenderArray',
-            'resultfeed' => 'VuFind\Theme\Root\Helper\ResultFeed',
-            'reviews' => 'VuFind\Theme\Root\Helper\Reviews',
-            'searchoptions' => 'VuFind\Theme\Root\Helper\SearchOptions',
-            'safemoneyformat' => 'VuFind\Theme\Root\Helper\SafeMoneyFormat',
-            'sortfacetlist' => 'VuFind\Theme\Root\Helper\SortFacetList',
-            'summon' => 'VuFind\Theme\Root\Helper\Summon',
-            'syndeticsplus' => 'VuFind\Theme\Root\Helper\SyndeticsPlus',
-            'systememail' => 'VuFind\Theme\Root\Helper\SystemEmail',
-            'transesc' => 'VuFind\Theme\Root\Helper\TransEsc',
-            'translate' => 'VuFind\Theme\Root\Helper\Translate',
-            'truncate' => 'VuFind\Theme\Root\Helper\Truncate',
-            'userlist' => 'VuFind\Theme\Root\Helper\UserList',
-            'videoclips' => 'VuFind\Theme\Root\Helper\VideoClips',
+            'addellipsis' => 'VuFind\View\Helper\Root\AddEllipsis',
+            'addthis' => 'VuFind\View\Helper\Root\AddThis',
+            'auth' => 'VuFind\View\Helper\Root\Auth',
+            'authornotes' => 'VuFind\View\Helper\Root\AuthorNotes',
+            'browse' => 'VuFind\View\Helper\Root\Browse',
+            'cart' => 'VuFind\View\Helper\Root\Cart',
+            'citation' => 'VuFind\View\Helper\Root\Citation',
+            'context' => 'VuFind\View\Helper\Root\Context',
+            'currentpath' => 'VuFind\View\Helper\Root\CurrentPath',
+            'datetime' => 'VuFind\View\Helper\Root\DateTime',
+            'displaylanguageoption' => 'VuFind\View\Helper\Root\DisplayLanguageOption',
+            'excerpt' => 'VuFind\View\Helper\Root\Excerpt',
+            'flashmessages' => 'VuFind\View\Helper\Root\Flashmessages',
+            'getlastsearchlink' => 'VuFind\View\Helper\Root\GetLastSearchLink',
+            'headlink' => 'VuFind\View\Helper\Root\HeadLink',
+            'headscript' => 'VuFind\View\Helper\Root\HeadScript',
+            'headthemeresources' => 'VuFind\View\Helper\Root\HeadThemeResources',
+            'highlight' => 'VuFind\View\Helper\Root\Highlight',
+            'ils' => 'VuFind\View\Helper\Root\Ils',
+            'imagelink' => 'VuFind\View\Helper\Root\ImageLink',
+            'inlinescript' => 'VuFind\View\Helper\Root\InlineScript',
+            'jqueryvalidation' => 'VuFind\View\Helper\Root\JqueryValidation',
+            'mobileurl' => 'VuFind\View\Helper\Root\MobileUrl',
+            'openurl' => 'VuFind\View\Helper\Root\OpenUrl',
+            'printms' => 'VuFind\View\Helper\Root\Printms',
+            'proxyurl' => 'VuFind\View\Helper\Root\ProxyUrl',
+            'recommend' => 'VuFind\View\Helper\Root\Recommend',
+            'record' => 'VuFind\View\Helper\Root\Record',
+            'recordlink' => 'VuFind\View\Helper\Root\RecordLink',
+            'related' => 'VuFind\View\Helper\Root\Related',
+            'renderarray' => 'VuFind\View\Helper\Root\RenderArray',
+            'resultfeed' => 'VuFind\View\Helper\Root\ResultFeed',
+            'reviews' => 'VuFind\View\Helper\Root\Reviews',
+            'searchoptions' => 'VuFind\View\Helper\Root\SearchOptions',
+            'safemoneyformat' => 'VuFind\View\Helper\Root\SafeMoneyFormat',
+            'sortfacetlist' => 'VuFind\View\Helper\Root\SortFacetList',
+            'summon' => 'VuFind\View\Helper\Root\Summon',
+            'syndeticsplus' => 'VuFind\View\Helper\Root\SyndeticsPlus',
+            'systememail' => 'VuFind\View\Helper\Root\SystemEmail',
+            'transesc' => 'VuFind\View\Helper\Root\TransEsc',
+            'translate' => 'VuFind\View\Helper\Root\Translate',
+            'truncate' => 'VuFind\View\Helper\Root\Truncate',
+            'userlist' => 'VuFind\View\Helper\Root\UserList',
+            'videoclips' => 'VuFind\View\Helper\Root\VideoClips',
         )
     ),
 );
-- 
GitLab