diff --git a/db_structure.php b/db_structure.php
index f7341b2b18..50f3ef80d9 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -8,7 +8,7 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\DatabaseStructureController;
+use PMA\libraries\controllers\database\DatabaseStructureController;
 use PMA\libraries\Response;
 use PMA\libraries\Util;
 
@@ -28,10 +28,10 @@ list(
 ) = Util::getDbInfo($GLOBALS['db'], isset($sub_part) ? $sub_part : '');
 
 $container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\DatabaseStructureController');
+$container->factory('PMA\libraries\controllers\database\DatabaseStructureController');
 $container->alias(
     'DatabaseStructureController',
-    'PMA\libraries\controllers\DatabaseStructureController'
+    'PMA\libraries\controllers\database\DatabaseStructureController'
 );
 $container->set('PMA\libraries\Response', Response::getInstance());
 $container->alias('response', 'PMA\libraries\Response');
diff --git a/libraries/controllers/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
similarity index 99%
rename from libraries/controllers/DatabaseStructureController.php
rename to libraries/controllers/database/DatabaseStructureController.php
index d5f5f6e6db..ec6fc10ef7 100644
--- a/libraries/controllers/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -2,14 +2,15 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
 /**
- * Holds the PMA\DatabaseStructureController
+ * Holds the PMA\libraries\controllers\database\DatabaseStructureController
  *
  * @package PMA
  */
 
-namespace PMA\libraries\controllers;
+namespace PMA\libraries\controllers\database;
 
 use PMA\libraries\config\PageSettings;
+use PMA\libraries\controllers\DatabaseController;
 use PMA\libraries\Message;
 use PMA\libraries\RecentFavoriteTable;
 use PMA\libraries\Template;
diff --git a/test/classes/controllers/DatabaseStructureControllerTest.php b/test/classes/controllers/DatabaseStructureControllerTest.php
index 48f7b76c99..6b5d52a410 100644
--- a/test/classes/controllers/DatabaseStructureControllerTest.php
+++ b/test/classes/controllers/DatabaseStructureControllerTest.php
@@ -11,7 +11,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\controllers\DatabaseStructureController;
+use PMA\libraries\controllers\database\DatabaseStructureController;
 use PMA\libraries\di\Container;
 use PMA\libraries\Table;
 use PMA\libraries\Theme;
@@ -105,7 +105,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
         $container->set('PMA\libraries\Response', $response);
         $container->alias('response', 'PMA\libraries\Response');
 
-        $class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
+        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
         $method = $class->getMethod('getValuesForInnodbTable');
         $method->setAccessible(true);
         // Showing statistics
@@ -191,7 +191,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
      */
     public function testGetValuesForAriaTable()
     {
-        $class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
+        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
         $method = $class->getMethod('getValuesForAriaTable');
         $method->setAccessible(true);
 
@@ -254,7 +254,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
      */
     public function testHasTable()
     {
-        $class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
+        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
         $method = $class->getMethod('hasTable');
         $method->setAccessible(true);
 
@@ -301,7 +301,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
      */
     public function testCheckFavoriteTable()
     {
-        $class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
+        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
         $method = $class->getMethod('checkFavoriteTable');
         $method->setAccessible(true);
 
@@ -353,7 +353,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
                 )
             );
 
-        $class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
+        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
         $method = $class->getMethod('synchronizeFavoriteTables');
         $method->setAccessible(true);