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 109386a355a4e58ba7ac429011ecc039de0bbf74..4fbabf436223bd7346c68e74920d27157c680a2b 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 ad6d1891cc4155061d98fa199e097a1fdfc1355e..80186d4bcd54a820be78203b25df7059a668abca 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 aafa5012f949de76cfe470590cffd908760643d7..5c944ad49fb334cddb58714c16ca80e191acc2b0 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 83b31de9fc1cb0df7d082c33acc476e8f62967e6..21a0c6071c33b1929d76d0c3f4593aa77797ba8f 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 f3716c5fb9967c9dd34136bf842109d083757ed7..a2d94375295e306f75e7439c15bf3aa0315f4ce9 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 d885805c1e5b1172fd20311216fef508afe00d61..8e938e3742952d0d7c652f7f8f8283b6d486590b 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 048fdbc80c4a6564f4eee4249142191544e6ff5a..52bf19d4d03a5e7033f06d123a0c79e50041e3cd 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 c243f22d076f213804cbe30540d2cf59ceea475c..dc3025011d29f79533f715451b156e73d76106fd 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 1656a88c9e74a35acddcf05421512e22b0495b73..8e0f2c7edffa0a5b3a02d215ba89ed7fb8d04902 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 29fe5e0390355961de6c9cc41a1692b106447199..788bfdf607dc5a77d5598c8b004a22f5a1e4bd6f 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 07d7445df14ac65719cbd76d8232865bc8700322..02743c432fe7a67e536030b830d6fe32572d6f54 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 9da5e0dc025071417c477b5b75585ebce83b8feb..87a7aac802c7d884c07bdcd34482381316e32840 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 12e39538660c60d598b146b1647488474acbe0ee..6d0698576505146ff3254f19e3c2f3cb45f6a3f2 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 4ccaf2dd2fce27bdb793fec3bb8706ba96d86079..5fe04d40e0136c7c83471ccd9b80d7e7ec557e55 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 ea212b6ff3b41e4de8967e40817f530df7a6b78e..b4539e01071a1e010daf11038d06ce627d082a8d 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 300b6a891653157e88cb264f3ffd732a230d9c1c..5ab5862148028ba181e1e3bed28d901713ea25ed 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 7f62451dc735ddaaad1be1ffd9c501a2466d4910..e3a9c1751a06cddb1914fc5bc975ab5da096e2a8 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 520f244f24bacc9404c60d7cfda2910bd9ec894c..9a78eb8425c0dec3749784b634d397d0fc36411f 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 ad7910271b7d41de8b37e7ad5f8df5f027d97e11..eeb4a25bdc37ee04083536f150ad7258ce0b2e58 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 830240c55614f195b0e4f5b05e8d121593f87e9e..1929204bd4a3e6c68df4a597c7374a77f783dfab 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 31abed9e5dbe7b9ba87a712e7e7ef1cad2087668..6c0069334786f335856c0044f5ca1d6e94466e09 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 e9ac2509a46397d2a4672a05ae488b893d2599c6..e1993afba231ba55d9d3f37dd8d2e313fbdbad96 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 c337b61568d172f9582f98ff0f32c060b84797b2..d819a28efc9aa9166d9c7f999f7886b677e97ccf 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 a73ad8836f9de961d8be035bf6339bfe950fbda3..23183d68af11ae3e8e2ba474ab967482f47ce6e6 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 58a8ce414a4147978a32ab5dce2fc5dc613f3d22..dfd865e25d6751ff02ecab95143b4ec3d8f5e9c1 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 0e4f518462fef6d2d36d074d604231c7bc04fa3b..1ab81068be3a4d277719dce9c875326bc21bd772 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 546b54943a5117e351c0af20696b9beaf966faef..6217748e22bfb6bf6f1484915a40ab354472b092 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 4109ddf5393783c8107d8467328633957f983c67..b9c80ed0042f8a926756e354d0ba1b188af69cc5 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 e5c52a920ba8a8aafa85f824babb8ef97e3fdcec..820b40ddb3be4e4504dc6b331b8baf4bcaed4576 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 6ed4ab0b2d81bf350624e769227214e9708ab577..48b87629fb5f8a6312ce5663276225fe645826cb 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 f10de410eb48edee0ff14bfb319a845246af7921..3242aad1031700d17e83fa0e542895c626071280 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 f53d864b0648b721ea28adb73d81cfd0f2e09c68..0efe8fc5b58f72abd3660fa8294b9e331530fbec 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 05f3d748b2177162ffda74d6ccc781231e27dd5c..9060f5a7b382a38bec68277622dc158f8a8692cd 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 8758eca8d34128e68b4466ac6bfad17df556cb61..2bd301ec8931a05aa74f7499936f54e44cf29688 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 c9e3772ce139cc260054d48d44ebab1b2bfd65e8..b159ce7ccef2f0ff08592e295db506bebc955355 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 50ec36c89a8af69a091af4adcc8338f2e90d0331..7fd09c7fc690d299b2ea6941dbbe50d0851e3e54 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 d4cd48b790549a08e2ee99497a4310b5d6c0239e..426b0281ebf57281cf82fd10b1c7327709351fb0 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 bfb1ca63b3f815b67f545deab3456296bf86bb71..dc4f19c0461724c831c71eae472695147fa84735 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 e93c7a92d0c1d53e09810a2cea002689eb308459..d8b68532d237678ae18f9afb07490c4c79fbeca1 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 4867306bc92a73728559b48fe10b14d9308d86cf..892c6d2991a5a042d3b9c5f69328c8e18a4c341d 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 1e73c76827b7d4233d81d855f3a9bf13355d10a0..c80ac784009b534033dedcbf8bf9b0f7a3e487e8 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 887682bcdc08b6ce76c77fcc80a76951c82963ec..3fd33e623c7385354d6b348041f5d32756315796 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 cfe0c81911d8b082817c9f70663d2a0a6f412d69..69acab38a3f0a269edf03dcd745fe67b6e87cd8a 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 d3a62ae1e30a068bc18bd71e7be233b3f4f4e834..86f14de189c5399d0cb10bfd64308fd5b3dc55c6 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 8d695a46843dd3e0d8e58ffc4e38911b0b87c6af..ba1758411dfe6e686afb111d5e94530a2f63f142 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 440d504739a944cd0fb53257c95e95e142424ac0..6faada51fdbd7e6e22691d77b027f7476325f40e 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 284d49d7108e85e2f33a417ab77dd25909249de5..63c976c7604621658c7acc849da3d5d07901118c 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 c1f9da03fae9db69aaf9f58787ccb2a021b3613c..3abb9706d75ff3bb98b651d8df688079b2b5783c 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 dd886883e90e5200225f45c0a0a7fbeac2823360..e44f9f24391ddf8adc2397cf59331e14824ffa49 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 e090dd9412f5c4a5384f0eccf27e0b70e5aede97..dd67e495f7a1fa461be6d2a1124979dbe053b0ce 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 a36da54e01067839b2adce190d75784e4c6b2c09..5ee9a9bfc690ba760b2488d639e0057522f37ec3 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 979db456d4bc9954b47eb7b89bcfe82147dde905..cc04d0335c612e13213ab09a58a10b5dc670c166 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 8a2ccefd0db43e0bca55736b6024f55b03d63912..036199dd2de293ce76d5fc4d34cd96e009556990 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 5a88177e3d5848d28597af31a5952a1f6f9d28aa..380594b4f2fcd687850aef929b823a43ce15365f 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',
         )
     ),
 );