diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index 2cd2e9936e..752e2cc118 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -12,7 +12,7 @@ use PhpMyAdmin\Console;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Menu;
 use PhpMyAdmin\Message;
-use PMA\libraries\navigation\Navigation;
+use PhpMyAdmin\Navigation\Navigation;
 use PhpMyAdmin\RecentFavoriteTable;
 use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\Scripts;
diff --git a/libraries/navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php
similarity index 99%
rename from libraries/navigation/Navigation.php
rename to libraries/classes/Navigation/Navigation.php
index df5bd3cb0a..f801b52c7b 100644
--- a/libraries/navigation/Navigation.php
+++ b/libraries/classes/Navigation/Navigation.php
@@ -6,7 +6,7 @@
  *
  * @package PhpMyAdmin-navigation
  */
-namespace PMA\libraries\navigation;
+namespace PhpMyAdmin\Navigation;
 
 use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Message;
diff --git a/libraries/navigation/NavigationHeader.php b/libraries/classes/Navigation/NavigationHeader.php
similarity index 99%
rename from libraries/navigation/NavigationHeader.php
rename to libraries/classes/Navigation/NavigationHeader.php
index aba2b38910..2a6d5d8558 100644
--- a/libraries/navigation/NavigationHeader.php
+++ b/libraries/classes/Navigation/NavigationHeader.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation;
+namespace PhpMyAdmin\Navigation;
 
 use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\Template;
diff --git a/libraries/navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php
similarity index 99%
rename from libraries/navigation/NavigationTree.php
rename to libraries/classes/Navigation/NavigationTree.php
index d9ffa8a9de..bc55d00b62 100644
--- a/libraries/navigation/NavigationTree.php
+++ b/libraries/classes/Navigation/NavigationTree.php
@@ -5,13 +5,13 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation;
+namespace PhpMyAdmin\Navigation;
 
-use PMA\libraries\navigation\nodes\Node;
-use PMA\libraries\navigation\nodes\NodeDatabase;
-use PMA\libraries\navigation\nodes\NodeTable;
-use PMA\libraries\navigation\nodes\NodeTableContainer;
-use PMA\libraries\navigation\nodes\NodeViewContainer;
+use PhpMyAdmin\Navigation\Nodes\Node;
+use PhpMyAdmin\Navigation\Nodes\NodeDatabase;
+use PhpMyAdmin\Navigation\Nodes\NodeTable;
+use PhpMyAdmin\Navigation\Nodes\NodeTableContainer;
+use PhpMyAdmin\Navigation\Nodes\NodeViewContainer;
 use PhpMyAdmin\RecentFavoriteTable;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
@@ -860,7 +860,7 @@ class NavigationTree
         $children = $this->_tree->children;
         usort(
             $children,
-            array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
+            array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
         );
         $this->_setVisibility();
         for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
@@ -903,7 +903,7 @@ class NavigationTree
             $children = $node->children;
             usort(
                 $children,
-                array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
+                array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
             );
             for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
                 if ($i + 1 != $nbChildren) {
@@ -1299,7 +1299,7 @@ class NavigationTree
         $children = $this->_tree->children;
         usort(
             $children,
-            array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
+            array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
         );
         $this->_setVisibility();
         for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
diff --git a/libraries/navigation/NodeFactory.php b/libraries/classes/Navigation/NodeFactory.php
similarity index 93%
rename from libraries/navigation/NodeFactory.php
rename to libraries/classes/Navigation/NodeFactory.php
index 305a7e7bb0..5c0f4dc9ba 100644
--- a/libraries/navigation/NodeFactory.php
+++ b/libraries/classes/Navigation/NodeFactory.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-navigation
  */
-namespace PMA\libraries\navigation;
+namespace PhpMyAdmin\Navigation;
 
-use PMA\libraries\navigation\nodes\Node;
+use PhpMyAdmin\Navigation\Nodes\Node;
 
 /**
  * Node factory - instantiates Node objects or objects derived from the Node class
@@ -16,7 +16,7 @@ use PMA\libraries\navigation\nodes\Node;
  */
 class NodeFactory
 {
-    protected static $_namespace = 'PMA\\libraries\\navigation\\nodes\\%s';
+    protected static $_namespace = 'PhpMyAdmin\\Navigation\\Nodes\\%s';
     /**
      * Sanitizes the name of a Node class
      *
@@ -89,4 +89,3 @@ class NodeFactory
         return new $class($name, $type, $is_group);
     }
 }
-
diff --git a/libraries/navigation/nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php
similarity index 98%
rename from libraries/navigation/nodes/Node.php
rename to libraries/classes/Navigation/Nodes/Node.php
index 62f4a6c9b5..c8ca16dc5b 100644
--- a/libraries/navigation/nodes/Node.php
+++ b/libraries/classes/Navigation/Nodes/Node.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Util;
 
@@ -341,7 +341,7 @@ class Node
 
     /**
      * Returns the names of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase and PMA\libraries\navigation\nodes\NodeTable classes
+     * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase and PhpMyAdmin\Navigation\Nodes\NodeTable classes
      *
      * @param string $type         The type of item we are looking for
      *                             ('tables', 'views', etc)
@@ -550,7 +550,7 @@ class Node
 
     /**
      * Returns the number of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase and PMA\libraries\navigation\nodes\NodeTable classes
+     * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase and PhpMyAdmin\Navigation\Nodes\NodeTable classes
      *
      * @param string $type         The type of item we are looking for
      *                             ('tables', 'views', etc)
diff --git a/libraries/navigation/nodes/NodeColumn.php b/libraries/classes/Navigation/Nodes/NodeColumn.php
similarity index 96%
rename from libraries/navigation/nodes/NodeColumn.php
rename to libraries/classes/Navigation/Nodes/NodeColumn.php
index 99bcd8978e..e7215f88b7 100644
--- a/libraries/navigation/nodes/NodeColumn.php
+++ b/libraries/classes/Navigation/Nodes/NodeColumn.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Util;
 
diff --git a/libraries/navigation/nodes/NodeColumnContainer.php b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php
similarity index 94%
rename from libraries/navigation/nodes/NodeColumnContainer.php
rename to libraries/classes/Navigation/Nodes/NodeColumnContainer.php
index 308f00ff0c..927718c08d 100644
--- a/libraries/navigation/nodes/NodeColumnContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/navigation/nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php
similarity index 98%
rename from libraries/navigation/nodes/NodeDatabase.php
rename to libraries/classes/Navigation/Nodes/NodeDatabase.php
index bf0b71bbb4..4698c68c5e 100644
--- a/libraries/navigation/nodes/NodeDatabase.php
+++ b/libraries/classes/Navigation/Nodes/NodeDatabase.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
@@ -57,8 +57,8 @@ class NodeDatabase extends Node
 
     /**
      * Returns the number of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
-     * and PMA\libraries\navigation\nodes\NodeTable classes
+     * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase
+     * and PhpMyAdmin\Navigation\Nodes\NodeTable classes
      *
      * @param string  $type         The type of item we are looking for
      *                              ('tables', 'views', etc)
@@ -352,8 +352,8 @@ class NodeDatabase extends Node
 
     /**
      * Returns the names of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
-     * and PMA\libraries\navigation\nodes\NodeTable classes
+     * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase
+     * and PhpMyAdmin\Navigation\Nodes\NodeTable classes
      *
      * @param string $type         The type of item we are looking for
      *                             ('tables', 'views', etc)
diff --git a/libraries/navigation/nodes/NodeDatabaseChild.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php
similarity index 97%
rename from libraries/navigation/nodes/NodeDatabaseChild.php
rename to libraries/classes/Navigation/Nodes/NodeDatabaseChild.php
index bcea8cdede..d0616857eb 100644
--- a/libraries/navigation/nodes/NodeDatabaseChild.php
+++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
diff --git a/libraries/navigation/nodes/NodeDatabaseChildContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php
similarity index 96%
rename from libraries/navigation/nodes/NodeDatabaseChildContainer.php
rename to libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php
index 59250f7270..e11ff6970c 100644
--- a/libraries/navigation/nodes/NodeDatabaseChildContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 /**
  * Represents container node that carries children of a database
diff --git a/libraries/navigation/nodes/NodeDatabaseContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php
similarity index 93%
rename from libraries/navigation/nodes/NodeDatabaseContainer.php
rename to libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php
index 73fbb5003e..d5a08d9a85 100644
--- a/libraries/navigation/nodes/NodeDatabaseContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Util;
 
 require_once './libraries/check_user_privileges.lib.php';
diff --git a/libraries/navigation/nodes/NodeEvent.php b/libraries/classes/Navigation/Nodes/NodeEvent.php
similarity index 96%
rename from libraries/navigation/nodes/NodeEvent.php
rename to libraries/classes/Navigation/Nodes/NodeEvent.php
index 45a25f9930..03015b19f8 100644
--- a/libraries/navigation/nodes/NodeEvent.php
+++ b/libraries/classes/Navigation/Nodes/NodeEvent.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Util;
 
diff --git a/libraries/navigation/nodes/NodeEventContainer.php b/libraries/classes/Navigation/Nodes/NodeEventContainer.php
similarity index 94%
rename from libraries/navigation/nodes/NodeEventContainer.php
rename to libraries/classes/Navigation/Nodes/NodeEventContainer.php
index 10362c9f1c..7c4b61cecb 100644
--- a/libraries/navigation/nodes/NodeEventContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeEventContainer.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/navigation/nodes/NodeFunction.php b/libraries/classes/Navigation/Nodes/NodeFunction.php
similarity index 97%
rename from libraries/navigation/nodes/NodeFunction.php
rename to libraries/classes/Navigation/Nodes/NodeFunction.php
index 0523f0bc64..dea19ddc33 100644
--- a/libraries/navigation/nodes/NodeFunction.php
+++ b/libraries/classes/Navigation/Nodes/NodeFunction.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Util;
 
diff --git a/libraries/navigation/nodes/NodeFunctionContainer.php b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php
similarity index 94%
rename from libraries/navigation/nodes/NodeFunctionContainer.php
rename to libraries/classes/Navigation/Nodes/NodeFunctionContainer.php
index f0864762a3..9ff6de783d 100644
--- a/libraries/navigation/nodes/NodeFunctionContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/navigation/nodes/NodeIndex.php b/libraries/classes/Navigation/Nodes/NodeIndex.php
similarity index 96%
rename from libraries/navigation/nodes/NodeIndex.php
rename to libraries/classes/Navigation/Nodes/NodeIndex.php
index a836ce89c0..359b905737 100644
--- a/libraries/navigation/nodes/NodeIndex.php
+++ b/libraries/classes/Navigation/Nodes/NodeIndex.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Util;
 
diff --git a/libraries/navigation/nodes/NodeIndexContainer.php b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php
similarity index 94%
rename from libraries/navigation/nodes/NodeIndexContainer.php
rename to libraries/classes/Navigation/Nodes/NodeIndexContainer.php
index 5d34361efe..2e28dfd4a7 100644
--- a/libraries/navigation/nodes/NodeIndexContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/navigation/nodes/NodeProcedure.php b/libraries/classes/Navigation/Nodes/NodeProcedure.php
similarity index 97%
rename from libraries/navigation/nodes/NodeProcedure.php
rename to libraries/classes/Navigation/Nodes/NodeProcedure.php
index be3a891b17..e442503d38 100644
--- a/libraries/navigation/nodes/NodeProcedure.php
+++ b/libraries/classes/Navigation/Nodes/NodeProcedure.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Util;
 
diff --git a/libraries/navigation/nodes/NodeProcedureContainer.php b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php
similarity index 94%
rename from libraries/navigation/nodes/NodeProcedureContainer.php
rename to libraries/classes/Navigation/Nodes/NodeProcedureContainer.php
index e88b2e32ed..f9ed5ea138 100644
--- a/libraries/navigation/nodes/NodeProcedureContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/navigation/nodes/NodeTable.php b/libraries/classes/Navigation/Nodes/NodeTable.php
similarity index 96%
rename from libraries/navigation/nodes/NodeTable.php
rename to libraries/classes/Navigation/Nodes/NodeTable.php
index 65cd08167d..f11a99ad68 100644
--- a/libraries/navigation/nodes/NodeTable.php
+++ b/libraries/classes/Navigation/Nodes/NodeTable.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Util;
 
@@ -75,8 +75,8 @@ class NodeTable extends NodeDatabaseChild
 
     /**
      * Returns the number of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
-     * and PMA\libraries\navigation\nodes\NodeTable classes
+     * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase
+     * and PhpMyAdmin\Navigation\Nodes\NodeTable classes
      *
      * @param string $type         The type of item we are looking for
      *                             ('columns' or 'indexes')
@@ -145,8 +145,8 @@ class NodeTable extends NodeDatabaseChild
 
     /**
      * Returns the names of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
-     * and PMA\libraries\navigation\nodes\NodeTable classes
+     * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase
+     * and PhpMyAdmin\Navigation\Nodes\NodeTable classes
      *
      * @param string $type         The type of item we are looking for
      *                             ('tables', 'views', etc)
diff --git a/libraries/navigation/nodes/NodeTableContainer.php b/libraries/classes/Navigation/Nodes/NodeTableContainer.php
similarity index 94%
rename from libraries/navigation/nodes/NodeTableContainer.php
rename to libraries/classes/Navigation/Nodes/NodeTableContainer.php
index 61d993bad9..cf6880adf2 100644
--- a/libraries/navigation/nodes/NodeTableContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeTableContainer.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/navigation/nodes/NodeTrigger.php b/libraries/classes/Navigation/Nodes/NodeTrigger.php
similarity index 96%
rename from libraries/navigation/nodes/NodeTrigger.php
rename to libraries/classes/Navigation/Nodes/NodeTrigger.php
index 42dff457d3..8ba7c35ea0 100644
--- a/libraries/navigation/nodes/NodeTrigger.php
+++ b/libraries/classes/Navigation/Nodes/NodeTrigger.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Util;
 
diff --git a/libraries/navigation/nodes/NodeTriggerContainer.php b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php
similarity index 94%
rename from libraries/navigation/nodes/NodeTriggerContainer.php
rename to libraries/classes/Navigation/Nodes/NodeTriggerContainer.php
index 422d2708b6..989c2692ce 100644
--- a/libraries/navigation/nodes/NodeTriggerContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/navigation/nodes/NodeView.php b/libraries/classes/Navigation/Nodes/NodeView.php
similarity index 96%
rename from libraries/navigation/nodes/NodeView.php
rename to libraries/classes/Navigation/Nodes/NodeView.php
index b4c548f155..987aba119d 100644
--- a/libraries/navigation/nodes/NodeView.php
+++ b/libraries/classes/Navigation/Nodes/NodeView.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
 use PhpMyAdmin\Util;
 
diff --git a/libraries/navigation/nodes/NodeViewContainer.php b/libraries/classes/Navigation/Nodes/NodeViewContainer.php
similarity index 94%
rename from libraries/navigation/nodes/NodeViewContainer.php
rename to libraries/classes/Navigation/Nodes/NodeViewContainer.php
index dfa5486f88..394173a783 100644
--- a/libraries/navigation/nodes/NodeViewContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeViewContainer.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-Navigation
  */
-namespace PMA\libraries\navigation\nodes;
+namespace PhpMyAdmin\Navigation\Nodes;
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/navigation.php b/navigation.php
index bfa4e566c6..73add27fd9 100644
--- a/navigation.php
+++ b/navigation.php
@@ -9,7 +9,7 @@
 // Include common functionalities
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Config\PageSettings;
-use PMA\libraries\navigation\Navigation;
+use PhpMyAdmin\Navigation\Navigation;
 
 require_once './libraries/common.inc.php';
 
diff --git a/test/classes/navigation/NavigationTest.php b/test/classes/navigation/NavigationTest.php
index 29daf2fb8b..4e5b6ba155 100644
--- a/test/classes/navigation/NavigationTest.php
+++ b/test/classes/navigation/NavigationTest.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA\libraries\navigation\Navigation class
+ * Test for PhpMyAdmin\Navigation\Navigation class
  *
  * @package PhpMyAdmin-test
  */
@@ -14,14 +14,14 @@ require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\Navigation class
+ * Tests for PhpMyAdmin\Navigation\Navigation class
  *
  * @package PhpMyAdmin-test
  */
 class NavigationTest extends PMATestCase
 {
     /**
-     * @var PMA\libraries\navigation\Navigation
+     * @var PhpMyAdmin\Navigation\Navigation
      */
     protected $object;
 
@@ -33,7 +33,7 @@ class NavigationTest extends PMATestCase
      */
     protected function setUp()
     {
-        $this->object = new PMA\libraries\navigation\Navigation();
+        $this->object = new PhpMyAdmin\Navigation\Navigation();
         $GLOBALS['cfgRelation']['db'] = 'pmadb';
         $GLOBALS['cfgRelation']['navigationhiding'] = 'navigationhiding';
         $GLOBALS['cfg']['Server']['user'] = 'user';
diff --git a/test/classes/navigation/NavigationTreeTest.php b/test/classes/navigation/NavigationTreeTest.php
index 17a4ff1ec1..39fbc4ae39 100644
--- a/test/classes/navigation/NavigationTreeTest.php
+++ b/test/classes/navigation/NavigationTreeTest.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA\libraries\navigation\NavigationTree class
+ * Test for PhpMyAdmin\Navigation\NavigationTree class
  *
  * @package PhpMyAdmin-test
  */
@@ -10,7 +10,7 @@
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.lib.php' will use it globally
  */
-use PMA\libraries\navigation\NavigationTree;
+use PhpMyAdmin\Navigation\NavigationTree;
 use PhpMyAdmin\Theme;
 
 $GLOBALS['server'] = 0;
@@ -22,7 +22,7 @@ require_once 'libraries/check_user_privileges.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\NavigationTree class
+ * Tests for PhpMyAdmin\Navigation\NavigationTree class
  *
  * @package PhpMyAdmin-test
  */
@@ -52,7 +52,7 @@ class NavigationTreeTest extends PMATestCase
         $GLOBALS['cfg']['ShowDatabasesNavigationAsTree']  = true;
 
         $GLOBALS['pmaThemeImage'] = 'image';
-        $this->object = new PMA\libraries\navigation\NavigationTree();
+        $this->object = new PhpMyAdmin\Navigation\NavigationTree();
     }
 
     /**
diff --git a/test/classes/navigation/NodeColumnContainerTest.php b/test/classes/navigation/NodeColumnContainerTest.php
index e9e071462e..bccc8299e9 100644
--- a/test/classes/navigation/NodeColumnContainerTest.php
+++ b/test/classes/navigation/NodeColumnContainerTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeColumnContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeColumnContainer class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeColumnContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeColumnContainer class
  *
  * @package PhpMyAdmin-test
  */
@@ -30,7 +29,7 @@ class NodeColumnContainerTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\navigation\NodeFactory::__construct
+     * Test for PhpMyAdmin\Navigation\NodeFactory::__construct
      *
      * @return void
      */
diff --git a/test/classes/navigation/NodeColumnTest.php b/test/classes/navigation/NodeColumnTest.php
index 1683c43cfd..53b3d13a0d 100644
--- a/test/classes/navigation/NodeColumnTest.php
+++ b/test/classes/navigation/NodeColumnTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeColumn class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeColumn class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeColumn class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeColumn class
  *
  * @package PhpMyAdmin-test
  */
@@ -30,7 +29,7 @@ class NodeColumnTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
+     * Test for PhpMyAdmin\Navigation\NodeFactory::getInstance
      *
      * @return void
      */
diff --git a/test/classes/navigation/NodeDatabaseChildTest.php b/test/classes/navigation/NodeDatabaseChildTest.php
index 9b8608c634..8d4865a4af 100644
--- a/test/classes/navigation/NodeDatabaseChildTest.php
+++ b/test/classes/navigation/NodeDatabaseChildTest.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA\libraries\navigation\nodes\NodeDatabaseChild
+ * Test for PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\navigation\nodes\NodeDatabaseChild;
+use PhpMyAdmin\Navigation\NodeFactory;
+use PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
 
@@ -15,7 +15,7 @@ require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeDatabaseChild class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild class
  *
  * @package PhpMyAdmin-test
  */
@@ -42,7 +42,7 @@ class NodeDatabaseChildTest extends PMATestCase
         $_SESSION['relation'][1]['PMA_VERSION'] = PMA_VERSION;
         $_SESSION['relation'][1]['navwork'] = true;
         $this->object = $this->getMockForAbstractClass(
-            'PMA\libraries\navigation\nodes\NodeDatabaseChild', array('child')
+            'PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild', array('child')
         );
     }
 
diff --git a/test/classes/navigation/NodeDatabaseTest.php b/test/classes/navigation/NodeDatabaseTest.php
index e13a17c053..a6f285d8be 100644
--- a/test/classes/navigation/NodeDatabaseTest.php
+++ b/test/classes/navigation/NodeDatabaseTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeDatabase class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeDatabase class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeDatabase class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeDatabase class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeEventContainerTest.php b/test/classes/navigation/NodeEventContainerTest.php
index 5d7948901a..2f228e252a 100644
--- a/test/classes/navigation/NodeEventContainerTest.php
+++ b/test/classes/navigation/NodeEventContainerTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeEventContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeEventContainer class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeEventContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeEventContainer class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeEventTest.php b/test/classes/navigation/NodeEventTest.php
index 4c333ef25b..41e90d33b2 100644
--- a/test/classes/navigation/NodeEventTest.php
+++ b/test/classes/navigation/NodeEventTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeEvent class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeEvent class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeEvent class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeEvent class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeFactoryTest.php b/test/classes/navigation/NodeFactoryTest.php
index aaf18ed0ef..6034a35aa4 100644
--- a/test/classes/navigation/NodeFactoryTest.php
+++ b/test/classes/navigation/NodeFactoryTest.php
@@ -6,11 +6,10 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\navigation\nodes\Node;
+use PhpMyAdmin\Navigation\NodeFactory;
+use PhpMyAdmin\Navigation\Nodes\Node;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
@@ -31,7 +30,7 @@ class NodeFactoryTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
+     * Test for PhpMyAdmin\Navigation\NodeFactory::getInstance
      *
      * @return void
      */
@@ -44,7 +43,7 @@ class NodeFactoryTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
+     * Test for PhpMyAdmin\Navigation\NodeFactory::getInstance
      *
      * @return void
      */
@@ -61,7 +60,7 @@ class NodeFactoryTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
+     * Test for PhpMyAdmin\Navigation\NodeFactory::getInstance
      *
      * @return void
      */
@@ -79,7 +78,7 @@ class NodeFactoryTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
+     * Test for PhpMyAdmin\Navigation\NodeFactory::getInstance
      *
      * @return void
      */
@@ -90,7 +89,7 @@ class NodeFactoryTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
+     * Test for PhpMyAdmin\Navigation\NodeFactory::getInstance
      *
      * @return void
      */
diff --git a/test/classes/navigation/NodeFunctionContainerTest.php b/test/classes/navigation/NodeFunctionContainerTest.php
index 2c5467dbde..32c3cffb28 100644
--- a/test/classes/navigation/NodeFunctionContainerTest.php
+++ b/test/classes/navigation/NodeFunctionContainerTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeFunctionContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeFunctionContainer class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeFunctionContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeFunctionContainer class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeFunctionTest.php b/test/classes/navigation/NodeFunctionTest.php
index 6e8e68b3f1..8450691196 100644
--- a/test/classes/navigation/NodeFunctionTest.php
+++ b/test/classes/navigation/NodeFunctionTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeFunction class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeFunction class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeFunction class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeFunction class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeIndexContainerTest.php b/test/classes/navigation/NodeIndexContainerTest.php
index 5844a00dd9..56ddbd7feb 100644
--- a/test/classes/navigation/NodeIndexContainerTest.php
+++ b/test/classes/navigation/NodeIndexContainerTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeIndexContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeIndexContainer class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeIndexContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeIndexContainer class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeIndexTest.php b/test/classes/navigation/NodeIndexTest.php
index 5b683c0ed3..4d76aa669d 100644
--- a/test/classes/navigation/NodeIndexTest.php
+++ b/test/classes/navigation/NodeIndexTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeIndex class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeIndex class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeIndex class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeIndex class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeProcedureContainerTest.php b/test/classes/navigation/NodeProcedureContainerTest.php
index bcfa90d858..b1ed475e98 100644
--- a/test/classes/navigation/NodeProcedureContainerTest.php
+++ b/test/classes/navigation/NodeProcedureContainerTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeProcedureContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeProcedureContainer class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeProcedureContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeProcedureContainer class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeProcedureTest.php b/test/classes/navigation/NodeProcedureTest.php
index 2fa42f2ba9..2effaa418b 100644
--- a/test/classes/navigation/NodeProcedureTest.php
+++ b/test/classes/navigation/NodeProcedureTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeProcedure class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeProcedure class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeProcedure class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeProcedure class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeTableContainerTest.php b/test/classes/navigation/NodeTableContainerTest.php
index efdfb32e4e..a562b67422 100644
--- a/test/classes/navigation/NodeTableContainerTest.php
+++ b/test/classes/navigation/NodeTableContainerTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeTableContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeTableContainer class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeTableContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeTableContainer class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeTableTest.php b/test/classes/navigation/NodeTableTest.php
index b91f66862a..36749370f7 100644
--- a/test/classes/navigation/NodeTableTest.php
+++ b/test/classes/navigation/NodeTableTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeTable class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeTable class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeTable class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeTable class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeTest.php b/test/classes/navigation/NodeTest.php
index b8903a19ba..67bc2f64eb 100644
--- a/test/classes/navigation/NodeTest.php
+++ b/test/classes/navigation/NodeTest.php
@@ -6,11 +6,10 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\navigation\nodes\Node;
+use PhpMyAdmin\Navigation\NodeFactory;
+use PhpMyAdmin\Navigation\Nodes\Node;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
@@ -282,7 +281,7 @@ class NodeTest extends PMATestCase
     public function testGetWhereClause()
     {
         $method = new ReflectionMethod(
-            'PMA\libraries\navigation\nodes\Node', '_getWhereClause'
+            'PhpMyAdmin\Navigation\Nodes\Node', '_getWhereClause'
         );
         $method->setAccessible(true);
 
diff --git a/test/classes/navigation/NodeTriggerContainerTest.php b/test/classes/navigation/NodeTriggerContainerTest.php
index d153107323..44d7b85552 100644
--- a/test/classes/navigation/NodeTriggerContainerTest.php
+++ b/test/classes/navigation/NodeTriggerContainerTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeTrigger class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeTrigger class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeTrigger class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeTrigger class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeTriggerTest.php b/test/classes/navigation/NodeTriggerTest.php
index 691de4ff64..605128ba1d 100644
--- a/test/classes/navigation/NodeTriggerTest.php
+++ b/test/classes/navigation/NodeTriggerTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeTrigger class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeTrigger class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeTrigger class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeTrigger class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeViewContainerTest.php b/test/classes/navigation/NodeViewContainerTest.php
index dcdcf86ac6..a7af9198a3 100644
--- a/test/classes/navigation/NodeViewContainerTest.php
+++ b/test/classes/navigation/NodeViewContainerTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeViewContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeViewContainer class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeViewContainer class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeViewContainer class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/navigation/NodeViewTest.php b/test/classes/navigation/NodeViewTest.php
index 647070c89a..9967bbc8d8 100644
--- a/test/classes/navigation/NodeViewTest.php
+++ b/test/classes/navigation/NodeViewTest.php
@@ -1,19 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeView class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeView class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\navigation\nodes\NodeView class
+ * Tests for PhpMyAdmin\Navigation\Nodes\NodeView class
  *
  * @package PhpMyAdmin-test
  */