From 95a409c4f22d3dec5dbc3dad8dc7b0db6c2cef13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Fri, 14 Jul 2017 09:39:44 -0300
Subject: [PATCH] Move controllers to PhpMyAdmin namespace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Move base controllers to PhpMyAdmin namespace
- Move database controllers to PhpMyAdmin namespace
- Move server controllers to PhpMyAdmin namespace
- Move table controllers to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 db_structure.php                              |  6 ++--
 .../Controllers}/Controller.php               |  8 ++---
 .../Database}/DatabaseStructureController.php | 14 ++++-----
 .../Controllers}/DatabaseController.php       |  8 ++---
 .../Server}/ServerBinlogController.php        | 10 +++----
 .../Server}/ServerCollationsController.php    | 10 +++----
 .../Server}/ServerDatabasesController.php     | 10 +++----
 .../Server}/ServerEnginesController.php       | 12 ++++----
 .../Server}/ServerPluginsController.php       | 12 ++++----
 .../Server}/ServerVariablesController.php     | 10 +++----
 .../Table}/TableChartController.php           | 16 ++++------
 .../TableGisVisualizationController.php       | 14 ++++-----
 .../Table}/TableIndexesController.php         | 15 ++++------
 .../Table}/TableRelationController.php        | 11 ++++---
 .../Table}/TableSearchController.php          | 11 ++++---
 .../Table}/TableStructureController.php       | 27 ++++++++---------
 .../Controllers}/TableController.php          |  8 ++---
 libraries/classes/Util.php                    |  4 +--
 libraries/classes/ZipExtension.php            |  2 +-
 server_binlog.php                             |  6 ++--
 server_collations.php                         |  6 ++--
 server_databases.php                          |  6 ++--
 server_engines.php                            |  6 ++--
 server_plugins.php                            |  6 ++--
 server_variables.php                          |  6 ++--
 tbl_chart.php                                 |  6 ++--
 tbl_find_replace.php                          |  6 ++--
 tbl_gis_visualization.php                     |  6 ++--
 tbl_indexes.php                               |  6 ++--
 tbl_relation.php                              |  6 ++--
 tbl_select.php                                |  6 ++--
 tbl_structure.php                             |  6 ++--
 tbl_zoom_select.php                           |  6 ++--
 .../DatabaseStructureControllerTest.php       | 14 ++++-----
 .../ServerBinlogControllerTest.php            | 24 +++++++--------
 .../ServerCollationsControllerTest.php        |  4 +--
 .../ServerDatabasesControllerTest.php         | 26 ++++++++--------
 .../ServerEnginesControllerTest.php           |  6 ++--
 .../ServerPluginsControllerTest.php           |  4 +--
 .../ServerVariablesControllerTest.php         | 24 +++++++--------
 .../TableIndexesControllerTest.php            |  2 +-
 .../TableRelationControllerTest.php           | 18 +++++------
 .../controllers/TableSearchControllerTest.php | 18 +++++------
 .../TableStructureControllerTest.php          | 30 +++++++++----------
 44 files changed, 225 insertions(+), 237 deletions(-)
 rename libraries/{controllers => classes/Controllers}/Controller.php (83%)
 rename libraries/{controllers/database => classes/Controllers/Database}/DatabaseStructureController.php (99%)
 rename libraries/{controllers => classes/Controllers}/DatabaseController.php (70%)
 rename libraries/{controllers/server => classes/Controllers/Server}/ServerBinlogController.php (96%)
 rename libraries/{controllers/server => classes/Controllers/Server}/ServerCollationsController.php (87%)
 rename libraries/{controllers/server => classes/Controllers/Server}/ServerDatabasesController.php (98%)
 rename libraries/{controllers/server => classes/Controllers/Server}/ServerEnginesController.php (90%)
 rename libraries/{controllers/server => classes/Controllers/Server}/ServerPluginsController.php (91%)
 rename libraries/{controllers/server => classes/Controllers/Server}/ServerVariablesController.php (99%)
 rename libraries/{controllers/table => classes/Controllers/Table}/TableChartController.php (96%)
 rename libraries/{controllers/table => classes/Controllers/Table}/TableGisVisualizationController.php (96%)
 rename libraries/{controllers/table => classes/Controllers/Table}/TableIndexesController.php (95%)
 rename libraries/{controllers/table => classes/Controllers/Table}/TableRelationController.php (98%)
 rename libraries/{controllers/table => classes/Controllers/Table}/TableSearchController.php (99%)
 rename libraries/{controllers/table => classes/Controllers/Table}/TableStructureController.php (99%)
 rename libraries/{controllers => classes/Controllers}/TableController.php (76%)

diff --git a/db_structure.php b/db_structure.php
index 6c4147ff3f..35f513ec86 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -8,7 +8,7 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\database\DatabaseStructureController;
+use PhpMyAdmin\Controllers\Database\DatabaseStructureController;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 
@@ -17,11 +17,11 @@ require_once 'libraries/db_common.inc.php';
 
 $container = libraries\di\Container::getDefaultContainer();
 $container->factory(
-    'PMA\libraries\controllers\database\DatabaseStructureController'
+    'PhpMyAdmin\Controllers\Database\DatabaseStructureController'
 );
 $container->alias(
     'DatabaseStructureController',
-    'PMA\libraries\controllers\database\DatabaseStructureController'
+    'PhpMyAdmin\Controllers\Database\DatabaseStructureController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/libraries/controllers/Controller.php b/libraries/classes/Controllers/Controller.php
similarity index 83%
rename from libraries/controllers/Controller.php
rename to libraries/classes/Controllers/Controller.php
index 43577b1369..621e0a1817 100644
--- a/libraries/controllers/Controller.php
+++ b/libraries/classes/Controllers/Controller.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\TableController
+ * Holds the PhpMyAdmin\Controllers\Controller
  *
- * @package PMA
+ * @package PhpMyAdmin\Controllers
  */
-namespace PMA\libraries\controllers;
+namespace PhpMyAdmin\Controllers;
 
 use PhpMyAdmin\DatabaseInterface;
 use PMA\libraries\di\Container;
@@ -16,7 +16,7 @@ require_once 'libraries/database_interface.inc.php';
 /**
  * Base class for all of controller
  *
- * @package PhpMyAdmin
+ * @package PhpMyAdmin\Controllers
  */
 abstract class Controller
 {
diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/classes/Controllers/Database/DatabaseStructureController.php
similarity index 99%
rename from libraries/controllers/database/DatabaseStructureController.php
rename to libraries/classes/Controllers/Database/DatabaseStructureController.php
index dae80b36d9..f13513b87d 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/classes/Controllers/Database/DatabaseStructureController.php
@@ -2,25 +2,25 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
 /**
- * Holds the PMA\libraries\controllers\database\DatabaseStructureController
+ * Holds the PhpMyAdmin\Controllers\Database\DatabaseStructureController
  *
- * @package PMA
+ * @package PhpMyAdmin\Controllers
  */
 
-namespace PMA\libraries\controllers\database;
+namespace PhpMyAdmin\Controllers\Database;
 
-use PhpMyAdmin\Config\PageSettings;
-use PMA\libraries\controllers\DatabaseController;
 use PhpMyAdmin\Charsets;
+use PhpMyAdmin\Config\PageSettings;
+use PhpMyAdmin\Controllers\DatabaseController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\RecentFavoriteTable;
 use PhpMyAdmin\Response;
+use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Tracker;
 use PhpMyAdmin\Util;
 use PhpMyAdmin\Url;
-use PhpMyAdmin\Sanitize;
 
 require_once 'libraries/display_create_table.lib.php';
 require_once 'libraries/config/messages.inc.php';
@@ -30,7 +30,7 @@ require_once 'libraries/config/page_settings.forms.php';
 /**
  * Handles database structure logic
  *
- * @package PhpMyAdmin
+ * @package PhpMyAdmin\Controllers
  */
 class DatabaseStructureController extends DatabaseController
 {
diff --git a/libraries/controllers/DatabaseController.php b/libraries/classes/Controllers/DatabaseController.php
similarity index 70%
rename from libraries/controllers/DatabaseController.php
rename to libraries/classes/Controllers/DatabaseController.php
index 7cc4416170..25e99e0043 100644
--- a/libraries/controllers/DatabaseController.php
+++ b/libraries/classes/Controllers/DatabaseController.php
@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\DatabaseController
+ * Holds the PhpMyAdmin\Controllers\DatabaseController
  *
- * @package PMA
+ * @package PhpMyAdmin\Controllers
  */
-namespace PMA\libraries\controllers;
+namespace PhpMyAdmin\Controllers;
 
 /**
  * Handles database related logic
  *
- * @package PhpMyAdmin
+ * @package PhpMyAdmin\Controllers
  */
 abstract class DatabaseController extends Controller
 {
diff --git a/libraries/controllers/server/ServerBinlogController.php b/libraries/classes/Controllers/Server/ServerBinlogController.php
similarity index 96%
rename from libraries/controllers/server/ServerBinlogController.php
rename to libraries/classes/Controllers/Server/ServerBinlogController.php
index e401d29117..84e0a19fde 100644
--- a/libraries/controllers/server/ServerBinlogController.php
+++ b/libraries/classes/Controllers/Server/ServerBinlogController.php
@@ -2,14 +2,14 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
 /**
- * Holds the PMA\libraries\controllers\server\ServerBinlogController
+ * Holds the PhpMyAdmin\Controllers\Server\ServerBinlogController
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 
-namespace PMA\libraries\controllers\server;
+namespace PhpMyAdmin\Controllers\Server;
 
-use PMA\libraries\controllers\Controller;
+use PhpMyAdmin\Controllers\Controller;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Util;
@@ -19,7 +19,7 @@ use PhpMyAdmin\Url;
 /**
  * Handles viewing binary logs
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 class ServerBinlogController extends Controller
 {
diff --git a/libraries/controllers/server/ServerCollationsController.php b/libraries/classes/Controllers/Server/ServerCollationsController.php
similarity index 87%
rename from libraries/controllers/server/ServerCollationsController.php
rename to libraries/classes/Controllers/Server/ServerCollationsController.php
index cae3b52a3b..203ef2ac58 100644
--- a/libraries/controllers/server/ServerCollationsController.php
+++ b/libraries/classes/Controllers/Server/ServerCollationsController.php
@@ -2,21 +2,21 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
 /**
- * Holds the PMA\libraries\controllers\server\ServerCollationsController
+ * Holds the PhpMyAdmin\Controllers\Server\ServerCollationsController
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 
-namespace PMA\libraries\controllers\server;
+namespace PhpMyAdmin\Controllers\Server;
 
-use PMA\libraries\controllers\Controller;
+use PhpMyAdmin\Controllers\Controller;
 use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Template;
 
 /**
  * Handles viewing character sets and collations
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 class ServerCollationsController extends Controller
 {
diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/classes/Controllers/Server/ServerDatabasesController.php
similarity index 98%
rename from libraries/controllers/server/ServerDatabasesController.php
rename to libraries/classes/Controllers/Server/ServerDatabasesController.php
index 56f363af4a..f930510ad4 100644
--- a/libraries/controllers/server/ServerDatabasesController.php
+++ b/libraries/classes/Controllers/Server/ServerDatabasesController.php
@@ -2,14 +2,14 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
 /**
- * Holds the PMA\libraries\controllers\server\ServerDatabasesController
+ * Holds the PhpMyAdmin\Controllers\Server\ServerDatabasesController
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 
-namespace PMA\libraries\controllers\server;
+namespace PhpMyAdmin\Controllers\Server;
 
-use PMA\libraries\controllers\Controller;
+use PhpMyAdmin\Controllers\Controller;
 use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
@@ -20,7 +20,7 @@ use PhpMyAdmin\Url;
 /**
  * Handles viewing and creating and deleting databases
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 class ServerDatabasesController extends Controller
 {
diff --git a/libraries/controllers/server/ServerEnginesController.php b/libraries/classes/Controllers/Server/ServerEnginesController.php
similarity index 90%
rename from libraries/controllers/server/ServerEnginesController.php
rename to libraries/classes/Controllers/Server/ServerEnginesController.php
index 7232dda511..4b5f499678 100644
--- a/libraries/controllers/server/ServerEnginesController.php
+++ b/libraries/classes/Controllers/Server/ServerEnginesController.php
@@ -2,14 +2,14 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
 /**
- * Holds the PMA\libraries\controllers\server\ServerEnginesController
+ * Holds the PhpMyAdmin\Controllers\Server\ServerEnginesController
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 
-namespace PMA\libraries\controllers\server;
+namespace PhpMyAdmin\Controllers\Server;
 
-use PMA\libraries\controllers\Controller;
+use PhpMyAdmin\Controllers\Controller;
 use PhpMyAdmin\StorageEngine;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Util;
@@ -17,7 +17,7 @@ use PhpMyAdmin\Util;
 /**
  * Handles viewing storage engine details
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 class ServerEnginesController extends Controller
 {
@@ -90,4 +90,4 @@ class ServerEnginesController extends Controller
             )
         );
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/controllers/server/ServerPluginsController.php b/libraries/classes/Controllers/Server/ServerPluginsController.php
similarity index 91%
rename from libraries/controllers/server/ServerPluginsController.php
rename to libraries/classes/Controllers/Server/ServerPluginsController.php
index 509e71a267..d634dc6845 100644
--- a/libraries/controllers/server/ServerPluginsController.php
+++ b/libraries/classes/Controllers/Server/ServerPluginsController.php
@@ -2,20 +2,20 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
 /**
- * Holds the PMA\libraries\controllers\server\ServerPluginsController
+ * Holds the PhpMyAdmin\Controllers\Server\ServerPluginsController
 *
-* @package PMA\libraries\controllers\server
+* @package PhpMyAdmin\Controllers
 */
 
-namespace PMA\libraries\controllers\server;
+namespace PhpMyAdmin\Controllers\Server;
 
-use PMA\libraries\controllers\Controller;
+use PhpMyAdmin\Controllers\Controller;
 use PhpMyAdmin\Template;
 
 /**
  * Handles viewing server plugin details
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 class ServerPluginsController extends Controller
 {
@@ -103,4 +103,4 @@ class ServerPluginsController extends Controller
         $html .= '</div>';
         return $html;
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/controllers/server/ServerVariablesController.php b/libraries/classes/Controllers/Server/ServerVariablesController.php
similarity index 99%
rename from libraries/controllers/server/ServerVariablesController.php
rename to libraries/classes/Controllers/Server/ServerVariablesController.php
index 05780762a9..82ed8aa256 100644
--- a/libraries/controllers/server/ServerVariablesController.php
+++ b/libraries/classes/Controllers/Server/ServerVariablesController.php
@@ -2,14 +2,14 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
 /**
- * Holds the PMA\libraries\controllers\server\ServerVariablesController
+ * Holds the PhpMyAdmin\Controllers\Server\ServerVariablesController
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 
-namespace PMA\libraries\controllers\server;
+namespace PhpMyAdmin\Controllers\Server;
 
-use PMA\libraries\controllers\Controller;
+use PhpMyAdmin\Controllers\Controller;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Template;
@@ -19,7 +19,7 @@ use PhpMyAdmin\Url;
 /**
  * Handles viewing and editing server variables
  *
- * @package PMA\libraries\controllers\server
+ * @package PhpMyAdmin\Controllers
  */
 class ServerVariablesController extends Controller
 {
diff --git a/libraries/controllers/table/TableChartController.php b/libraries/classes/Controllers/Table/TableChartController.php
similarity index 96%
rename from libraries/controllers/table/TableChartController.php
rename to libraries/classes/Controllers/Table/TableChartController.php
index cc2dc8eb3f..d23ee3f539 100644
--- a/libraries/controllers/table/TableChartController.php
+++ b/libraries/classes/Controllers/Table/TableChartController.php
@@ -1,30 +1,26 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
- * Holds the PMA\TableChartController
+ * Holds the PhpMyAdmin\Controllers\Table\TableChartController
  *
- * @package PMA
+ * @package PhpMyAdmin\Controllers
  */
+namespace PhpMyAdmin\Controllers\Table;
 
-namespace PMA\libraries\controllers\table;
-
-use PMA\libraries\controllers\TableController;
+use PhpMyAdmin\Controllers\TableController;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
+use PhpMyAdmin\Table;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Util;
-use PhpMyAdmin\Table;
-
 
 /**
  * Handles table related logic
  *
- * @package PhpMyAdmin
+ * @package PhpMyAdmin\Controllers
  */
 class TableChartController extends TableController
 {
-
     /**
      * @var string $sql_query
      */
diff --git a/libraries/controllers/table/TableGisVisualizationController.php b/libraries/classes/Controllers/Table/TableGisVisualizationController.php
similarity index 96%
rename from libraries/controllers/table/TableGisVisualizationController.php
rename to libraries/classes/Controllers/Table/TableGisVisualizationController.php
index 5ca46c7438..686f2a6e13 100644
--- a/libraries/controllers/table/TableGisVisualizationController.php
+++ b/libraries/classes/Controllers/Table/TableGisVisualizationController.php
@@ -1,19 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
- * Holds the PMA\TableIndexesController
+ * Holds the PhpMyAdmin\Controllers\Table\TableIndexesController
  *
- * @package PMA
+ * @package PhpMyAdmin\Controllers
  */
+namespace PhpMyAdmin\Controllers\Table;
 
-namespace PMA\libraries\controllers\table;
-
-use PMA\libraries\controllers\TableController;
+use PhpMyAdmin\Controllers\TableController;
 use PhpMyAdmin\Core;
+use PMA\libraries\gis\GISVisualization;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Template;
-use PMA\libraries\gis\GISVisualization;
 use PhpMyAdmin\Url;
 
 require_once 'libraries/common.inc.php';
@@ -22,7 +20,7 @@ require_once 'libraries/db_common.inc.php';
 /**
  * Class TableGisVisualizationController
  *
- * @package PMA\libraries\controllers\table
+ * @package PhpMyAdmin\Controllers
  */
 class TableGisVisualizationController extends TableController
 {
diff --git a/libraries/controllers/table/TableIndexesController.php b/libraries/classes/Controllers/Table/TableIndexesController.php
similarity index 95%
rename from libraries/controllers/table/TableIndexesController.php
rename to libraries/classes/Controllers/Table/TableIndexesController.php
index 14c2a6a18a..637e38130b 100644
--- a/libraries/controllers/table/TableIndexesController.php
+++ b/libraries/classes/Controllers/Table/TableIndexesController.php
@@ -1,26 +1,23 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
- * Holds the PMA\TableIndexesController
+ * Holds the PhpMyAdmin\Controllers\Table\TableIndexesController
  *
- * @package PMA
+ * @package PhpMyAdmin\Controllers
  */
+namespace PhpMyAdmin\Controllers\Table;
 
-namespace PMA\libraries\controllers\table;
-
-use PMA\libraries\controllers\TableController;
+use PhpMyAdmin\Controllers\TableController;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Message;
+use PhpMyAdmin\Response;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Util;
-use PhpMyAdmin\Response;
-
 
 /**
  * Class TableIndexesController
  *
- * @package PMA\libraries\controllers\table
+ * @package PhpMyAdmin\Controllers
  */
 class TableIndexesController extends TableController
 {
diff --git a/libraries/controllers/table/TableRelationController.php b/libraries/classes/Controllers/Table/TableRelationController.php
similarity index 98%
rename from libraries/controllers/table/TableRelationController.php
rename to libraries/classes/Controllers/Table/TableRelationController.php
index 1f602fc4d5..6d3d4137ac 100644
--- a/libraries/controllers/table/TableRelationController.php
+++ b/libraries/classes/Controllers/Table/TableRelationController.php
@@ -1,14 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\TableRelationController
+ * Holds the PhpMyAdmin\Controllers\Table\TableRelationController
  *
- * @package PMA
+ * @package PhpMyAdmin\Controllers
  */
+namespace PhpMyAdmin\Controllers\Table;
 
-namespace PMA\libraries\controllers\table;
-
-use PMA\libraries\controllers\TableController;
+use PhpMyAdmin\Controllers\TableController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Index;
@@ -19,7 +18,7 @@ use PhpMyAdmin\Util;
 /**
  * Handles table relation logic
  *
- * @package PhpMyAdmin
+ * @package PhpMyAdmin\Controllers
  */
 class TableRelationController extends TableController
 {
diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/classes/Controllers/Table/TableSearchController.php
similarity index 99%
rename from libraries/controllers/table/TableSearchController.php
rename to libraries/classes/Controllers/Table/TableSearchController.php
index 85029d9b7e..9c325fc715 100644
--- a/libraries/controllers/table/TableSearchController.php
+++ b/libraries/classes/Controllers/Table/TableSearchController.php
@@ -1,14 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\controllers\table\TableSearchController
+ * Holds the PhpMyAdmin\Controllers\Table\TableSearchController
  *
- * @package PMA\libraries\controllers\table
+ * @package PhpMyAdmin\Controllers
  */
+namespace PhpMyAdmin\Controllers\Table;
 
-namespace PMA\libraries\controllers\table;
-
-use PMA\libraries\controllers\TableController;
+use PhpMyAdmin\Controllers\TableController;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Sql;
 use PhpMyAdmin\Template;
@@ -17,7 +16,7 @@ use PhpMyAdmin\Util;
 /**
  * Class TableSearchController
  *
- * @package PhpMyAdmin
+ * @package PhpMyAdmin\Controllers
  */
 class TableSearchController extends TableController
 {
diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/classes/Controllers/Table/TableStructureController.php
similarity index 99%
rename from libraries/controllers/table/TableStructureController.php
rename to libraries/classes/Controllers/Table/TableStructureController.php
index 311d5c46e6..c94528f604 100644
--- a/libraries/controllers/table/TableStructureController.php
+++ b/libraries/classes/Controllers/Table/TableStructureController.php
@@ -1,28 +1,27 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
- * Holds the PMA\TableStructureController
+ * Holds the PhpMyAdmin\Controllers\Table\TableStructureController
  *
- * @package PMA
+ * @package PhpMyAdmin\Controllers
  */
+namespace PhpMyAdmin\Controllers\Table;
 
-namespace PMA\libraries\controllers\table;
-
-use PhpMyAdmin\SqlParser;
-use PhpMyAdmin\SqlParser\Statements\CreateStatement;
-use PhpMyAdmin\SqlParser\Utils\Table as SqlTable;
 use PhpMyAdmin\Config\PageSettings;
-use PMA\libraries\controllers\TableController;
+use PhpMyAdmin\Controllers\TableController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Sql;
+use PhpMyAdmin\SqlParser\Context;
+use PhpMyAdmin\SqlParser\Parser;
+use PhpMyAdmin\SqlParser\Statements\CreateStatement;
+use PhpMyAdmin\SqlParser\Utils\Table as SqlTable;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Transformations;
-use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 use PMA\Util as Util_lib;
 
 require_once 'libraries/util.lib.php';
@@ -33,7 +32,7 @@ require_once 'libraries/config/page_settings.forms.php';
 /**
  * Handles table structure logic
  *
- * @package PhpMyAdmin
+ * @package PhpMyAdmin\Controllers
  */
 class TableStructureController extends TableController
 {
@@ -145,11 +144,11 @@ class TableStructureController extends TableController
                 $columns_names = $_REQUEST['field_name'];
                 $reserved_keywords_names = array();
                 foreach ($columns_names as $column) {
-                    if (\PhpMyAdmin\SqlParser\Context::isKeyword(trim($column), true)) {
+                    if (Context::isKeyword(trim($column), true)) {
                         $reserved_keywords_names[] = trim($column);
                     }
                 }
-                if (\PhpMyAdmin\SqlParser\Context::isKeyword(trim($this->table), true)) {
+                if (Context::isKeyword(trim($this->table), true)) {
                     $reserved_keywords_names[] = trim($this->table);
                 }
                 if (count($reserved_keywords_names) == 0) {
@@ -549,7 +548,7 @@ class TableStructureController extends TableController
             return null;
         }
 
-        $parser = new \PhpMyAdmin\SqlParser\Parser($createTable);
+        $parser = new Parser($createTable);
         /**
          * @var $stmt PhpMyAdmin\SqlParser\Statements\CreateStatement
          */
diff --git a/libraries/controllers/TableController.php b/libraries/classes/Controllers/TableController.php
similarity index 76%
rename from libraries/controllers/TableController.php
rename to libraries/classes/Controllers/TableController.php
index a0839a8393..6ce9041b32 100644
--- a/libraries/controllers/TableController.php
+++ b/libraries/classes/Controllers/TableController.php
@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\TableController
+ * Holds the PhpMyAdmin\Controllers\TableController
  *
- * @package PMA
+ * @package PhpMyAdmin\Controllers
  */
-namespace PMA\libraries\controllers;
+namespace PhpMyAdmin\Controllers;
 
 /**
  * Handles table related logic
  *
- * @package PhpMyAdmin
+ * @package PhpMyAdmin\Controllers
  */
 abstract class TableController extends Controller
 {
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 2b84ccc344..eb57d1af3a 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1968,8 +1968,8 @@ class Util
      * Not sure we could use a strMissingParameter message here,
      * would have to check if the error message file is always available
      *
-     * @param string[] $params  The names of the parameters needed by the calling
-     *                          script
+     * @param string[] $params The names of the parameters needed by the calling
+     *                         script
      *
      * @return void
      *
diff --git a/libraries/classes/ZipExtension.php b/libraries/classes/ZipExtension.php
index 0f2ca23c64..3072c20282 100644
--- a/libraries/classes/ZipExtension.php
+++ b/libraries/classes/ZipExtension.php
@@ -152,7 +152,7 @@ class ZipExtension
      *
      * @param array|string $data contents of the file/files
      * @param array|string $name name of the file/files in the archive
-     * @param integer $time      the current timestamp
+     * @param integer      $time the current timestamp
      *
      * @return string|bool  the ZIP file contents, or false if there was an error.
      */
diff --git a/server_binlog.php b/server_binlog.php
index 7610efbd88..b98a806ce6 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -9,18 +9,18 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\server\ServerCollationsController;
+use PhpMyAdmin\Controllers\Server\ServerCollationsController;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
 $container = libraries\di\Container::getDefaultContainer();
 $container->factory(
-    'PMA\libraries\controllers\server\ServerBinlogController'
+    'PhpMyAdmin\Controllers\Server\ServerBinlogController'
 );
 $container->alias(
     'ServerBinlogController',
-    'PMA\libraries\controllers\server\ServerBinlogController'
+    'PhpMyAdmin\Controllers\Server\ServerBinlogController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/server_collations.php b/server_collations.php
index e7ea99c1b7..fd70ce355d 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -9,18 +9,18 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\server\ServerCollationsController;
+use PhpMyAdmin\Controllers\Server\ServerCollationsController;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
 $container = libraries\di\Container::getDefaultContainer();
 $container->factory(
-    'PMA\libraries\controllers\server\ServerCollationsController'
+    'PhpMyAdmin\Controllers\Server\ServerCollationsController'
 );
 $container->alias(
     'ServerCollationsController',
-    'PMA\libraries\controllers\server\ServerCollationsController'
+    'PhpMyAdmin\Controllers\Server\ServerCollationsController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/server_databases.php b/server_databases.php
index 30b231da9e..55a43552e3 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -9,18 +9,18 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\server\ServerDatabasesController;
+use PhpMyAdmin\Controllers\Server\ServerDatabasesController;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
 $container = libraries\di\Container::getDefaultContainer();
 $container->factory(
-    'PMA\libraries\controllers\server\ServerDatabasesController'
+    'PhpMyAdmin\Controllers\Server\ServerDatabasesController'
 );
 $container->alias(
     'ServerDatabasesController',
-    'PMA\libraries\controllers\server\ServerDatabasesController'
+    'PhpMyAdmin\Controllers\Server\ServerDatabasesController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/server_engines.php b/server_engines.php
index aec3a47ba6..0fecf7420f 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -9,18 +9,18 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\server\ServerEnginesController;
+use PhpMyAdmin\Controllers\Server\ServerEnginesController;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
 $container = libraries\di\Container::getDefaultContainer();
 $container->factory(
-    'PMA\libraries\controllers\server\ServerEnginesController'
+    'PhpMyAdmin\Controllers\Server\ServerEnginesController'
 );
 $container->alias(
     'ServerEnginesController',
-    'PMA\libraries\controllers\server\ServerEnginesController'
+    'PhpMyAdmin\Controllers\Server\ServerEnginesController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/server_plugins.php b/server_plugins.php
index 05d1e90bbe..6e35bc185c 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -9,18 +9,18 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\server\ServerPluginsController;
+use PhpMyAdmin\Controllers\Server\ServerPluginsController;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
 $container = \PMA\libraries\di\Container::getDefaultContainer();
 $container->factory(
-    'PMA\libraries\controllers\server\ServerPluginsController'
+    'PhpMyAdmin\Controllers\Server\ServerPluginsController'
 );
 $container->alias(
     'ServerPluginsController',
-    'PMA\libraries\controllers\server\ServerPluginsController'
+    'PhpMyAdmin\Controllers\Server\ServerPluginsController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/server_variables.php b/server_variables.php
index dd2cfeb97e..95f371fb84 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -9,18 +9,18 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\server\ServerVariablesController;
+use PhpMyAdmin\Controllers\Server\ServerVariablesController;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
 $container = libraries\di\Container::getDefaultContainer();
 $container->factory(
-    'PMA\libraries\controllers\server\ServerVariablesController'
+    'PhpMyAdmin\Controllers\Server\ServerVariablesController'
 );
 $container->alias(
     'ServerVariablesController',
-    'PMA\libraries\controllers\server\ServerVariablesController'
+    'PhpMyAdmin\Controllers\Server\ServerVariablesController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/tbl_chart.php b/tbl_chart.php
index 24c5928755..3ba750d4ac 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -8,15 +8,15 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\table\TableChartController;
+use PhpMyAdmin\Controllers\Table\TableChartController;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
 $container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableChartController');
+$container->factory('PhpMyAdmin\Controllers\Table\TableChartController');
 $container->alias(
-    'TableChartController', 'PMA\libraries\controllers\table\TableChartController'
+    'TableChartController', 'PhpMyAdmin\Controllers\Table\TableChartController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/tbl_find_replace.php b/tbl_find_replace.php
index c099092661..123f81504b 100644
--- a/tbl_find_replace.php
+++ b/tbl_find_replace.php
@@ -16,9 +16,9 @@ require_once 'libraries/common.inc.php';
 require_once 'libraries/tbl_common.inc.php';
 
 $container = \PMA\libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableSearchController');
+$container->factory('PhpMyAdmin\Controllers\Table\TableSearchController');
 $container->alias(
-    'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
+    'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
@@ -28,6 +28,6 @@ $dependency_definitions = array(
     'url_query' => &$url_query
 );
 
-/** @var PMA\libraries\controllers\table\TableSearchController $controller */
+/** @var PhpMyAdmin\Controllers\Table\TableSearchController $controller */
 $controller = $container->get('TableSearchController', $dependency_definitions);
 $controller->indexAction();
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index 8b89fd38c2..40eb576d39 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -8,7 +8,7 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\table\TableGisVisualizationController;
+use PhpMyAdmin\Controllers\Table\TableGisVisualizationController;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 
@@ -16,11 +16,11 @@ require_once 'libraries/common.inc.php';
 
 $container = libraries\di\Container::getDefaultContainer();
 $container->factory(
-    'PMA\libraries\controllers\table\TableGisVisualizationController'
+    'PhpMyAdmin\Controllers\Table\TableGisVisualizationController'
 );
 $container->alias(
     'TableGisVisualizationController',
-    'PMA\libraries\controllers\table\TableGisVisualizationController'
+    'PhpMyAdmin\Controllers\Table\TableGisVisualizationController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/tbl_indexes.php b/tbl_indexes.php
index bded425bb6..81057861e6 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -8,17 +8,17 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\table\TableIndexesController;
+use PhpMyAdmin\Controllers\Table\TableIndexesController;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
 $container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableIndexesController');
+$container->factory('PhpMyAdmin\Controllers\Table\TableIndexesController');
 $container->alias(
     'TableIndexesController',
-    'PMA\libraries\controllers\table\TableIndexesController'
+    'PhpMyAdmin\Controllers\Table\TableIndexesController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/tbl_relation.php b/tbl_relation.php
index 24bbbf0038..f4189575d9 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -19,7 +19,7 @@
  */
 namespace PMA;
 
-use PMA\libraries\controllers\table\TableRelationController;
+use PhpMyAdmin\Controllers\Table\TableRelationController;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Util;
@@ -27,10 +27,10 @@ use PhpMyAdmin\Util;
 require_once 'libraries/common.inc.php';
 
 $container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableRelationController');
+$container->factory('PhpMyAdmin\Controllers\Table\TableRelationController');
 $container->alias(
     'TableRelationController',
-    'PMA\libraries\controllers\table\TableRelationController'
+    'PhpMyAdmin\Controllers\Table\TableRelationController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/tbl_select.php b/tbl_select.php
index 4a5d8625da..fe628c9382 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -16,12 +16,12 @@ use PhpMyAdmin\Response;
 require_once 'libraries/common.inc.php';
 require_once 'libraries/tbl_common.inc.php';
 
-use PMA\libraries\controllers\table\TableSearchController;
+use PhpMyAdmin\Controllers\Table\TableSearchController;
 
 $container = \PMA\libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableSearchController');
+$container->factory('PhpMyAdmin\Controllers\Table\TableSearchController');
 $container->alias(
-    'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
+    'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/tbl_structure.php b/tbl_structure.php
index b74392cd42..a6921f3dbf 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -9,7 +9,7 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\table\TableStructureController;
+use PhpMyAdmin\Controllers\Table\TableStructureController;
 use PMA\libraries\controllers\Table;
 use PhpMyAdmin\Response;
 
@@ -19,10 +19,10 @@ require_once 'libraries/config/user_preferences.forms.php';
 require_once 'libraries/config/page_settings.forms.php';
 
 $container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableStructureController');
+$container->factory('PhpMyAdmin\Controllers\Table\TableStructureController');
 $container->alias(
     'TableStructureController',
-    'PMA\libraries\controllers\table\TableStructureController'
+    'PhpMyAdmin\Controllers\Table\TableStructureController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 0af453e262..4983ad2877 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -16,9 +16,9 @@ require_once './libraries/common.inc.php';
 require_once 'libraries/tbl_common.inc.php';
 
 $container = \PMA\libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableSearchController');
+$container->factory('PhpMyAdmin\Controllers\Table\TableSearchController');
 $container->alias(
-    'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
+    'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'
 );
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
@@ -29,6 +29,6 @@ $dependency_definitions = array(
     'url_query' => &$url_query
 );
 
-/** @var PMA\libraries\controllers\table\TableSearchController $controller */
+/** @var PhpMyAdmin\Controllers\Table\TableSearchController $controller */
 $controller = $container->get('TableSearchController', $dependency_definitions);
 $controller->indexAction();
diff --git a/test/classes/controllers/DatabaseStructureControllerTest.php b/test/classes/controllers/DatabaseStructureControllerTest.php
index 80ff74aed6..3444967f9f 100644
--- a/test/classes/controllers/DatabaseStructureControllerTest.php
+++ b/test/classes/controllers/DatabaseStructureControllerTest.php
@@ -11,7 +11,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\controllers\database\DatabaseStructureController;
+use PhpMyAdmin\Controllers\Database\DatabaseStructureController;
 use PMA\libraries\di\Container;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Theme;
@@ -99,7 +99,7 @@ class DatabaseStructureControllerTest extends PMATestCase
         $container->set('PhpMyAdmin\Response', $response);
         $container->alias('response', 'PhpMyAdmin\Response');
 
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
+        $class = new ReflectionClass('PhpMyAdmin\Controllers\Database\DatabaseStructureController');
         $method = $class->getMethod('getValuesForInnodbTable');
         $method->setAccessible(true);
         $ctrl = new DatabaseStructureController(
@@ -185,7 +185,7 @@ class DatabaseStructureControllerTest extends PMATestCase
      */
     public function testGetValuesForAriaTable()
     {
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
+        $class = new ReflectionClass('PhpMyAdmin\Controllers\Database\DatabaseStructureController');
         $method = $class->getMethod('getValuesForAriaTable');
         $method->setAccessible(true);
 
@@ -251,7 +251,7 @@ class DatabaseStructureControllerTest extends PMATestCase
      */
     public function testHasTable()
     {
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
+        $class = new ReflectionClass('PhpMyAdmin\Controllers\Database\DatabaseStructureController');
         $method = $class->getMethod('hasTable');
         $method->setAccessible(true);
 
@@ -292,7 +292,7 @@ class DatabaseStructureControllerTest extends PMATestCase
      */
     public function testCheckFavoriteTable()
     {
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
+        $class = new ReflectionClass('PhpMyAdmin\Controllers\Database\DatabaseStructureController');
         $method = $class->getMethod('checkFavoriteTable');
         $method->setAccessible(true);
 
@@ -338,7 +338,7 @@ class DatabaseStructureControllerTest extends PMATestCase
                 )
             );
 
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
+        $class = new ReflectionClass('PhpMyAdmin\Controllers\Database\DatabaseStructureController');
         $method = $class->getMethod('synchronizeFavoriteTables');
         $method->setAccessible(true);
 
@@ -375,7 +375,7 @@ class DatabaseStructureControllerTest extends PMATestCase
             $GLOBALS['db'], null
         );
         // Showing statistics
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
+        $class = new ReflectionClass('PhpMyAdmin\Controllers\Database\DatabaseStructureController');
         $property = $class->getProperty('_tables');
         $property->setAccessible(true);
 
diff --git a/test/classes/controllers/ServerBinlogControllerTest.php b/test/classes/controllers/ServerBinlogControllerTest.php
index dc58bfe9b5..0e99932a6c 100644
--- a/test/classes/controllers/ServerBinlogControllerTest.php
+++ b/test/classes/controllers/ServerBinlogControllerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Theme;
-use PMA\libraries\controllers\server\ServerBinlogController;
+use PhpMyAdmin\Controllers\Server\ServerBinlogController;
 use PMA\libraries\di\Container;
 use PhpMyAdmin\Util;
 
@@ -75,7 +75,7 @@ class ServerBinlogControllerTest extends PMATestCase
         $url_params['log'] = "log";
         $url_params['dontlimitchars'] = 1;
 
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerBinlogController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Server\ServerBinlogController');
         $method = $class->getMethod('_getLogSelector');
         $method->setAccessible(true);
 
@@ -107,13 +107,13 @@ class ServerBinlogControllerTest extends PMATestCase
      */
     public function testGetLogInfo()
     {
-    	$class = new ReflectionClass('\PMA\libraries\controllers\server\ServerBinlogController');
-    	$method = $class->getMethod('_getLogInfo');
-    	$method->setAccessible(true);
-    	$ctrl = new ServerBinlogController();
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Server\ServerBinlogController');
+        $method = $class->getMethod('_getLogInfo');
+        $method->setAccessible(true);
+        $ctrl = new ServerBinlogController();
 
         //Mock DBI
-    	$container = Container::getDefaultContainer();
+        $container = Container::getDefaultContainer();
         $dbi = $container->get('dbi');
 
         //expects return value
@@ -220,13 +220,13 @@ class ServerBinlogControllerTest extends PMATestCase
      */
     public function testGetAllLogItemInfo()
     {
-    	$class = new ReflectionClass('\PMA\libraries\controllers\server\ServerBinlogController');
-    	$method = $class->getMethod('_getAllLogItemInfo');
-    	$method->setAccessible(true);
-    	$ctrl = new ServerBinlogController();
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Server\ServerBinlogController');
+        $method = $class->getMethod('_getAllLogItemInfo');
+        $method->setAccessible(true);
+        $ctrl = new ServerBinlogController();
 
         //Mock DBI
-    	$container = Container::getDefaultContainer();
+        $container = Container::getDefaultContainer();
         $dbi = $container->get('dbi');
 
         $fetchAssoc = array(
diff --git a/test/classes/controllers/ServerCollationsControllerTest.php b/test/classes/controllers/ServerCollationsControllerTest.php
index a66a294972..e79219d678 100644
--- a/test/classes/controllers/ServerCollationsControllerTest.php
+++ b/test/classes/controllers/ServerCollationsControllerTest.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\controllers\server\ServerCollationsController;
+use PhpMyAdmin\Controllers\Server\ServerCollationsController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Theme;
 
@@ -87,7 +87,7 @@ class ServerCollationsControllerTest extends PMATestCase
             "binary" => true,
         );
 
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerCollationsController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Server\ServerCollationsController');
         $method = $class->getMethod('_getHtmlForCharsets');
         $method->setAccessible(true);
 
diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php
index a95e81979d..770737141a 100644
--- a/test/classes/controllers/ServerDatabasesControllerTest.php
+++ b/test/classes/controllers/ServerDatabasesControllerTest.php
@@ -63,14 +63,14 @@ class ServerDatabasesControllerTest extends PMATestCase
      */
     public function testGetHtmlForDatabase()
     {
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerDatabasesController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Server\ServerDatabasesController');
         $method = $class->getMethod('_getHtmlForDatabases');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
-        $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
+        $container->factory('PhpMyAdmin\Controllers\Server\ServerDatabasesController');
         $container->alias(
-            'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
+            'ServerDatabasesController', 'PhpMyAdmin\Controllers\Server\ServerDatabasesController'
         );
         $ctrl = $container->get('ServerDatabasesController');
 
@@ -185,7 +185,7 @@ class ServerDatabasesControllerTest extends PMATestCase
      */
     public function testSetSortDetails()
     {
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerDatabasesController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Server\ServerDatabasesController');
         $method = $class->getMethod('_setSortDetails');
         $method->setAccessible(true);
         $propertySortBy = $class->getProperty('_sort_by');
@@ -194,9 +194,9 @@ class ServerDatabasesControllerTest extends PMATestCase
         $propertySortOrder->setAccessible(true);
 
         $container = Container::getDefaultContainer();
-        $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
+        $container->factory('PhpMyAdmin\Controllers\Server\ServerDatabasesController');
         $container->alias(
-            'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
+            'ServerDatabasesController', 'PhpMyAdmin\Controllers\Server\ServerDatabasesController'
         );
         $ctrl = $container->get('ServerDatabasesController');
 
@@ -212,9 +212,9 @@ class ServerDatabasesControllerTest extends PMATestCase
         );
 
         $container = Container::getDefaultContainer();
-        $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
+        $container->factory('PhpMyAdmin\Controllers\Server\ServerDatabasesController');
         $container->alias(
-            'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
+            'ServerDatabasesController', 'PhpMyAdmin\Controllers\Server\ServerDatabasesController'
         );
         $ctrl = $container->get('ServerDatabasesController');
 
@@ -233,9 +233,9 @@ class ServerDatabasesControllerTest extends PMATestCase
         );
 
         $container = Container::getDefaultContainer();
-        $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
+        $container->factory('PhpMyAdmin\Controllers\Server\ServerDatabasesController');
         $container->alias(
-            'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
+            'ServerDatabasesController', 'PhpMyAdmin\Controllers\Server\ServerDatabasesController'
         );
         $ctrl = $container->get('ServerDatabasesController');
 
@@ -261,14 +261,14 @@ class ServerDatabasesControllerTest extends PMATestCase
      */
     public function testGetColumnOrder()
     {
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerDatabasesController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Server\ServerDatabasesController');
         $method = $class->getMethod('_getColumnOrder');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
-        $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
+        $container->factory('PhpMyAdmin\Controllers\Server\ServerDatabasesController');
         $container->alias(
-            'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
+            'ServerDatabasesController', 'PhpMyAdmin\Controllers\Server\ServerDatabasesController'
         );
         $ctrl = $container->get('ServerDatabasesController');
 
diff --git a/test/classes/controllers/ServerEnginesControllerTest.php b/test/classes/controllers/ServerEnginesControllerTest.php
index 9e3b412203..60241763de 100644
--- a/test/classes/controllers/ServerEnginesControllerTest.php
+++ b/test/classes/controllers/ServerEnginesControllerTest.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\StorageEngine;
 use PhpMyAdmin\Theme;
-use PMA\libraries\controllers\server\ServerEnginesController;
+use PhpMyAdmin\Controllers\Server\ServerEnginesController;
 use PhpMyAdmin\Url;
 
 require_once 'libraries/database_interface.inc.php';
@@ -47,7 +47,7 @@ class ServerEnginesControllerTest extends PMATestCase
      */
     public function testGetHtmlForAllServerEngines()
     {
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerEnginesController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Server\ServerEnginesController');
         $method = $class->getMethod('_getHtmlForAllServerEngines');
         $method->setAccessible(true);
 
@@ -108,7 +108,7 @@ class ServerEnginesControllerTest extends PMATestCase
             ->getMock();
         $GLOBALS['dbi'] = $dbi;
 
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerEnginesController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Server\ServerEnginesController');
         $method = $class->getMethod('_getHtmlForServerEngine');
         $method->setAccessible(true);
 
diff --git a/test/classes/controllers/ServerPluginsControllerTest.php b/test/classes/controllers/ServerPluginsControllerTest.php
index b60cccb3bf..5e3871b343 100644
--- a/test/classes/controllers/ServerPluginsControllerTest.php
+++ b/test/classes/controllers/ServerPluginsControllerTest.php
@@ -10,7 +10,7 @@
  * Include to test.
  */
 use PhpMyAdmin\Theme;
-use PMA\libraries\controllers\server\ServerPluginsController;
+use PhpMyAdmin\Controllers\Server\ServerPluginsController;
 use PMA\libraries\di\Container;
 
 require_once 'libraries/database_interface.inc.php';
@@ -80,7 +80,7 @@ class ServerPluginsControllerTest extends PMATestCase
         $container = Container::getDefaultContainer();
         $container->set('dbi', $dbi);
 
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerPluginsController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Server\ServerPluginsController');
         $method = $class->getMethod('_getPluginsHtml');
         $method->setAccessible(true);
 
diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/controllers/ServerVariablesControllerTest.php
index c5a8a8e698..6fcdd33723 100644
--- a/test/classes/controllers/ServerVariablesControllerTest.php
+++ b/test/classes/controllers/ServerVariablesControllerTest.php
@@ -103,18 +103,18 @@ class ServerVariablesControllerTest extends PMATestCase
     public function testFormatVariable()
     {
         $class = new ReflectionClass(
-            '\PMA\libraries\controllers\server\ServerVariablesController'
+            '\PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $method = $class->getMethod('_formatVariable');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
         $container->factory(
-            'PMA\libraries\controllers\server\ServerVariablesController'
+            'PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $container->alias(
             'ServerVariablesController',
-            'PMA\libraries\controllers\server\ServerVariablesController'
+            'PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $ctrl = $container->get('ServerVariablesController');
 
@@ -159,18 +159,18 @@ class ServerVariablesControllerTest extends PMATestCase
     public function testGetHtmlForLinkTemplates()
     {
         $class = new ReflectionClass(
-            '\PMA\libraries\controllers\server\ServerVariablesController'
+            '\PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $method = $class->getMethod('_getHtmlForLinkTemplates');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
         $container->factory(
-            'PMA\libraries\controllers\server\ServerVariablesController'
+            'PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $container->alias(
             'ServerVariablesController',
-            'PMA\libraries\controllers\server\ServerVariablesController'
+            'PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $ctrl = $container->get('ServerVariablesController');
 
@@ -203,18 +203,18 @@ class ServerVariablesControllerTest extends PMATestCase
     {
 
         $class = new ReflectionClass(
-            '\PMA\libraries\controllers\server\ServerVariablesController'
+            '\PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $method = $class->getMethod('_getHtmlForServerVariables');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
         $container->factory(
-            'PMA\libraries\controllers\server\ServerVariablesController'
+            'PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $container->alias(
             'ServerVariablesController',
-            'PMA\libraries\controllers\server\ServerVariablesController'
+            'PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $ctrl = $container->get('ServerVariablesController');
 
@@ -262,18 +262,18 @@ class ServerVariablesControllerTest extends PMATestCase
     public function testGetHtmlForServerVariablesItems()
     {
         $class = new ReflectionClass(
-            '\PMA\libraries\controllers\server\ServerVariablesController'
+            '\PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $method = $class->getMethod('_getHtmlForServerVariablesItems');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
         $container->factory(
-            'PMA\libraries\controllers\server\ServerVariablesController'
+            'PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $container->alias(
             'ServerVariablesController',
-            'PMA\libraries\controllers\server\ServerVariablesController'
+            'PhpMyAdmin\Controllers\Server\ServerVariablesController'
         );
         $ctrl = $container->get('ServerVariablesController');
 
diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/controllers/TableIndexesControllerTest.php
index 6360e5b753..bdf22f22e2 100644
--- a/test/classes/controllers/TableIndexesControllerTest.php
+++ b/test/classes/controllers/TableIndexesControllerTest.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\controllers\table\TableIndexesController;
+use PhpMyAdmin\Controllers\Table\TableIndexesController;
 use PMA\libraries\di\Container;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
diff --git a/test/classes/controllers/TableRelationControllerTest.php b/test/classes/controllers/TableRelationControllerTest.php
index a14f0ac927..e3a9a11ef5 100644
--- a/test/classes/controllers/TableRelationControllerTest.php
+++ b/test/classes/controllers/TableRelationControllerTest.php
@@ -88,13 +88,13 @@ class TableRelationControllerTest extends PMATestCase
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableRelationController');
+        $container->factory('PhpMyAdmin\Controllers\Table\TableRelationController');
         $container->alias(
             'TableRelationController',
-            'PMA\libraries\controllers\table\TableRelationController'
+            'PhpMyAdmin\Controllers\Table\TableRelationController'
         );
         /**
-         * @var PMA\libraries\controllers\table\TableRelationController
+         * @var PhpMyAdmin\Controllers\Table\TableRelationController
          */
         $ctrl = $container->get('TableRelationController');
 
@@ -134,10 +134,10 @@ class TableRelationControllerTest extends PMATestCase
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableRelationController');
+        $container->factory('PhpMyAdmin\Controllers\Table\TableRelationController');
         $container->alias(
             'TableRelationController',
-            'PMA\libraries\controllers\table\TableRelationController'
+            'PhpMyAdmin\Controllers\Table\TableRelationController'
         );
         $ctrl = $container->get('TableRelationController');
 
@@ -176,10 +176,10 @@ class TableRelationControllerTest extends PMATestCase
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableRelationController');
+        $container->factory('PhpMyAdmin\Controllers\Table\TableRelationController');
         $container->alias(
             'TableRelationController',
-            'PMA\libraries\controllers\table\TableRelationController'
+            'PhpMyAdmin\Controllers\Table\TableRelationController'
         );
         $ctrl = $container->get(
             'TableRelationController',
@@ -222,10 +222,10 @@ class TableRelationControllerTest extends PMATestCase
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableRelationController');
+        $container->factory('PhpMyAdmin\Controllers\Table\TableRelationController');
         $container->alias(
             'TableRelationController',
-            'PMA\libraries\controllers\table\TableRelationController'
+            'PhpMyAdmin\Controllers\Table\TableRelationController'
         );
         $ctrl = $container->get(
             'TableRelationController',
diff --git a/test/classes/controllers/TableSearchControllerTest.php b/test/classes/controllers/TableSearchControllerTest.php
index 76067e3463..d986a97a36 100644
--- a/test/classes/controllers/TableSearchControllerTest.php
+++ b/test/classes/controllers/TableSearchControllerTest.php
@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\controllers\table\TableSearchController;
+use PhpMyAdmin\Controllers\Table\TableSearchController;
 use PMA\libraries\di\Container;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\TypesMySQL;
@@ -149,7 +149,7 @@ class TableSearchControllerTest extends PMATestCase
         $_POST['order'] = "asc";
         $_POST['customWhereClause'] = "name='pma'";
 
-        $class = new ReflectionClass('PMA\libraries\controllers\table\TableSearchController');
+        $class = new ReflectionClass('PhpMyAdmin\Controllers\Table\TableSearchController');
         $method = $class->getMethod('_buildSqlQuery');
         $method->setAccessible(true);
         $tableSearch = new TableSearchController("zoom", null);
@@ -241,9 +241,9 @@ class TableSearchControllerTest extends PMATestCase
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableSearchController');
+        $container->factory('PhpMyAdmin\Controllers\Table\TableSearchController');
         $container->alias(
-            'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
+            'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'
         );
         $ctrl = $container->get('TableSearchController');
 
@@ -272,14 +272,14 @@ class TableSearchControllerTest extends PMATestCase
             ->will($this->returnValue(false));
         $GLOBALS['PMA_Types'] = $types;
 
-        $class = new ReflectionClass('\PMA\libraries\controllers\Table\TableSearchController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Table\TableSearchController');
         $method = $class->getMethod('_generateWhereClause');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
-        $container->factory('\PMA\libraries\controllers\Table\TableSearchController');
+        $container->factory('\PhpMyAdmin\Controllers\Table\TableSearchController');
         $container->alias(
-            'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
+            'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'
         );
         $ctrl = $container->get('TableSearchController');
 
@@ -356,9 +356,9 @@ class TableSearchControllerTest extends PMATestCase
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('\PMA\libraries\controllers\Table\TableSearchController');
+        $container->factory('\PhpMyAdmin\Controllers\Table\TableSearchController');
         $container->alias(
-            'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
+            'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'
         );
         $ctrl = $container->get('TableSearchController');
 
diff --git a/test/classes/controllers/TableStructureControllerTest.php b/test/classes/controllers/TableStructureControllerTest.php
index 12581ca5d3..626306a759 100644
--- a/test/classes/controllers/TableStructureControllerTest.php
+++ b/test/classes/controllers/TableStructureControllerTest.php
@@ -85,15 +85,15 @@ class TableStructureControllerTest extends PMATestCase
         $GLOBALS['dbi']->expects($this->any())->method('fetchAssoc')
             ->will($this->returnValue(null));
 
-        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Table\TableStructureController');
         $method = $class->getMethod('getKeyForTablePrimary');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableStructureController');
+        $container->factory('PhpMyAdmin\Controllers\Table\TableStructureController');
         $container->alias(
-            'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
+            'TableStructureController', 'PhpMyAdmin\Controllers\Table\TableStructureController'
         );
         $ctrl = $container->get('TableStructureController');
         // No primary key in db.table2
@@ -133,15 +133,15 @@ class TableStructureControllerTest extends PMATestCase
                 )
             );
 
-        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Table\TableStructureController');
         $method = $class->getMethod('getKeyForTablePrimary');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableStructureController');
+        $container->factory('PhpMyAdmin\Controllers\Table\TableStructureController');
         $container->alias(
-            'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
+            'TableStructureController', 'PhpMyAdmin\Controllers\Table\TableStructureController'
         );
         $ctrl = $container->get('TableStructureController');
         // With db.table, it has a primary key `column`
@@ -159,15 +159,15 @@ class TableStructureControllerTest extends PMATestCase
      */
     public function testAdjustColumnPrivileges()
     {
-        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Table\TableStructureController');
         $method = $class->getMethod('adjustColumnPrivileges');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableStructureController');
+        $container->factory('PhpMyAdmin\Controllers\Table\TableStructureController');
         $container->alias(
-            'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
+            'TableStructureController', 'PhpMyAdmin\Controllers\Table\TableStructureController'
         );
         $ctrl = $container->get('TableStructureController');
 
@@ -185,15 +185,15 @@ class TableStructureControllerTest extends PMATestCase
      */
     public function testGetMultipleFieldCommandType()
     {
-        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
+        $class = new ReflectionClass('\PhpMyAdmin\Controllers\Table\TableStructureController');
         $method = $class->getMethod('getMultipleFieldCommandType');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableStructureController');
+        $container->factory('PhpMyAdmin\Controllers\Table\TableStructureController');
         $container->alias(
-            'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
+            'TableStructureController', 'PhpMyAdmin\Controllers\Table\TableStructureController'
         );
         $ctrl = $container->get('TableStructureController');
 
@@ -245,15 +245,15 @@ class TableStructureControllerTest extends PMATestCase
             ->method('query')
             ->will($this->returnValue(true));
 
-        $class = new ReflectionClass('PMA\libraries\controllers\table\TableStructureController');
+        $class = new ReflectionClass('PhpMyAdmin\Controllers\Table\TableStructureController');
         $method = $class->getMethod('getDataForSubmitMult');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $dbi);
-        $container->factory('PMA\libraries\controllers\table\TableStructureController');
+        $container->factory('PhpMyAdmin\Controllers\Table\TableStructureController');
         $container->alias(
-            'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
+            'TableStructureController', 'PhpMyAdmin\Controllers\Table\TableStructureController'
         );
         $ctrl = $container->get('TableStructureController');