diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index 43f6e352dd1c2bac1c32859a49ece2ca683b456a..38543c215a01a3b0a8a42ed8aae0dccec78ec2eb 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -303,10 +303,10 @@ $config = [
             'VuFind\Db\Table\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
             'VuFind\Export' => 'VuFind\ExportFactory',
             'VuFind\Favorites\FavoritesService' => 'VuFind\Favorites\FavoritesServiceFactory',
-            'VuFind\HierarchyDriverPluginManager' => 'VuFind\Service\Factory::getHierarchyDriverPluginManager',
-            'VuFind\HierarchyTreeDataFormatterPluginManager' => 'VuFind\Service\Factory::getHierarchyTreeDataFormatterPluginManager',
-            'VuFind\HierarchyTreeDataSourcePluginManager' => 'VuFind\Service\Factory::getHierarchyTreeDataSourcePluginManager',
-            'VuFind\HierarchyTreeRendererPluginManager' => 'VuFind\Service\Factory::getHierarchyTreeRendererPluginManager',
+            'VuFind\Hierarchy\Driver\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
+            'VuFind\Hierarchy\TreeDataFormatter\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
+            'VuFind\Hierarchy\TreeDataSource\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
+            'VuFind\Hierarchy\TreeRenderer\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
             'VuFind\Http' => 'VuFind\Service\Factory::getHttp',
             'VuFind\HMAC' => 'VuFind\Service\Factory::getHMAC',
             'VuFind\ILSAuthenticator' => 'VuFind\Auth\Factory::getILSAuthenticator',
@@ -377,6 +377,10 @@ $config = [
             'VuFind\DbRowPluginManager' => 'VuFind\Db\Row\PluginManager',
             'VuFind\DbTablePluginManager' => 'VuFind\Db\Table\PluginManager',
             'VuFind\HierarchicalFacetHelper' => 'VuFind\Search\Solr\HierarchicalFacetHelper',
+            'VuFind\HierarchyDriverPluginManager' => 'VuFind\Hierarchy\Driver\PluginManager',
+            'VuFind\HierarchyTreeDataFormatterPluginManager' => 'VuFind\Hierarchy\TreeDataFormatter\PluginManager',
+            'VuFind\HierarchyTreeDataSourcePluginManager' => 'VuFind\Hierarchy\TreeDataSource\PluginManager',
+            'VuFind\HierarchyTreeRendererPluginManager' => 'VuFind\Hierarchy\TreeRenderer\PluginManager',
             'VuFind\IpAddressUtils' => 'VuFind\Net\IpAddressUtils',
         ],
     ],
diff --git a/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBasedFactory.php b/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBasedFactory.php
index 46ece2613db76b661cbaedc91ffe12c6224eb1b7..e6fc33f577f0dea63974487209cc045b78e0839b 100644
--- a/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBasedFactory.php
+++ b/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBasedFactory.php
@@ -78,8 +78,8 @@ class ConfigurationBasedFactory
         // Build object:
         return new ConfigurationBased(
             $driverConfig,
-            $sm->get('VuFind\HierarchyTreeDataSourcePluginManager'),
-            $sm->get('VuFind\HierarchyTreeRendererPluginManager'),
+            $sm->get('VuFind\Hierarchy\TreeDataSource\PluginManager'),
+            $sm->get('VuFind\Hierarchy\TreeRenderer\PluginManager'),
             $options
         );
     }
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/SolrFactory.php b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/SolrFactory.php
index cd39e19d0ce5b540ecd5d3cf3e2a547b888be137..9e7b5736a5d6557ee2a1e65fceb4b3ccba4d1789 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/SolrFactory.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/SolrFactory.php
@@ -73,7 +73,7 @@ class SolrFactory implements \Zend\ServiceManager\Factory\FactoryInterface
         $solr = $container->get('VuFind\Search\BackendManager')
             ->get('Solr')->getConnector();
         $formatterManager = $container
-            ->get('VuFind\HierarchyTreeDataFormatterPluginManager');
+            ->get('VuFind\Hierarchy\TreeDataFormatter\PluginManager');
         return new $requestedName(
             $solr, $formatterManager, rtrim($cacheDir, '/') . '/hierarchy',
             $filters, $batchSize
diff --git a/module/VuFind/src/VuFind/RecordDriver/PluginManager.php b/module/VuFind/src/VuFind/RecordDriver/PluginManager.php
index 3d07a75636309e570fb85bed1e489bb8153bdab8..3c593edc451db89385c50250786a76b370106175 100644
--- a/module/VuFind/src/VuFind/RecordDriver/PluginManager.php
+++ b/module/VuFind/src/VuFind/RecordDriver/PluginManager.php
@@ -115,9 +115,9 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
             if ($hasHierarchyType
                 && is_callable([$instance, 'setHierarchyDriverManager'])
             ) {
-                if ($sm && $sm->has('VuFind\HierarchyDriverPluginManager')) {
+                if ($sm && $sm->has('VuFind\Hierarchy\Driver\PluginManager')) {
                     $instance->setHierarchyDriverManager(
-                        $sm->get('VuFind\HierarchyDriverPluginManager')
+                        $sm->get('VuFind\Hierarchy\Driver\PluginManager')
                     );
                 }
             }
diff --git a/module/VuFind/src/VuFind/Service/Factory.php b/module/VuFind/src/VuFind/Service/Factory.php
index d8c24bac5d05d7c81cc63d219a480805c1cfbc8d..a7db0ec4383d8ee3db0024db04073bec6f448389 100644
--- a/module/VuFind/src/VuFind/Service/Factory.php
+++ b/module/VuFind/src/VuFind/Service/Factory.php
@@ -133,56 +133,6 @@ class Factory
         );
     }
 
-    /**
-     * Construct the Hierarchy\Driver Plugin Manager.
-     *
-     * @param ServiceManager $sm Service manager.
-     *
-     * @return \VuFind\Hierarchy\Driver\PluginManager
-     */
-    public static function getHierarchyDriverPluginManager(ServiceManager $sm)
-    {
-        return static::getGenericPluginManager($sm, 'Hierarchy\Driver');
-    }
-
-    /**
-     * Construct the Hierarchy\TreeDataFormatter Plugin Manager.
-     *
-     * @param ServiceManager $sm Service manager.
-     *
-     * @return \VuFind\Hierarchy\TreeDataFormatter\PluginManager
-     */
-    public static function getHierarchyTreeDataFormatterPluginManager(
-        ServiceManager $sm
-    ) {
-        return static::getGenericPluginManager($sm, 'Hierarchy\TreeDataFormatter');
-    }
-
-    /**
-     * Construct the Hierarchy\TreeDataSource Plugin Manager.
-     *
-     * @param ServiceManager $sm Service manager.
-     *
-     * @return \VuFind\Hierarchy\TreeDataSource\PluginManager
-     */
-    public static function getHierarchyTreeDataSourcePluginManager(
-        ServiceManager $sm
-    ) {
-        return static::getGenericPluginManager($sm, 'Hierarchy\TreeDataSource');
-    }
-
-    /**
-     * Construct the Hierarchy\TreeRenderer Plugin Manager.
-     *
-     * @param ServiceManager $sm Service manager.
-     *
-     * @return \VuFind\Hierarchy\TreeRenderer\PluginManager
-     */
-    public static function getHierarchyTreeRendererPluginManager(ServiceManager $sm)
-    {
-        return static::getGenericPluginManager($sm, 'Hierarchy\TreeRenderer');
-    }
-
     /**
      * Construct the HTTP service.
      *