diff --git a/db_operations.php b/db_operations.php
index 010fa0496f..a7ce9745b7 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -12,7 +12,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Response;
-use PMA\libraries\plugins\export\ExportSql;
+use PhpMyAdmin\Plugins\Export\ExportSql;
 
 /**
  * requirements
@@ -77,7 +77,7 @@ if (strlen($GLOBALS['db']) > 0
         $export_sql_plugin = PMA_getPlugin(
             "export",
             "sql",
-            'libraries/plugins/export/',
+            'libraries/classes/Plugins/Export/',
             array(
                 'single_table' => isset($single_table),
                 'export_type'  => 'database'
diff --git a/doc/transformations.rst b/doc/transformations.rst
index be60b33c80..f04f80c455 100644
--- a/doc/transformations.rst
+++ b/doc/transformations.rst
@@ -3,7 +3,7 @@
 Transformations
 ===============
 
-.. note:: 
+.. note::
 
     You need to have configured the :ref:`linked-tables` for using transformations
     feature.
@@ -87,9 +87,9 @@ File structure
 ++++++++++++++
 
 All specific transformations for mimetypes are defined through class
-files in the directory 'libraries/plugins/transformations/'. Each of
+files in the directory 'libraries/classes/Plugins/Transformations/'. Each of
 them extends a certain transformation abstract class declared in
-libraries/plugins/transformations/abstract.
+libraries/classes/Plugins/Transformations/Abs.
 
 They are stored in files to ease up customization and easy adding of
 new transformations.
@@ -117,8 +117,8 @@ getInfo() returns the transformation's description and possible
 options it may receive and applyTransformation() is the method that
 does the actual work of the transformation plug-in.
 
-Please see the libraries/plugins/transformations/TEMPLATE and
-libraries/plugins/transformations/TEMPLATE\_ABSTRACT files for adding
+Please see the libraries/classes/Plugins/Transformations/TEMPLATE and
+libraries/classes/Plugins/Transformations/TEMPLATE\_ABSTRACT files for adding
 your own transformation plug-in. You can also generate a new
 transformation plug-in (with or without the abstract transformation
 class), by using
@@ -140,4 +140,3 @@ The applyTransformation() method always gets passed three variables:
    unsigned/zerofill/not\_null/... properties. The $meta->mimetype
    variable contains the original MIME-type of the column (i.e.
    'text/plain', 'image/jpeg' etc.)
-
diff --git a/export.php b/export.php
index 54a3c2ec9b..9f153c8bca 100644
--- a/export.php
+++ b/export.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Encoding;
-use PMA\libraries\plugins\ExportPlugin;
+use PhpMyAdmin\Plugins\ExportPlugin;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
 use PhpMyAdmin\Sanitize;
@@ -183,7 +183,7 @@ $what = Core::securePath($_POST['what']);
 $export_plugin = PMA_getPlugin(
     "export",
     $what,
-    'libraries/plugins/export/',
+    'libraries/classes/Plugins/Export/',
     array(
         'export_type' => $export_type,
         'single_table' => isset($single_table)
diff --git a/import.php b/import.php
index b98cbed3a1..76ed062add 100644
--- a/import.php
+++ b/import.php
@@ -10,7 +10,7 @@ use PhpMyAdmin\Bookmark;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\File;
-use PMA\libraries\plugins\ImportPlugin;
+use PhpMyAdmin\Plugins\ImportPlugin;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sql;
 use PhpMyAdmin\Url;
@@ -522,7 +522,7 @@ if (! $error) {
     $import_plugin = PMA_getPlugin(
         "import",
         $format,
-        'libraries/plugins/import/',
+        'libraries/classes/Plugins/Import/',
         $import_type
     );
     if ($import_plugin == null) {
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index 15847bdc78..e2e4afa517 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -290,7 +290,7 @@ function PMA_analyseShowGrant()
     $GLOBALS['dbi']->freeResult($rs_usr);
 
     // must also cacheUnset() them in
-    // libraries/plugins/auth/AuthenticationCookie.php
+    // PhpMyAdmin\Plugins\Auth\AuthenticationCookie
     PhpMyAdmin\Util::cacheSet('is_create_db_priv', $GLOBALS['is_create_db_priv']);
     PhpMyAdmin\Util::cacheSet('is_reload_priv', $GLOBALS['is_reload_priv']);
     PhpMyAdmin\Util::cacheSet('db_to_create', $GLOBALS['db_to_create']);
diff --git a/libraries/classes/DisplayResults.php b/libraries/classes/DisplayResults.php
index ecf4a7ebbc..eabada6697 100644
--- a/libraries/classes/DisplayResults.php
+++ b/libraries/classes/DisplayResults.php
@@ -11,7 +11,7 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\transformations\Text_Plain_Link;
+use PhpMyAdmin\Plugins\Transformations\Text_Plain_Link;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\Sql;
@@ -246,23 +246,23 @@ class DisplayResults
     private  function _setDefaultTransformations()
     {
         $json_highlighting_data = array(
-            'libraries/plugins/transformations/output/Text_Plain_Json.php',
-            'PMA\libraries\plugins\transformations\output\Text_Plain_Json',
+            'libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php',
+            'PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Json',
             'Text_Plain'
         );
         $sql_highlighting_data = array(
-            'libraries/plugins/transformations/output/Text_Plain_Sql.php',
-            'PMA\libraries\plugins\transformations\output\Text_Plain_Sql',
+            'libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php',
+            'PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql',
             'Text_Plain'
         );
         $blob_sql_highlighting_data = array(
-            'libraries/plugins/transformations/output/Text_Octetstream_Sql.php',
-            'PMA\libraries\plugins\transformations\output\Text_Octetstream_Sql',
+            'libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php',
+            'PhpMyAdmin\Plugins\Transformations\Output\Text_Octetstream_Sql',
             'Text_Octetstream'
         );
         $link_data = array(
-            'libraries/plugins/transformations/Text_Plain_Link.php',
-            'PMA\libraries\plugins\transformations\Text_Plain_Link',
+            'libraries/classes/Plugins/Transformations/Text_Plain_Link.php',
+            'PhpMyAdmin\Plugins\Transformations\Text_Plain_Link',
             'Text_Plain'
         );
         $this->transformation_info = array(
@@ -3050,7 +3050,7 @@ class DisplayResults
                 ) {
 
                     $file = $mime_map[$orgFullColName]['transformation'];
-                    $include_file = 'libraries/plugins/transformations/' . $file;
+                    $include_file = 'libraries/classes/Plugins/Transformations/' . $file;
 
                     if (@file_exists($include_file)) {
 
diff --git a/libraries/plugins/auth/AuthenticationConfig.php b/libraries/classes/Plugins/Auth/AuthenticationConfig.php
similarity index 98%
rename from libraries/plugins/auth/AuthenticationConfig.php
rename to libraries/classes/Plugins/Auth/AuthenticationConfig.php
index 2cc12bdc7f..79a2242efc 100644
--- a/libraries/plugins/auth/AuthenticationConfig.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationConfig.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Authentication
  * @subpackage Config
  */
-namespace PMA\libraries\plugins\auth;
+namespace PhpMyAdmin\Plugins\Auth;
 
-use PMA\libraries\plugins\AuthenticationPlugin;
+use PhpMyAdmin\Plugins\AuthenticationPlugin;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
similarity index 99%
rename from libraries/plugins/auth/AuthenticationCookie.php
rename to libraries/classes/Plugins/Auth/AuthenticationCookie.php
index 0f2aa5f2e6..fe9a9a86af 100644
--- a/libraries/plugins/auth/AuthenticationCookie.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
@@ -6,12 +6,12 @@
  * @package    PhpMyAdmin-Authentication
  * @subpackage Cookie
  */
-namespace PMA\libraries\plugins\auth;
+namespace PhpMyAdmin\Plugins\Auth;
 
 use phpseclib\Crypt;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\AuthenticationPlugin;
+use PhpMyAdmin\Plugins\AuthenticationPlugin;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 use PhpMyAdmin\Config;
diff --git a/libraries/plugins/auth/AuthenticationHttp.php b/libraries/classes/Plugins/Auth/AuthenticationHttp.php
similarity index 98%
rename from libraries/plugins/auth/AuthenticationHttp.php
rename to libraries/classes/Plugins/Auth/AuthenticationHttp.php
index 2be5e3db43..d58c35c1f8 100644
--- a/libraries/plugins/auth/AuthenticationHttp.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationHttp.php
@@ -7,9 +7,9 @@
  * @package    PhpMyAdmin-Authentication
  * @subpackage HTTP
  */
-namespace PMA\libraries\plugins\auth;
+namespace PhpMyAdmin\Plugins\Auth;
 
-use PMA\libraries\plugins\AuthenticationPlugin;
+use PhpMyAdmin\Plugins\AuthenticationPlugin;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Config;
diff --git a/libraries/plugins/auth/AuthenticationSignon.php b/libraries/classes/Plugins/Auth/AuthenticationSignon.php
similarity index 98%
rename from libraries/plugins/auth/AuthenticationSignon.php
rename to libraries/classes/Plugins/Auth/AuthenticationSignon.php
index 0b4d4e42a3..b0087030b1 100644
--- a/libraries/plugins/auth/AuthenticationSignon.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationSignon.php
@@ -6,10 +6,10 @@
  * @package    PhpMyAdmin-Authentication
  * @subpackage SignOn
  */
-namespace PMA\libraries\plugins\auth;
+namespace PhpMyAdmin\Plugins\Auth;
 
 use PhpMyAdmin\Core;
-use PMA\libraries\plugins\AuthenticationPlugin;
+use PhpMyAdmin\Plugins\AuthenticationPlugin;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php
similarity index 99%
rename from libraries/plugins/AuthenticationPlugin.php
rename to libraries/classes/Plugins/AuthenticationPlugin.php
index 3edc909226..d112c5a487 100644
--- a/libraries/plugins/AuthenticationPlugin.php
+++ b/libraries/classes/Plugins/AuthenticationPlugin.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins;
+namespace PhpMyAdmin\Plugins;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Sanitize;
diff --git a/libraries/plugins/export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php
similarity index 96%
rename from libraries/plugins/export/ExportCodegen.php
rename to libraries/classes/Plugins/Export/ExportCodegen.php
index 2fbee9cfd2..96c7bb9199 100644
--- a/libraries/plugins/export/ExportCodegen.php
+++ b/libraries/classes/Plugins/Export/ExportCodegen.php
@@ -6,15 +6,15 @@
  * @package    PhpMyAdmin-Export
  * @subpackage CodeGen
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\plugins\export\helpers\TableProperty;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Plugins\Export\Helpers\TableProperty;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/plugins/export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php
similarity index 95%
rename from libraries/plugins/export/ExportCsv.php
rename to libraries/classes/Plugins/Export/ExportCsv.php
index 43d2292ee0..490cd380f6 100644
--- a/libraries/plugins/export/ExportCsv.php
+++ b/libraries/classes/Plugins/Export/ExportCsv.php
@@ -7,16 +7,16 @@
  * @subpackage CSV
  */
 
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 
 /**
  * Handles the export for the CSV format
diff --git a/libraries/plugins/export/ExportExcel.php b/libraries/classes/Plugins/Export/ExportExcel.php
similarity index 83%
rename from libraries/plugins/export/ExportExcel.php
rename to libraries/classes/Plugins/Export/ExportExcel.php
index a8b60c7299..fa4622ad0b 100644
--- a/libraries/plugins/export/ExportExcel.php
+++ b/libraries/classes/Plugins/Export/ExportExcel.php
@@ -6,15 +6,15 @@
  * @package    PhpMyAdmin-Export
  * @subpackage CSV-Excel
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 
 /**
  * Handles the export for the CSV-Excel format
diff --git a/libraries/plugins/export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php
similarity index 97%
rename from libraries/plugins/export/ExportHtmlword.php
rename to libraries/classes/Plugins/Export/ExportHtmlword.php
index 0d320c2af2..991acaa27d 100644
--- a/libraries/plugins/export/ExportHtmlword.php
+++ b/libraries/classes/Plugins/Export/ExportHtmlword.php
@@ -6,16 +6,16 @@
  * @package    PhpMyAdmin-Export
  * @subpackage HTML-Word
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Util;
 
diff --git a/libraries/plugins/export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php
similarity index 94%
rename from libraries/plugins/export/ExportJson.php
rename to libraries/classes/Plugins/Export/ExportJson.php
index 24dd893422..bf160b60f5 100644
--- a/libraries/plugins/export/ExportJson.php
+++ b/libraries/classes/Plugins/Export/ExportJson.php
@@ -6,15 +6,15 @@
  * @package    PhpMyAdmin-Export
  * @subpackage JSON
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
 
 /**
  * Handles the export for the JSON format
diff --git a/libraries/plugins/export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php
similarity index 97%
rename from libraries/plugins/export/ExportLatex.php
rename to libraries/classes/Plugins/Export/ExportLatex.php
index f014cbbaff..83554b45b0 100644
--- a/libraries/plugins/export/ExportLatex.php
+++ b/libraries/classes/Plugins/Export/ExportLatex.php
@@ -6,16 +6,16 @@
  * @package    PhpMyAdmin-Export
  * @subpackage Latex
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Util;
 
diff --git a/libraries/plugins/export/ExportMediawiki.php b/libraries/classes/Plugins/Export/ExportMediawiki.php
similarity index 96%
rename from libraries/plugins/export/ExportMediawiki.php
rename to libraries/classes/Plugins/Export/ExportMediawiki.php
index 322b1b6e40..3a622e3e2e 100644
--- a/libraries/plugins/export/ExportMediawiki.php
+++ b/libraries/classes/Plugins/Export/ExportMediawiki.php
@@ -6,16 +6,16 @@
  * @package    PhpMyAdmin-Export
  * @subpackage MediaWiki
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/plugins/export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php
similarity index 96%
rename from libraries/plugins/export/ExportOds.php
rename to libraries/classes/Plugins/Export/ExportOds.php
index 7617d431a0..dbab500693 100644
--- a/libraries/plugins/export/ExportOds.php
+++ b/libraries/classes/Plugins/Export/ExportOds.php
@@ -6,19 +6,17 @@
  * @package    PhpMyAdmin-Export
  * @subpackage ODS
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\OpenDocument;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-$GLOBALS['ods_buffer'] = '';
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 
 /**
  * Handles the export for the ODS class
@@ -33,6 +31,7 @@ class ExportOds extends ExportPlugin
      */
     public function __construct()
     {
+        $GLOBALS['ods_buffer'] = '';
         $this->setProperties();
     }
 
diff --git a/libraries/plugins/export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php
similarity index 98%
rename from libraries/plugins/export/ExportOdt.php
rename to libraries/classes/Plugins/Export/ExportOdt.php
index 913c51bfbb..d146c80f30 100644
--- a/libraries/plugins/export/ExportOdt.php
+++ b/libraries/classes/Plugins/Export/ExportOdt.php
@@ -6,22 +6,20 @@
  * @package    PhpMyAdmin-Export
  * @subpackage ODT
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\OpenDocument;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Util;
 
-$GLOBALS['odt_buffer'] = '';
-
 /**
  * Handles the export for the ODT class
  *
@@ -35,6 +33,7 @@ class ExportOdt extends ExportPlugin
      */
     public function __construct()
     {
+        $GLOBALS['odt_buffer'] = '';
         $this->setProperties();
     }
 
diff --git a/libraries/plugins/export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php
similarity index 94%
rename from libraries/plugins/export/ExportPdf.php
rename to libraries/classes/Plugins/Export/ExportPdf.php
index bac46971b9..66024f037e 100644
--- a/libraries/plugins/export/ExportPdf.php
+++ b/libraries/classes/Plugins/Export/ExportPdf.php
@@ -6,15 +6,15 @@
  * @package    PhpMyAdmin-Export
  * @subpackage PDF
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\plugins\export\helpers\Pdf;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Plugins\Export\Helpers\Pdf;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 
 /**
  * Skip the plugin if TCPDF is not available.
@@ -33,7 +33,7 @@ if (! class_exists('TCPDF')) {
 class ExportPdf extends ExportPlugin
 {
     /**
-     * PMA\libraries\plugins\export\helpers\Pdf instance
+     * PhpMyAdmin\Plugins\Export\Helpers\Pdf instance
      *
      * @var Pdf
      */
@@ -343,7 +343,7 @@ class ExportPdf extends ExportPlugin
     /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
 
     /**
-     * Gets the PMA\libraries\plugins\export\helpers\Pdf instance
+     * Gets the PhpMyAdmin\Plugins\Export\Helpers\Pdf instance
      *
      * @return Pdf
      */
@@ -353,7 +353,7 @@ class ExportPdf extends ExportPlugin
     }
 
     /**
-     * Instantiates the PMA\libraries\plugins\export\helpers\Pdf class
+     * Instantiates the PhpMyAdmin\Plugins\Export\Helpers\Pdf class
      *
      * @param Pdf $pdf The instance
      *
diff --git a/libraries/plugins/export/ExportPhparray.php b/libraries/classes/Plugins/Export/ExportPhparray.php
similarity index 95%
rename from libraries/plugins/export/ExportPhparray.php
rename to libraries/classes/Plugins/Export/ExportPhparray.php
index 8c249be2a3..9ad272f37b 100644
--- a/libraries/plugins/export/ExportPhparray.php
+++ b/libraries/classes/Plugins/Export/ExportPhparray.php
@@ -7,14 +7,14 @@
  * @subpackage PHP
  */
 
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/plugins/export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
similarity index 99%
rename from libraries/plugins/export/ExportSql.php
rename to libraries/classes/Plugins/Export/ExportSql.php
index 9907503a84..52daf04d5d 100644
--- a/libraries/plugins/export/ExportSql.php
+++ b/libraries/classes/Plugins/Export/ExportSql.php
@@ -6,21 +6,21 @@
  * @package    PhpMyAdmin-Export
  * @subpackage SQL
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\Charsets;
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\MessageOnlyPropertyItem;
-use PMA\libraries\properties\options\items\NumberPropertyItem;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\NumberPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 use PhpMyAdmin\SqlParser\Components\CreateDefinition;
 use PhpMyAdmin\SqlParser\Context;
 use PhpMyAdmin\SqlParser\Parser;
diff --git a/libraries/plugins/export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php
similarity index 97%
rename from libraries/plugins/export/ExportTexytext.php
rename to libraries/classes/Plugins/Export/ExportTexytext.php
index 51f88d4db3..b039e0ef94 100644
--- a/libraries/plugins/export/ExportTexytext.php
+++ b/libraries/classes/Plugins/Export/ExportTexytext.php
@@ -6,16 +6,16 @@
  * @package    PhpMyAdmin-Export
  * @subpackage Texy!text
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Util;
 
diff --git a/libraries/plugins/export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php
similarity index 97%
rename from libraries/plugins/export/ExportXml.php
rename to libraries/classes/Plugins/Export/ExportXml.php
index 9fb8d5d326..d23b3abc26 100644
--- a/libraries/plugins/export/ExportXml.php
+++ b/libraries/classes/Plugins/Export/ExportXml.php
@@ -6,15 +6,15 @@
  * @package    PhpMyAdmin-Export
  * @subpackage XML
  */
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
 use PhpMyAdmin\Util;
 
 if (strlen($GLOBALS['db']) === 0) { /* Can't do server export */
diff --git a/libraries/plugins/export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php
similarity index 94%
rename from libraries/plugins/export/ExportYaml.php
rename to libraries/classes/Plugins/Export/ExportYaml.php
index 6c001f67f1..6745b5a746 100644
--- a/libraries/plugins/export/ExportYaml.php
+++ b/libraries/classes/Plugins/Export/ExportYaml.php
@@ -7,14 +7,14 @@
  * @subpackage YAML
  */
 
-namespace PMA\libraries\plugins\export;
+namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
+use PhpMyAdmin\Plugins\ExportPlugin;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
 
 /**
  * Handles the export for the YAML format
diff --git a/libraries/plugins/export/helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php
similarity index 99%
rename from libraries/plugins/export/helpers/Pdf.php
rename to libraries/classes/Plugins/Export/Helpers/Pdf.php
index 60623b34ae..67ff1ebdda 100644
--- a/libraries/plugins/export/helpers/Pdf.php
+++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * PMA\libraries\plugins\export\helpers\Pdf class
+ * PhpMyAdmin\Plugins\Export\Helpers\Pdf class
  *
  * @package    PhpMyAdmin-Export
  * @subpackage PDF
  */
-namespace PMA\libraries\plugins\export\helpers;
+namespace PhpMyAdmin\Plugins\Export\Helpers;
 
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Pdf as PdfLib;
diff --git a/libraries/plugins/export/helpers/TableProperty.php b/libraries/classes/Plugins/Export/Helpers/TableProperty.php
similarity index 96%
rename from libraries/plugins/export/helpers/TableProperty.php
rename to libraries/classes/Plugins/Export/Helpers/TableProperty.php
index ade7689be3..e5bae76237 100644
--- a/libraries/plugins/export/helpers/TableProperty.php
+++ b/libraries/classes/Plugins/Export/Helpers/TableProperty.php
@@ -1,17 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\plugins\export\helpers\TableProperty class
+ * Holds the PhpMyAdmin\Plugins\Export\Helpers\TableProperty class
  *
  * @package    PhpMyAdmin-Export
  * @subpackage CodeGen
  */
-namespace PMA\libraries\plugins\export\helpers;
+namespace PhpMyAdmin\Plugins\Export\Helpers;
 
-use PMA\libraries\plugins\export\ExportCodegen;
+use PhpMyAdmin\Plugins\Export\ExportCodegen;
 
 /**
- * PMA\libraries\plugins\export\helpers\TableProperty class
+ * PhpMyAdmin\Plugins\Export\Helpers\TableProperty class
  *
  * @package    PhpMyAdmin-Export
  * @subpackage CodeGen
diff --git a/libraries/plugins/export/README b/libraries/classes/Plugins/Export/README
similarity index 91%
rename from libraries/plugins/export/README
rename to libraries/classes/Plugins/Export/README
index 1bb8843c0f..a05dc8a47c 100644
--- a/libraries/plugins/export/README
+++ b/libraries/classes/Plugins/Export/README
@@ -20,7 +20,7 @@ if (! defined('PHPMYADMIN')) {
  *
  * @package PhpMyAdmin-Export
  */
-class Export[Name] extends PMA\libraries\plugins\ExportPlugin
+class Export[Name] extends PhpMyAdmin\Plugins\ExportPlugin
 {
     /**
      * optional - declare variables and descriptions
@@ -67,7 +67,7 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
      */
     protected function setProperties()
     {
-        $exportPluginProperties = new PMA\libraries\properties\plugins\ExportPluginProperties();
+        $exportPluginProperties = new PhpMyAdmin\Properties\Plugins\ExportPluginProperties();
         $exportPluginProperties->setText('[name]');             // the name of your plug-in
         $exportPluginProperties->setExtension('[ext]');         // extension this plug-in can handle
         $exportPluginProperties->setOptionsText(__('Options'));
@@ -75,12 +75,12 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
-        $exportSpecificOptions = new PMA\libraries\properties\options\groups\OptionsPropertyRootGroup(
+        $exportSpecificOptions = new PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup(
             "Format Specific Options"
         );
 
         // general options main group
-        $generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup(
+        $generalOptions = new PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup(
             "general_opts"
         );
 
@@ -92,7 +92,7 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
         // size - size of text element
         // len  - maximal size of input
         // values - possible values of the item
-        $leaf = new PMA\libraries\properties\options\items\RadioPropertyItem(
+        $leaf = new PhpMyAdmin\Properties\Options\Items\RadioPropertyItem(
             "structure_or_data"
         );
         $leaf->setValues(
@@ -194,7 +194,7 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
         return true;
     }
 
-    // optional - implement other methods defined in PMA\libraries\plugins\ExportPlugin.class.php:
+    // optional - implement other methods defined in PhpMyAdmin\Plugins\ExportPlugin.class.php:
     //  - exportRoutines()
     //  - exportStructure()
     //  - getTableDefStandIn()
@@ -203,7 +203,7 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
     // optional - implement other private methods in order to avoid
     // having huge methods or avoid duplicate code. Make use of them
     // as well as of the getters and setters declared both here
-    // and in the PMA\libraries\plugins\ExportPlugin class
+    // and in the PhpMyAdmin\Plugins\ExportPlugin class
 
 
     // optional:
diff --git a/libraries/plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php
similarity index 97%
rename from libraries/plugins/ExportPlugin.php
rename to libraries/classes/Plugins/ExportPlugin.php
index 4d872a6137..0d2622468c 100644
--- a/libraries/plugins/ExportPlugin.php
+++ b/libraries/classes/Plugins/ExportPlugin.php
@@ -6,9 +6,9 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA\libraries\plugins;
+namespace PhpMyAdmin\Plugins;
 
-use PMA\libraries\properties\plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
 
 /**
  * Provides a common interface that will have to be implemented by all of the
@@ -21,10 +21,10 @@ use PMA\libraries\properties\plugins\ExportPluginProperties;
 abstract class ExportPlugin
 {
     /**
-     * PMA\libraries\properties\plugins\ExportPluginProperties object containing
+     * PhpMyAdmin\Properties\Plugins\ExportPluginProperties object containing
      * the specific export plugin type properties
      *
-     * @var \PMA\libraries\properties\plugins\ExportPluginProperties
+     * @var \PhpMyAdmin\Properties\Plugins\ExportPluginProperties
      */
     protected $properties;
     /**
diff --git a/libraries/plugins/IOTransformationsPlugin.php b/libraries/classes/Plugins/IOTransformationsPlugin.php
similarity index 96%
rename from libraries/plugins/IOTransformationsPlugin.php
rename to libraries/classes/Plugins/IOTransformationsPlugin.php
index eed01717dd..4b098b2bf4 100644
--- a/libraries/plugins/IOTransformationsPlugin.php
+++ b/libraries/classes/Plugins/IOTransformationsPlugin.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins;
+namespace PhpMyAdmin\Plugins;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 /**
  * Provides a common interface that will have to be implemented
diff --git a/libraries/plugins/import/AbstractImportCsv.php b/libraries/classes/Plugins/Import/AbstractImportCsv.php
similarity index 81%
rename from libraries/plugins/import/AbstractImportCsv.php
rename to libraries/classes/Plugins/Import/AbstractImportCsv.php
index 96489075a4..25cdcbc943 100644
--- a/libraries/plugins/import/AbstractImportCsv.php
+++ b/libraries/classes/Plugins/Import/AbstractImportCsv.php
@@ -6,14 +6,14 @@
  * @package    PhpMyAdmin-Import
  * @subpackage CSV
  */
-namespace PMA\libraries\plugins\import;
+namespace PhpMyAdmin\Plugins\Import;
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Plugins\ImportPlugin;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 
 /**
  * Super class of the import plugins for the CSV format
@@ -27,7 +27,7 @@ abstract class AbstractImportCsv extends ImportPlugin
      * Sets the import plugin properties.
      * Called in the constructor.
      *
-     * @return \PMA\libraries\properties\options\groups\OptionsPropertyMainGroup PMA\libraries\properties\options\groups\OptionsPropertyMainGroup object of the plugin
+     * @return \PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup object of the plugin
      */
     protected function setProperties()
     {
diff --git a/libraries/plugins/import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php
similarity index 99%
rename from libraries/plugins/import/ImportCsv.php
rename to libraries/classes/Plugins/Import/ImportCsv.php
index 2566cf9861..fbd830b664 100644
--- a/libraries/plugins/import/ImportCsv.php
+++ b/libraries/classes/Plugins/Import/ImportCsv.php
@@ -7,11 +7,11 @@
  * @package    PhpMyAdmin-Import
  * @subpackage CSV
  */
-namespace PMA\libraries\plugins\import;
+namespace PhpMyAdmin\Plugins\Import;
 
 use PhpMyAdmin\Message;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/plugins/import/ImportLdi.php b/libraries/classes/Plugins/Import/ImportLdi.php
similarity index 95%
rename from libraries/plugins/import/ImportLdi.php
rename to libraries/classes/Plugins/Import/ImportLdi.php
index f6c42e4693..77e79bafd8 100644
--- a/libraries/plugins/import/ImportLdi.php
+++ b/libraries/classes/Plugins/Import/ImportLdi.php
@@ -6,12 +6,12 @@
  * @package    PhpMyAdmin-Import
  * @subpackage LDI
  */
-namespace PMA\libraries\plugins\import;
+namespace PhpMyAdmin\Plugins\Import;
 
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\import\AbstractImportCsv;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Plugins\Import\AbstractImportCsv;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 use PhpMyAdmin\Util;
 
 if (!defined('PHPMYADMIN')) {
diff --git a/libraries/plugins/import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php
similarity index 99%
rename from libraries/plugins/import/ImportMediawiki.php
rename to libraries/classes/Plugins/Import/ImportMediawiki.php
index 0e5e30c240..ccf64ee48f 100644
--- a/libraries/plugins/import/ImportMediawiki.php
+++ b/libraries/classes/Plugins/Import/ImportMediawiki.php
@@ -6,11 +6,11 @@
  * @package    PhpMyAdmin-Import
  * @subpackage MediaWiki
  */
-namespace PMA\libraries\plugins\import;
+namespace PhpMyAdmin\Plugins\Import;
 
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\properties\plugins\ImportPluginProperties;
+use PhpMyAdmin\Plugins\ImportPlugin;
+use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
 
 /**
  * Handles the import for the MediaWiki format
diff --git a/libraries/plugins/import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php
similarity index 97%
rename from libraries/plugins/import/ImportOds.php
rename to libraries/classes/Plugins/Import/ImportOds.php
index 1f610b9dc9..e6e378a772 100644
--- a/libraries/plugins/import/ImportOds.php
+++ b/libraries/classes/Plugins/Import/ImportOds.php
@@ -8,14 +8,14 @@
  * @package    PhpMyAdmin-Import
  * @subpackage ODS
  */
-namespace PMA\libraries\plugins\import;
+namespace PhpMyAdmin\Plugins\Import;
 
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
+use PhpMyAdmin\Plugins\ImportPlugin;
+use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
 use SimpleXMLElement;
 
 /**
diff --git a/libraries/plugins/import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php
similarity index 98%
rename from libraries/plugins/import/ImportShp.php
rename to libraries/classes/Plugins/Import/ImportShp.php
index d5bbd2bc4c..67c719753d 100644
--- a/libraries/plugins/import/ImportShp.php
+++ b/libraries/classes/Plugins/Import/ImportShp.php
@@ -6,7 +6,7 @@
  * @package    PhpMyAdmin-Import
  * @subpackage ESRI_Shape
  */
-namespace PMA\libraries\plugins\import;
+namespace PhpMyAdmin\Plugins\Import;
 
 use PhpMyAdmin\Gis\GisFactory;
 use PhpMyAdmin\Gis\GisMultiLineString;
@@ -14,8 +14,8 @@ use PhpMyAdmin\Gis\GisMultiPoint;
 use PhpMyAdmin\Gis\GisPoint;
 use PhpMyAdmin\Gis\GisPolygon;
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\properties\plugins\ImportPluginProperties;
+use PhpMyAdmin\Plugins\ImportPlugin;
+use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
 use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\ZipExtension;
 
diff --git a/libraries/plugins/import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php
similarity index 93%
rename from libraries/plugins/import/ImportSql.php
rename to libraries/classes/Plugins/Import/ImportSql.php
index db64280de2..db92dd37ec 100644
--- a/libraries/plugins/import/ImportSql.php
+++ b/libraries/classes/Plugins/Import/ImportSql.php
@@ -6,14 +6,14 @@
  * @package    PhpMyAdmin-Import
  * @subpackage SQL
  */
-namespace PMA\libraries\plugins\import;
+namespace PhpMyAdmin\Plugins\Import;
 
-use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
+use PhpMyAdmin\Plugins\ImportPlugin;
+use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
 use PhpMyAdmin\SqlParser\Utils\BufferedQuery;
 
 /**
diff --git a/libraries/plugins/import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php
similarity index 98%
rename from libraries/plugins/import/ImportXml.php
rename to libraries/classes/Plugins/Import/ImportXml.php
index 0a068f4aad..5c04a43bf1 100644
--- a/libraries/plugins/import/ImportXml.php
+++ b/libraries/classes/Plugins/Import/ImportXml.php
@@ -8,11 +8,11 @@
  * @subpackage XML
  */
 
-namespace PMA\libraries\plugins\import;
+namespace PhpMyAdmin\Plugins\Import;
 
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\properties\plugins\ImportPluginProperties;
+use PhpMyAdmin\Plugins\ImportPlugin;
+use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
 use PhpMyAdmin\Util;
 use SimpleXMLElement;
 
diff --git a/libraries/plugins/import/README b/libraries/classes/Plugins/Import/README
similarity index 87%
rename from libraries/plugins/import/README
rename to libraries/classes/Plugins/Import/README
index a7e60dd132..1064040c53 100644
--- a/libraries/plugins/import/README
+++ b/libraries/classes/Plugins/Import/README
@@ -10,19 +10,16 @@ gettext mechanism, see https://wiki.phpmyadmin.net/pma/Gettext_for_developers.
  * @package    PhpMyAdmin-Import
  * @subpackage [Name]
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
+namespace PhpMyAdmin\Plugins\Import;
 
-/* Get the import interface */
-require_once 'libraries/plugins/PMA\libraries\plugins\ImportPlugin.class.php';
+use PhpMyAdmin\Plugins\ImportPlugin;
 
 /**
  * Handles the import for the [Name] format
  *
  * @package PhpMyAdmin-Import
  */
-class Import[Name] extends PMA\libraries\plugins\ImportPlugin
+class Import[Name] extends ImportPlugin
 {
     /**
      * optional - declare variables and descriptions
@@ -47,7 +44,7 @@ class Import[Name] extends PMA\libraries\plugins\ImportPlugin
      */
     protected function setProperties()
     {
-        $importPluginProperties = new PMA\libraries\properties\plugins\ImportPluginProperties();
+        $importPluginProperties = new PhpMyAdmin\Properties\Plugins\ImportPluginProperties();
         $importPluginProperties->setText('[name]');             // the name of your plug-in
         $importPluginProperties->setExtension('[ext]');         // extension this plug-in can handle
         $importPluginProperties->setOptionsText(__('Options'));
@@ -56,12 +53,12 @@ class Import[Name] extends PMA\libraries\plugins\ImportPlugin
         // $importPluginProperties
         // this will be shown as "Format specific options"
         $importSpecificOptions = new
-        PMA\libraries\properties\options\groups\OptionsPropertyRootGroup(
+        PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup(
             "Format Specific Options"
         );
 
         // general options main group
-        $generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup(
+        $generalOptions = new PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup(
             "general_opts"
         );
 
@@ -73,7 +70,7 @@ class Import[Name] extends PMA\libraries\plugins\ImportPlugin
         // size - size of text element
         // len  - maximal size of input
         // values - possible values of the item
-        $leaf = new PMA\libraries\properties\options\items\RadioPropertyItem(
+        $leaf = new PhpMyAdmin\Properties\Options\Items\RadioPropertyItem(
             "structure_or_data"
         );
         $leaf->setValues(
diff --git a/libraries/plugins/import/ShapeFileImport.php b/libraries/classes/Plugins/Import/ShapeFileImport.php
similarity index 95%
rename from libraries/plugins/import/ShapeFileImport.php
rename to libraries/classes/Plugins/Import/ShapeFileImport.php
index 83345e4fd4..eadb52e168 100644
--- a/libraries/plugins/import/ShapeFileImport.php
+++ b/libraries/classes/Plugins/Import/ShapeFileImport.php
@@ -7,7 +7,7 @@
  * @package    PhpMyAdmin-Import
  * @subpackage ESRI_Shape
  */
-namespace PMA\libraries\plugins\import;
+namespace PhpMyAdmin\Plugins\Import;
 
 use PhpMyAdmin\ShapeFile\ShapeFile;
 
diff --git a/libraries/plugins/import/upload/UploadApc.php b/libraries/classes/Plugins/Import/Upload/UploadApc.php
similarity index 95%
rename from libraries/plugins/import/upload/UploadApc.php
rename to libraries/classes/Plugins/Import/Upload/UploadApc.php
index 95e8c6aff4..0657cb5a52 100644
--- a/libraries/plugins/import/upload/UploadApc.php
+++ b/libraries/classes/Plugins/Import/Upload/UploadApc.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\import\upload;
+namespace PhpMyAdmin\Plugins\Import\Upload;
 
-use PMA\libraries\plugins\UploadInterface;
+use PhpMyAdmin\Plugins\UploadInterface;
 
 /**
  * Implementation for the APC extension
diff --git a/libraries/plugins/import/upload/UploadNoplugin.php b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php
similarity index 93%
rename from libraries/plugins/import/upload/UploadNoplugin.php
rename to libraries/classes/Plugins/Import/Upload/UploadNoplugin.php
index 2bc67cbd61..b2539fe96a 100644
--- a/libraries/plugins/import/upload/UploadNoplugin.php
+++ b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\import\upload;
+namespace PhpMyAdmin\Plugins\Import\Upload;
 
-use PMA\libraries\plugins\UploadInterface;
+use PhpMyAdmin\Plugins\UploadInterface;
 
 /**
  * Implementation for no plugin
diff --git a/libraries/plugins/import/upload/UploadProgress.php b/libraries/classes/Plugins/Import/Upload/UploadProgress.php
similarity index 96%
rename from libraries/plugins/import/upload/UploadProgress.php
rename to libraries/classes/Plugins/Import/Upload/UploadProgress.php
index 9b3ac31974..880c79ad29 100644
--- a/libraries/plugins/import/upload/UploadProgress.php
+++ b/libraries/classes/Plugins/Import/Upload/UploadProgress.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\import\upload;
+namespace PhpMyAdmin\Plugins\Import\Upload;
 
-use PMA\libraries\plugins\UploadInterface;
+use PhpMyAdmin\Plugins\UploadInterface;
 
 /**
  * Implementation for upload progress
diff --git a/libraries/plugins/import/upload/UploadSession.php b/libraries/classes/Plugins/Import/Upload/UploadSession.php
similarity index 96%
rename from libraries/plugins/import/upload/UploadSession.php
rename to libraries/classes/Plugins/Import/Upload/UploadSession.php
index 0891bdf038..08178e3bb0 100644
--- a/libraries/plugins/import/upload/UploadSession.php
+++ b/libraries/classes/Plugins/Import/Upload/UploadSession.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\import\upload;
+namespace PhpMyAdmin\Plugins\Import\Upload;
 
-use PMA\libraries\plugins\UploadInterface;
+use PhpMyAdmin\Plugins\UploadInterface;
 
 /**
  * Implementation for session
diff --git a/libraries/plugins/ImportPlugin.php b/libraries/classes/Plugins/ImportPlugin.php
similarity index 90%
rename from libraries/plugins/ImportPlugin.php
rename to libraries/classes/Plugins/ImportPlugin.php
index 3cc68a1f58..42ed2286f4 100644
--- a/libraries/plugins/ImportPlugin.php
+++ b/libraries/classes/Plugins/ImportPlugin.php
@@ -6,9 +6,9 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA\libraries\plugins;
+namespace PhpMyAdmin\Plugins;
 
-use PMA\libraries\properties\plugins\ImportPluginProperties;
+use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
 
 /**
  * Provides a common interface that will have to be implemented by all of the
@@ -38,7 +38,7 @@ abstract class ImportPlugin
     /**
      * Gets the import specific format plugin properties
      *
-     * @return \PMA\libraries\properties\plugins\ImportPluginProperties
+     * @return \PhpMyAdmin\Properties\Plugins\ImportPluginProperties
      */
     public function getProperties()
     {
diff --git a/libraries/plugins/schema/dia/Dia.php b/libraries/classes/Plugins/Schema/Dia/Dia.php
similarity index 99%
rename from libraries/plugins/schema/dia/Dia.php
rename to libraries/classes/Plugins/Schema/Dia/Dia.php
index f0bf07c252..b1fe5027c0 100644
--- a/libraries/plugins/schema/dia/Dia.php
+++ b/libraries/classes/Plugins/Schema/Dia/Dia.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\dia;
+namespace PhpMyAdmin\Plugins\Schema\Dia;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Response;
diff --git a/libraries/plugins/schema/dia/DiaRelationSchema.php b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
similarity index 94%
rename from libraries/plugins/schema/dia/DiaRelationSchema.php
rename to libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
index 01a0249faa..138e18a984 100644
--- a/libraries/plugins/schema/dia/DiaRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
@@ -5,13 +5,13 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\dia;
+namespace PhpMyAdmin\Plugins\Schema\Dia;
 
-use PMA\libraries\plugins\schema\eps\TableStatsEps;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\pdf\TableStatsPdf;
-use PMA\libraries\plugins\schema\svg\TableStatsSvg;
-use PMA\libraries\plugins\schema\dia\TableStatsDia;
+use PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps;
+use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
+use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf;
+use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg;
+use PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia;
 
 /**
  * Dia Relation Schema Class
@@ -43,7 +43,7 @@ class DiaRelationSchema extends ExportRelationSchema
     public static $objectId = 0;
 
     /**
-     * The "PMA\libraries\plugins\schema\dia\DiaRelationSchema" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema" constructor
      *
      * Upon instantiation This outputs the Dia XML document
      * that user can download
diff --git a/libraries/plugins/schema/dia/RelationStatsDia.php b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
similarity index 97%
rename from libraries/plugins/schema/dia/RelationStatsDia.php
rename to libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
index f40ec2256e..d645f66759 100644
--- a/libraries/plugins/schema/dia/RelationStatsDia.php
+++ b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains PMA\libraries\plugins\schema\dia\RelationStatsDia class
+ * Contains PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\dia;
+namespace PhpMyAdmin\Plugins\Schema\Dia;
 
 /**
  * Relation preferences/statistics
@@ -36,7 +36,7 @@ class RelationStatsDia
     public $referenceColor;
 
     /**
-     * The "PMA\libraries\plugins\schema\dia\RelationStatsDia" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia" constructor
      *
      * @param object $diagram       The DIA diagram
      * @param string $master_table  The master table name
diff --git a/libraries/plugins/schema/dia/TableStatsDia.php b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
similarity index 96%
rename from libraries/plugins/schema/dia/TableStatsDia.php
rename to libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
index 883af32e0e..470f762c56 100644
--- a/libraries/plugins/schema/dia/TableStatsDia.php
+++ b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
@@ -1,14 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains PMA\libraries\plugins\schema\dia\TableStatsDia class
+ * Contains PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\dia;
+namespace PhpMyAdmin\Plugins\Schema\Dia;
 
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\TableStats;
+use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
+use PhpMyAdmin\Plugins\Schema\TableStats;
 
 /**
  * Table preferences/statistics
@@ -26,7 +26,7 @@ class TableStatsDia extends TableStats
     public $tableColor;
 
     /**
-     * The "PMA\libraries\plugins\schema\dia\TableStatsDia" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia" constructor
      *
      * @param object  $diagram    The current dia document
      * @param string  $db         The database name
diff --git a/libraries/plugins/schema/eps/Eps.php b/libraries/classes/Plugins/Schema/Eps/Eps.php
similarity index 99%
rename from libraries/plugins/schema/eps/Eps.php
rename to libraries/classes/Plugins/Schema/Eps/Eps.php
index cab392f7fa..e71b1357da 100644
--- a/libraries/plugins/schema/eps/Eps.php
+++ b/libraries/classes/Plugins/Schema/Eps/Eps.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\eps;
+namespace PhpMyAdmin\Plugins\Schema\Eps;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Response;
diff --git a/libraries/plugins/schema/eps/EpsRelationSchema.php b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
similarity index 94%
rename from libraries/plugins/schema/eps/EpsRelationSchema.php
rename to libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
index 5caed6da00..4026c3392a 100644
--- a/libraries/plugins/schema/eps/EpsRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
@@ -5,13 +5,13 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\eps;
+namespace PhpMyAdmin\Plugins\Schema\Eps;
 
-use PMA\libraries\plugins\schema\dia\RelationStatsDia;
-use PMA\libraries\plugins\schema\dia\TableStatsDia;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\pdf\TableStatsPdf;
-use PMA\libraries\plugins\schema\svg\TableStatsSvg;
+use PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia;
+use PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia;
+use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
+use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf;
+use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg;
 
 /**
  * EPS Relation Schema Class
@@ -165,7 +165,7 @@ class EpsRelationSchema extends ExportRelationSchema
      * @return void
      *
      * @see _setMinMax,Table_Stats_Eps::__construct(),
-     * PMA\libraries\plugins\schema\eps\RelationStatsEps::__construct()
+     * PhpMyAdmin\Plugins\Schema\Eps\RelationStatsEps::__construct()
      */
     private function _addRelation(
         $masterTable, $font, $fontSize, $masterField,
diff --git a/libraries/plugins/schema/eps/RelationStatsEps.php b/libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php
similarity index 93%
rename from libraries/plugins/schema/eps/RelationStatsEps.php
rename to libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php
index 2382400032..61b7f6c260 100644
--- a/libraries/plugins/schema/eps/RelationStatsEps.php
+++ b/libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains PMA\libraries\plugins\schema\eps\RelationStatsEps class
+ * Contains PhpMyAdmin\Plugins\Schema\Eps\RelationStatsEps class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\eps;
+namespace PhpMyAdmin\Plugins\Schema\Eps;
 
-use PMA\libraries\plugins\schema\RelationStats;
+use PhpMyAdmin\Plugins\Schema\RelationStats;
 
 /**
  * Relation preferences/statistics
@@ -24,7 +24,7 @@ use PMA\libraries\plugins\schema\RelationStats;
 class RelationStatsEps extends RelationStats
 {
     /**
-     * The "PMA\libraries\plugins\schema\eps\RelationStatsEps" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Eps\RelationStatsEps" constructor
      *
      * @param object $diagram       The EPS diagram
      * @param string $master_table  The master table name
diff --git a/libraries/plugins/schema/eps/TableStatsEps.php b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php
similarity index 92%
rename from libraries/plugins/schema/eps/TableStatsEps.php
rename to libraries/classes/Plugins/Schema/Eps/TableStatsEps.php
index af05156383..c1059dee88 100644
--- a/libraries/plugins/schema/eps/TableStatsEps.php
+++ b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php
@@ -1,15 +1,15 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains PMA\libraries\plugins\schema\eps\TableStatsEps class
+ * Contains PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\eps;
+namespace PhpMyAdmin\Plugins\Schema\Eps;
 
 use PhpMyAdmin\Font;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\TableStats;
+use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
+use PhpMyAdmin\Plugins\Schema\TableStats;
 
 /**
  * Table preferences/statistics
@@ -30,7 +30,7 @@ class TableStatsEps extends TableStats
     public $currentCell = 0;
 
     /**
-     * The "PMA\libraries\plugins\schema\eps\TableStatsEps" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps" constructor
      *
      * @param object  $diagram          The EPS diagram
      * @param string  $db               The database name
@@ -45,7 +45,7 @@ class TableStatsEps extends TableStats
      *                                  from the browser
      *
      * @see PMA_EPS, Table_Stats_Eps::Table_Stats_setWidth,
-     *      PMA\libraries\plugins\schema\eps\TableStatsEps::Table_Stats_setHeight
+     *      PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps::Table_Stats_setHeight
      */
     public function __construct(
         $diagram,
diff --git a/libraries/plugins/schema/ExportRelationSchema.php b/libraries/classes/Plugins/Schema/ExportRelationSchema.php
similarity index 98%
rename from libraries/plugins/schema/ExportRelationSchema.php
rename to libraries/classes/Plugins/Schema/ExportRelationSchema.php
index d829d331e5..939f40928f 100644
--- a/libraries/plugins/schema/ExportRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/ExportRelationSchema.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains PMA\libraries\plugins\schema\ExportRelationSchema class which is
+ * Contains PhpMyAdmin\Plugins\Schema\ExportRelationSchema class which is
  * inherited by all schema classes.
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema;
+namespace PhpMyAdmin\Plugins\Schema;
 
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
diff --git a/libraries/plugins/schema/pdf/Pdf.php b/libraries/classes/Plugins/Schema/Pdf/Pdf.php
similarity index 99%
rename from libraries/plugins/schema/pdf/Pdf.php
rename to libraries/classes/Plugins/Schema/Pdf/Pdf.php
index 1194a4fd32..9cbc02b813 100644
--- a/libraries/plugins/schema/pdf/Pdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/Pdf.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\pdf;
+namespace PhpMyAdmin\Plugins\Schema\Pdf;
 
 use PhpMyAdmin\Pdf as PdfLib;
 use PhpMyAdmin\Util;
diff --git a/libraries/plugins/schema/pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
similarity index 99%
rename from libraries/plugins/schema/pdf/PdfRelationSchema.php
rename to libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
index 9f57233fd8..e05f63332d 100644
--- a/libraries/plugins/schema/pdf/PdfRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
@@ -5,10 +5,10 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\pdf;
+namespace PhpMyAdmin\Plugins\Schema\Pdf;
 
 use PhpMyAdmin\Pdf as PdfLib;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
+use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
 use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Util;
 
diff --git a/libraries/plugins/schema/pdf/RelationStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
similarity index 94%
rename from libraries/plugins/schema/pdf/RelationStatsPdf.php
rename to libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
index 06be9c2d52..9e54b851e3 100644
--- a/libraries/plugins/schema/pdf/RelationStatsPdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains PMA\libraries\plugins\schema\pdf\RelationStatsPdf class
+ * Contains PhpMyAdmin\Plugins\Schema\Pdf\RelationStatsPdf class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\pdf;
+namespace PhpMyAdmin\Plugins\Schema\Pdf;
 
-use PMA\libraries\plugins\schema\RelationStats;
+use PhpMyAdmin\Plugins\Schema\RelationStats;
 
 /**
  * Relation preferences/statistics
@@ -25,7 +25,7 @@ use PMA\libraries\plugins\schema\RelationStats;
 class RelationStatsPdf extends RelationStats
 {
     /**
-     * The "PMA\libraries\plugins\schema\pdf\RelationStatsPdf" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Pdf\RelationStatsPdf" constructor
      *
      * @param object $diagram       The PDF diagram
      * @param string $master_table  The master table name
diff --git a/libraries/plugins/schema/pdf/TableStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
similarity index 94%
rename from libraries/plugins/schema/pdf/TableStatsPdf.php
rename to libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
index eace8163ce..9f930ca514 100644
--- a/libraries/plugins/schema/pdf/TableStatsPdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
@@ -1,14 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains PMA\libraries\plugins\schema\pdf\TableStatsPdf class
+ * Contains PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\pdf;
+namespace PhpMyAdmin\Plugins\Schema\Pdf;
 
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\TableStats;
+use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
+use PhpMyAdmin\Plugins\Schema\TableStats;
 use PhpMyAdmin\Pdf as PdfLib;
 
 /**
@@ -31,7 +31,7 @@ class TableStatsPdf extends TableStats
     private $_ff = PdfLib::PMA_PDF_FONT;
 
     /**
-     * The "PMA\libraries\plugins\schema\pdf\TableStatsPdf" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf" constructor
      *
      * @param object  $diagram        The PDF diagram
      * @param string  $db             The database name
@@ -46,7 +46,7 @@ class TableStatsPdf extends TableStats
      *                                from the browser
      *
      * @see PMA_Schema_PDF, Table_Stats_Pdf::Table_Stats_setWidth,
-     *     PMA\libraries\plugins\schema\pdf\TableStatsPdf::Table_Stats_setHeight
+     *     PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf::Table_Stats_setHeight
      */
     public function __construct(
         $diagram,
diff --git a/libraries/plugins/schema/RelationStats.php b/libraries/classes/Plugins/Schema/RelationStats.php
similarity index 98%
rename from libraries/plugins/schema/RelationStats.php
rename to libraries/classes/Plugins/Schema/RelationStats.php
index d22b180598..8fe9f30e1d 100644
--- a/libraries/plugins/schema/RelationStats.php
+++ b/libraries/classes/Plugins/Schema/RelationStats.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema;
+namespace PhpMyAdmin\Plugins\Schema;
 
 /**
  * Relations preferences/statistics
diff --git a/libraries/plugins/schema/SchemaDia.php b/libraries/classes/Plugins/Schema/SchemaDia.php
similarity index 85%
rename from libraries/plugins/schema/SchemaDia.php
rename to libraries/classes/Plugins/Schema/SchemaDia.php
index 0160657485..02dd75af1e 100644
--- a/libraries/plugins/schema/SchemaDia.php
+++ b/libraries/classes/Plugins/Schema/SchemaDia.php
@@ -6,14 +6,14 @@
  * @package    PhpMyAdmin-Schema
  * @subpackage Dia
  */
-namespace PMA\libraries\plugins\schema;
+namespace PhpMyAdmin\Plugins\Schema;
 
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\SchemaPlugin;
-use PMA\libraries\plugins\schema\dia\DiaRelationSchema;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Plugins\SchemaPlugin;
+use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema;
+use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties;
+use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
 
 /**
  * Handles the schema export for the Dia format
diff --git a/libraries/plugins/schema/SchemaEps.php b/libraries/classes/Plugins/Schema/SchemaEps.php
similarity index 83%
rename from libraries/plugins/schema/SchemaEps.php
rename to libraries/classes/Plugins/Schema/SchemaEps.php
index 59ce74669a..1df342f043 100644
--- a/libraries/plugins/schema/SchemaEps.php
+++ b/libraries/classes/Plugins/Schema/SchemaEps.php
@@ -6,15 +6,15 @@
  * @package    PhpMyAdmin-Schema
  * @subpackage EPS
  */
-namespace PMA\libraries\plugins\schema;
+namespace PhpMyAdmin\Plugins\Schema;
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\schema\eps\EpsRelationSchema;
-use PMA\libraries\plugins\SchemaPlugin;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema;
+use PhpMyAdmin\Plugins\SchemaPlugin;
+use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties;
+use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
 
 /**
  * Handles the schema export for the EPS format
diff --git a/libraries/plugins/schema/SchemaPdf.php b/libraries/classes/Plugins/Schema/SchemaPdf.php
similarity index 87%
rename from libraries/plugins/schema/SchemaPdf.php
rename to libraries/classes/Plugins/Schema/SchemaPdf.php
index f900ab61c5..0c12fb4573 100644
--- a/libraries/plugins/schema/SchemaPdf.php
+++ b/libraries/classes/Plugins/Schema/SchemaPdf.php
@@ -6,15 +6,15 @@
  * @package    PhpMyAdmin-Schema
  * @subpackage PDF
  */
-namespace PMA\libraries\plugins\schema;
+namespace PhpMyAdmin\Plugins\Schema;
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\schema\pdf\PdfRelationSchema;
-use PMA\libraries\plugins\SchemaPlugin;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema;
+use PhpMyAdmin\Plugins\SchemaPlugin;
+use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties;
+use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
 
 /**
  * Handles the schema export for the PDF format
diff --git a/libraries/plugins/schema/SchemaSvg.php b/libraries/classes/Plugins/Schema/SchemaSvg.php
similarity index 83%
rename from libraries/plugins/schema/SchemaSvg.php
rename to libraries/classes/Plugins/Schema/SchemaSvg.php
index df87548418..fce8104269 100644
--- a/libraries/plugins/schema/SchemaSvg.php
+++ b/libraries/classes/Plugins/Schema/SchemaSvg.php
@@ -6,14 +6,14 @@
  * @package    PhpMyAdmin-Schema
  * @subpackage SVG
  */
-namespace PMA\libraries\plugins\schema;
+namespace PhpMyAdmin\Plugins\Schema;
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\SchemaPlugin;
-use PMA\libraries\plugins\schema\svg\SvgRelationSchema;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Plugins\SchemaPlugin;
+use PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema;
+use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties;
 
 /**
  * Handles the schema export for the SVG format
diff --git a/libraries/plugins/schema/svg/RelationStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
similarity index 94%
rename from libraries/plugins/schema/svg/RelationStatsSvg.php
rename to libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
index b3ee1e3610..b0f44d4ec3 100644
--- a/libraries/plugins/schema/svg/RelationStatsSvg.php
+++ b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains PMA\libraries\plugins\schema\svg\RelationStatsSvg class
+ * Contains PhpMyAdmin\Plugins\Schema\Svg\RelationStatsSvg class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\svg;
+namespace PhpMyAdmin\Plugins\Schema\Svg;
 
-use PMA\libraries\plugins\schema\RelationStats;
+use PhpMyAdmin\Plugins\Schema\RelationStats;
 
 /**
  * Relation preferences/statistics
@@ -24,7 +24,7 @@ use PMA\libraries\plugins\schema\RelationStats;
 class RelationStatsSvg extends RelationStats
 {
     /**
-     * The "PMA\libraries\plugins\schema\svg\RelationStatsSvg" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Svg\RelationStatsSvg" constructor
      *
      * @param object $diagram       The SVG diagram
      * @param string $master_table  The master table name
diff --git a/libraries/plugins/schema/svg/Svg.php b/libraries/classes/Plugins/Schema/Svg/Svg.php
similarity index 98%
rename from libraries/plugins/schema/svg/Svg.php
rename to libraries/classes/Plugins/Schema/Svg/Svg.php
index 5c8a6ae45f..624bf10632 100644
--- a/libraries/plugins/schema/svg/Svg.php
+++ b/libraries/classes/Plugins/Schema/Svg/Svg.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\svg;
+namespace PhpMyAdmin\Plugins\Schema\Svg;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Response;
@@ -27,7 +27,7 @@ class Svg extends XMLWriter
     public $fontSize;
 
     /**
-     * The "PMA\libraries\plugins\schema\svg\Svg" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Svg\Svg" constructor
      *
      * Upon instantiation This starts writing the RelationStatsSvg XML document
      *
diff --git a/libraries/plugins/schema/svg/SvgRelationSchema.php b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
similarity index 91%
rename from libraries/plugins/schema/svg/SvgRelationSchema.php
rename to libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
index fa81b29df5..1aeca84a50 100644
--- a/libraries/plugins/schema/svg/SvgRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
@@ -1,19 +1,19 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains PMA\libraries\plugins\schema\svg\RelationStatsSvg class
+ * Contains PhpMyAdmin\Plugins\Schema\Svg\RelationStatsSvg class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\svg;
+namespace PhpMyAdmin\Plugins\Schema\Svg;
 
-use PMA\libraries\plugins\schema\dia\RelationStatsDia;
-use PMA\libraries\plugins\schema\eps\TableStatsEps;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\pdf\TableStatsPdf;
-use PMA\libraries\plugins\schema\svg\Svg;
-use PMA\libraries\plugins\schema\svg\TableStatsSvg;
-use PMA\libraries\plugins\schema\dia\TableStatsDia;
+use PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia;
+use PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps;
+use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
+use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf;
+use PhpMyAdmin\Plugins\Schema\Svg\Svg;
+use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg;
+use PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia;
 
 /**
  * RelationStatsSvg Relation Schema Class
@@ -33,7 +33,7 @@ use PMA\libraries\plugins\schema\dia\TableStatsDia;
 class SvgRelationSchema extends ExportRelationSchema
 {
     /**
-     * @var \PMA\libraries\plugins\schema\dia\TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[]
+     * @var \PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[]
      */
     private $_tables = array();
     /** @var RelationStatsDia[] Relations */
@@ -45,7 +45,7 @@ class SvgRelationSchema extends ExportRelationSchema
     private $_tablewidth;
 
     /**
-     * The "PMA\libraries\plugins\schema\svg\SvgRelationSchema" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema" constructor
      *
      * Upon instantiation This starts writing the SVG XML document
      * user will be prompted for download as .svg extension
@@ -199,7 +199,7 @@ class SvgRelationSchema extends ExportRelationSchema
      * @return void
      *
      * @see _setMinMax,Table_Stats_Svg::__construct(),
-     *       PMA\libraries\plugins\schema\svg\RelationStatsSvg::__construct()
+     *       PhpMyAdmin\Plugins\Schema\Svg\RelationStatsSvg::__construct()
      */
     private function _addRelation(
         $masterTable,
diff --git a/libraries/plugins/schema/svg/TableStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php
similarity index 93%
rename from libraries/plugins/schema/svg/TableStatsSvg.php
rename to libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php
index 2684f6930a..29cbc9a9fa 100644
--- a/libraries/plugins/schema/svg/TableStatsSvg.php
+++ b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php
@@ -1,15 +1,15 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains PMA\libraries\plugins\schema\svg\TableStatsSvg class
+ * Contains PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema\svg;
+namespace PhpMyAdmin\Plugins\Schema\Svg;
 
 use PhpMyAdmin\Font;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\TableStats;
+use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
+use PhpMyAdmin\Plugins\Schema\TableStats;
 
 /**
  * Table preferences/statistics
@@ -30,7 +30,7 @@ class TableStatsSvg extends TableStats
     public $currentCell = 0;
 
     /**
-     * The "PMA\libraries\plugins\schema\svg\TableStatsSvg" constructor
+     * The "PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg" constructor
      *
      * @param object  $diagram          The current SVG image document
      * @param string  $db               The database name
@@ -45,7 +45,7 @@ class TableStatsSvg extends TableStats
      *
      *
      * @see PMA_SVG, Table_Stats_Svg::Table_Stats_setWidth,
-     *       PMA\libraries\plugins\schema\svg\TableStatsSvg::Table_Stats_setHeight
+     *       PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg::Table_Stats_setHeight
      */
     public function __construct(
         $diagram,
diff --git a/libraries/plugins/schema/TableStats.php b/libraries/classes/Plugins/Schema/TableStats.php
similarity index 99%
rename from libraries/plugins/schema/TableStats.php
rename to libraries/classes/Plugins/Schema/TableStats.php
index 2afefee5a0..50f21a7653 100644
--- a/libraries/plugins/schema/TableStats.php
+++ b/libraries/classes/Plugins/Schema/TableStats.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins\schema;
+namespace PhpMyAdmin\Plugins\Schema;
 
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Index;
diff --git a/libraries/plugins/SchemaPlugin.php b/libraries/classes/Plugins/SchemaPlugin.php
similarity index 82%
rename from libraries/plugins/SchemaPlugin.php
rename to libraries/classes/Plugins/SchemaPlugin.php
index f7696c2e6f..7be1959e01 100644
--- a/libraries/plugins/SchemaPlugin.php
+++ b/libraries/classes/Plugins/SchemaPlugin.php
@@ -6,11 +6,11 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA\libraries\plugins;
+namespace PhpMyAdmin\Plugins;
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties;
 
 /**
  * Provides a common interface that will have to be implemented by all of the
@@ -23,7 +23,7 @@ use PMA\libraries\properties\plugins\SchemaPluginProperties;
 abstract class SchemaPlugin
 {
     /**
-     * PMA\libraries\properties\plugins\SchemaPluginProperties object containing
+     * PhpMyAdmin\Properties\Plugins\SchemaPluginProperties object containing
      * the specific schema export plugin type properties
      *
      * @var SchemaPluginProperties
@@ -60,7 +60,7 @@ abstract class SchemaPlugin
     /**
      * Adds export options common to all plugins.
      *
-     * @param \PMA\libraries\properties\options\groups\OptionsPropertyMainGroup $propertyGroup property group
+     * @param \PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup $propertyGroup property group
      *
      * @return void
      */
diff --git a/libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php
similarity index 94%
rename from libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php
index 0272ec4d7d..76f3589ebf 100644
--- a/libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Bool2Text
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 /**
  * Provides common methods for all of the Bool2Text transformations plugins.
diff --git a/libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php b/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php
similarity index 95%
rename from libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php
index 54ab6ed9a9..4c8b6707d8 100644
--- a/libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin-Transformations
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\IOTransformationsPlugin;
+use PhpMyAdmin\Plugins\IOTransformationsPlugin;
 
 /**
  * Provides common methods for all the CodeMirror syntax highlighted editors
diff --git a/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php
similarity index 98%
rename from libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php
index b692a2c540..0a284bdef3 100644
--- a/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage DateFormat
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\Util;
 
diff --git a/libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php
similarity index 96%
rename from libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php
index 5152574964..5b46f07697 100644
--- a/libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Download
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 /**
  * Provides common methods for all of the download transformations plugins.
diff --git a/libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php
similarity index 96%
rename from libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php
index ae618ce013..f0c06756a1 100644
--- a/libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage External
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 /**
  * Provides common methods for all of the external transformations plugins.
@@ -29,7 +29,7 @@ abstract class ExternalTransformationsPlugin extends TransformationsPlugin
             . ' data via standard input. Returns the standard output of the'
             . ' application. The default is Tidy, to pretty-print HTML code.'
             . ' For security reasons, you have to manually edit the file'
-            . ' libraries/plugins/transformations/output/Text_Plain_External'
+            . ' libraries/classes/Plugins/Transformations/Output/Text_Plain_External'
             . '.php and list the tools you want to make available.'
             . ' The first option is then the number of the program you want to'
             . ' use and the second option is the parameters for the program.'
diff --git a/libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php
similarity index 93%
rename from libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php
index d71842af36..d502dc6716 100644
--- a/libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Formatted
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 /**
  * Provides common methods for all of the formatted transformations plugins.
diff --git a/libraries/plugins/transformations/abs/HexTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php
similarity index 94%
rename from libraries/plugins/transformations/abs/HexTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php
index f2bab93fa3..8216d99554 100644
--- a/libraries/plugins/transformations/abs/HexTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Hex
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 /**
  * Provides common methods for all of the hex transformations plugins.
diff --git a/libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php
similarity index 94%
rename from libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php
index a60369c941..385a9d34eb 100644
--- a/libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Link
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 if (!defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php
similarity index 97%
rename from libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php
index 446381616f..07680019f7 100644
--- a/libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage ImageUpload
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\IOTransformationsPlugin;
+use PhpMyAdmin\Plugins\IOTransformationsPlugin;
 
 /**
  * Provides common methods for all of the image upload transformations plugins.
diff --git a/libraries/plugins/transformations/abs/InlineTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php
similarity index 95%
rename from libraries/plugins/transformations/abs/InlineTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php
index 4263501bb8..8d40ff651a 100644
--- a/libraries/plugins/transformations/abs/InlineTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Inline
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 if (!defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php
similarity index 93%
rename from libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php
index 234a4925b3..bed8daf4ae 100644
--- a/libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage LongToIPv4
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 /**
  * Provides common methods for all of the long to IPv4 transformations plugins.
diff --git a/libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php
similarity index 94%
rename from libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php
index 7247ce13b9..39a8a97146 100644
--- a/libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage PreApPend
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 /**
  * Provides common methods for all of the prepend/append transformations plugins.
diff --git a/libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php
similarity index 94%
rename from libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php
index caf540395c..2f08628add 100644
--- a/libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage RegexValidation
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\IOTransformationsPlugin;
+use PhpMyAdmin\Plugins\IOTransformationsPlugin;
 
 /**
  * Provides common methods for all of the regex validation
diff --git a/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php
similarity index 92%
rename from libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php
index db92704be0..ba48d5ac59 100644
--- a/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage SQL
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 use PhpMyAdmin\Util;
 
 /**
diff --git a/libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php
similarity index 95%
rename from libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php
index 57979d1cf2..90d06b6a3a 100644
--- a/libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Substring
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 /**
  * Provides common methods for all of the substring transformations plugins.
diff --git a/libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php
similarity index 96%
rename from libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php
index 41142437d0..a9bf8e7706 100644
--- a/libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage TextFileUpload
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\IOTransformationsPlugin;
+use PhpMyAdmin\Plugins\IOTransformationsPlugin;
 
 /**
  * Provides common methods for all of the text file upload
diff --git a/libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php
similarity index 95%
rename from libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php
index 5d9a143644..908e5a417d 100644
--- a/libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage ImageLink
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 use PhpMyAdmin\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
diff --git a/libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php
similarity index 95%
rename from libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
rename to libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php
index 0cd5d02081..caeef5d7fa 100644
--- a/libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Link
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 use PhpMyAdmin\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
diff --git a/libraries/plugins/transformations/input/Image_JPEG_Upload.php b/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php
similarity index 85%
rename from libraries/plugins/transformations/input/Image_JPEG_Upload.php
rename to libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php
index efbceb1107..2478658ec2 100644
--- a/libraries/plugins/transformations/input/Image_JPEG_Upload.php
+++ b/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage ImageUpload
  */
-namespace PMA\libraries\plugins\transformations\input;
+namespace PhpMyAdmin\Plugins\Transformations\Input;
 
-use PMA\libraries\plugins\transformations\abs\ImageUploadTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\ImageUploadTransformationsPlugin;
 
 /**
  * Handles the image upload input transformation for JPEG.
diff --git a/libraries/plugins/transformations/input/Text_Plain_FileUpload.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php
similarity index 84%
rename from libraries/plugins/transformations/input/Text_Plain_FileUpload.php
rename to libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php
index 42cc7a569c..c75d4ee6b4 100644
--- a/libraries/plugins/transformations/input/Text_Plain_FileUpload.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage TextFileUpload
  */
-namespace PMA\libraries\plugins\transformations\input;
+namespace PhpMyAdmin\Plugins\Transformations\Input;
 
-use PMA\libraries\plugins\transformations\abs\TextFileUploadTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\TextFileUploadTransformationsPlugin;
 
 /**
  * Handles the input text file upload transformation for text plain.
diff --git a/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php
similarity index 97%
rename from libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
rename to libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php
index a726127b80..5afb12f689 100644
--- a/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage IPToBinary
  */
-namespace PMA\libraries\plugins\transformations\input;
+namespace PhpMyAdmin\Plugins\Transformations\Input;
 
-use PMA\libraries\plugins\IOTransformationsPlugin;
+use PhpMyAdmin\Plugins\IOTransformationsPlugin;
 
 /**
  * Handles the IPv4/IPv6 to binary transformation for text plain
diff --git a/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php
similarity index 92%
rename from libraries/plugins/transformations/input/Text_Plain_JsonEditor.php
rename to libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php
index 35f7f664fd..75ae8a5ef9 100644
--- a/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage JSON
  */
-namespace PMA\libraries\plugins\transformations\input;
+namespace PhpMyAdmin\Plugins\Transformations\Input;
 
-use PMA\libraries\plugins\transformations\abs\CodeMirrorEditorTransformationPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\CodeMirrorEditorTransformationPlugin;
 
 /**
  * JSON editing with syntax highlighted CodeMirror editor
diff --git a/libraries/plugins/transformations/input/Text_Plain_RegexValidation.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php
similarity index 85%
rename from libraries/plugins/transformations/input/Text_Plain_RegexValidation.php
rename to libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php
index 1e7d8d07e8..6bd677f34f 100644
--- a/libraries/plugins/transformations/input/Text_Plain_RegexValidation.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage RegexValidation
  */
-namespace PMA\libraries\plugins\transformations\input;
+namespace PhpMyAdmin\Plugins\Transformations\Input;
 
-use PMA\libraries\plugins\transformations\abs\RegexValidationTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\RegexValidationTransformationsPlugin;
 
 /**
  * Handles the input regex validation transformation for text plain.
diff --git a/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php
similarity index 92%
rename from libraries/plugins/transformations/input/Text_Plain_SqlEditor.php
rename to libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php
index a5424a0e7b..719ffacdbd 100644
--- a/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage SQL
  */
-namespace PMA\libraries\plugins\transformations\input;
+namespace PhpMyAdmin\Plugins\Transformations\Input;
 
-use PMA\libraries\plugins\transformations\abs\CodeMirrorEditorTransformationPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\CodeMirrorEditorTransformationPlugin;
 
 /**
  * SQL editing with syntax highlighted CodeMirror editor
diff --git a/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php
similarity index 92%
rename from libraries/plugins/transformations/input/Text_Plain_XmlEditor.php
rename to libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php
index 437c948da5..7dd2b0df71 100644
--- a/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage XML
  */
-namespace PMA\libraries\plugins\transformations\input;
+namespace PhpMyAdmin\Plugins\Transformations\Input;
 
-use PMA\libraries\plugins\transformations\abs\CodeMirrorEditorTransformationPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\CodeMirrorEditorTransformationPlugin;
 
 /**
  * XML (and HTML) editing with syntax highlighted CodeMirror editor
diff --git a/libraries/plugins/transformations/output/Application_Octetstream_Download.php b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php
similarity index 85%
rename from libraries/plugins/transformations/output/Application_Octetstream_Download.php
rename to libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php
index be474c8bdc..2255c8bb1f 100644
--- a/libraries/plugins/transformations/output/Application_Octetstream_Download.php
+++ b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Download
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\DownloadTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\DownloadTransformationsPlugin;
 
 /**
  * Handles the download transformation for application octetstream
diff --git a/libraries/plugins/transformations/output/Application_Octetstream_Hex.php b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php
similarity index 85%
rename from libraries/plugins/transformations/output/Application_Octetstream_Hex.php
rename to libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php
index 6d33f1f551..989e7a9836 100644
--- a/libraries/plugins/transformations/output/Application_Octetstream_Hex.php
+++ b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Hex
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\HexTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\HexTransformationsPlugin;
 
 /**
  * Handles the hex transformation for application octetstream
diff --git a/libraries/plugins/transformations/output/Image_JPEG_Inline.php b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php
similarity index 84%
rename from libraries/plugins/transformations/output/Image_JPEG_Inline.php
rename to libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php
index 5b49d896e5..6c86fe9d45 100644
--- a/libraries/plugins/transformations/output/Image_JPEG_Inline.php
+++ b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Inline
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\InlineTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\InlineTransformationsPlugin;
 
 /**
  * Handles the inline transformation for image jpeg
diff --git a/libraries/plugins/transformations/output/Image_JPEG_Link.php b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php
similarity index 84%
rename from libraries/plugins/transformations/output/Image_JPEG_Link.php
rename to libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php
index 976f0b82d1..39673c8a7f 100644
--- a/libraries/plugins/transformations/output/Image_JPEG_Link.php
+++ b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Link
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\ImageLinkTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\ImageLinkTransformationsPlugin;
 
 /**
  * Handles the link transformation for image jpeg
diff --git a/libraries/plugins/transformations/output/Image_PNG_Inline.php b/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php
similarity index 84%
rename from libraries/plugins/transformations/output/Image_PNG_Inline.php
rename to libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php
index 988f44a757..2e9e4c77f2 100644
--- a/libraries/plugins/transformations/output/Image_PNG_Inline.php
+++ b/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Inline
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\InlineTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\InlineTransformationsPlugin;
 
 /**
  * Handles the inline transformation for image png
diff --git a/libraries/plugins/transformations/output/Text_Octetstream_Sql.php b/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php
similarity index 84%
rename from libraries/plugins/transformations/output/Text_Octetstream_Sql.php
rename to libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php
index 75d3da9cc5..b593351ed5 100644
--- a/libraries/plugins/transformations/output/Text_Octetstream_Sql.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage SQL
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\SQLTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\SQLTransformationsPlugin;
 
 /**
  * Handles the sql transformation for blob data
diff --git a/libraries/plugins/transformations/output/Text_Plain_Binarytoip.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php
similarity index 95%
rename from libraries/plugins/transformations/output/Text_Plain_Binarytoip.php
rename to libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php
index a8409605f2..57c482f49a 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Binarytoip.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage BinaryToIP
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 
 /**
  * Handles the binary to IPv4/IPv6 transformation for text plain
diff --git a/libraries/plugins/transformations/output/Text_Plain_Bool2Text.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php
similarity index 85%
rename from libraries/plugins/transformations/output/Text_Plain_Bool2Text.php
rename to libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php
index c3780a4ce8..47e1b285e3 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Bool2Text.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Bool2Text
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\Bool2TextTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\Bool2TextTransformationsPlugin;
 
 /**
  * Handles the Boolean to Text transformation for text plain.
diff --git a/libraries/plugins/transformations/output/Text_Plain_Dateformat.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php
similarity index 84%
rename from libraries/plugins/transformations/output/Text_Plain_Dateformat.php
rename to libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php
index 703b5a172e..84dba2b1e7 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Dateformat.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage DateFormat
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\DateFormatTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\DateFormatTransformationsPlugin;
 
 /**
  * Handles the date format transformation for text plain
diff --git a/libraries/plugins/transformations/output/Text_Plain_External.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php
similarity index 84%
rename from libraries/plugins/transformations/output/Text_Plain_External.php
rename to libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php
index 0ca7855dac..5d18e44bfd 100644
--- a/libraries/plugins/transformations/output/Text_Plain_External.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage External
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\ExternalTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\ExternalTransformationsPlugin;
 
 /**
  * Handles the external transformation for text plain
diff --git a/libraries/plugins/transformations/output/Text_Plain_Formatted.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php
similarity index 84%
rename from libraries/plugins/transformations/output/Text_Plain_Formatted.php
rename to libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php
index 53dc7e62fb..82fa7ed863 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Formatted.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Formatted
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\FormattedTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\FormattedTransformationsPlugin;
 
 /**
  * Handles the formatted transformation for text plain
diff --git a/libraries/plugins/transformations/output/Text_Plain_Imagelink.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php
similarity index 84%
rename from libraries/plugins/transformations/output/Text_Plain_Imagelink.php
rename to libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php
index 24b73bcab0..2659dffa78 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Imagelink.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage ImageLink
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\transformations\abs\TextImageLinkTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\TextImageLinkTransformationsPlugin;
 
 /**
  * Handles the image link transformation for text plain
diff --git a/libraries/plugins/transformations/output/Text_Plain_Json.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php
similarity index 95%
rename from libraries/plugins/transformations/output/Text_Plain_Json.php
rename to libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php
index f464e0e4a0..837031b33e 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Json.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage SQL
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 use PhpMyAdmin\Response;
 
 /**
diff --git a/libraries/plugins/transformations/output/Text_Plain_Sql.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php
similarity index 90%
rename from libraries/plugins/transformations/output/Text_Plain_Sql.php
rename to libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php
index 130da2dc8f..8c76feea76 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Sql.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php
@@ -6,10 +6,10 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage SQL
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
 use PhpMyAdmin\Response;
-use PMA\libraries\plugins\transformations\abs\SQLTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\SQLTransformationsPlugin;
 
 /**
  * Handles the sql transformation for text plain
diff --git a/libraries/plugins/transformations/output/Text_Plain_Xml.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php
similarity index 95%
rename from libraries/plugins/transformations/output/Text_Plain_Xml.php
rename to libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php
index 52a11fef51..44aaf8e636 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Xml.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage SQL
  */
-namespace PMA\libraries\plugins\transformations\output;
+namespace PhpMyAdmin\Plugins\Transformations\Output;
 
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 use PhpMyAdmin\Response;
 
 /**
diff --git a/libraries/plugins/transformations/README b/libraries/classes/Plugins/Transformations/README
similarity index 100%
rename from libraries/plugins/transformations/README
rename to libraries/classes/Plugins/Transformations/README
diff --git a/libraries/plugins/transformations/TEMPLATE b/libraries/classes/Plugins/Transformations/TEMPLATE
similarity index 86%
rename from libraries/plugins/transformations/TEMPLATE
rename to libraries/classes/Plugins/Transformations/TEMPLATE
index 12f09443f3..0f9c48d31b 100644
--- a/libraries/plugins/transformations/TEMPLATE
+++ b/libraries/classes/Plugins/Transformations/TEMPLATE
@@ -8,9 +8,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage [TransformationName]
  */
-namespace PMA\libraries\plugins\transformations;
+namespace PhpMyAdmin\Plugins\Transformations;
 
-use PMA\libraries\plugins\transformations\abs\[TransformationName]TransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\[TransformationName]TransformationsPlugin;
 
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/plugins/transformations/TEMPLATE_ABSTRACT b/libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT
similarity index 94%
rename from libraries/plugins/transformations/TEMPLATE_ABSTRACT
rename to libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT
index 905f937788..54ef4901e3 100644
--- a/libraries/plugins/transformations/TEMPLATE_ABSTRACT
+++ b/libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT
@@ -8,9 +8,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage [TransformationName]
  */
-namespace PMA\libraries\plugins\transformations\abs;
+namespace PhpMyAdmin\Plugins\Transformations\Abs;
 
-use PMA\libraries\plugins\IOTransformationsPlugin;
+use PhpMyAdmin\Plugins\IOTransformationsPlugin;
 
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/plugins/transformations/Text_Plain_Link.php b/libraries/classes/Plugins/Transformations/Text_Plain_Link.php
similarity index 85%
rename from libraries/plugins/transformations/Text_Plain_Link.php
rename to libraries/classes/Plugins/Transformations/Text_Plain_Link.php
index 11c79cf49f..90c4bd3b64 100644
--- a/libraries/plugins/transformations/Text_Plain_Link.php
+++ b/libraries/classes/Plugins/Transformations/Text_Plain_Link.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Link
  */
-namespace PMA\libraries\plugins\transformations;
+namespace PhpMyAdmin\Plugins\Transformations;
 
-use PMA\libraries\plugins\transformations\abs\TextLinkTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\TextLinkTransformationsPlugin;
 
 /**
  * Handles the link transformation for text plain
diff --git a/libraries/plugins/transformations/Text_Plain_Longtoipv4.php b/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php
similarity index 85%
rename from libraries/plugins/transformations/Text_Plain_Longtoipv4.php
rename to libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php
index e2029d2d24..35b57b5b9e 100644
--- a/libraries/plugins/transformations/Text_Plain_Longtoipv4.php
+++ b/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage LongToIPv4
  */
-namespace PMA\libraries\plugins\transformations;
+namespace PhpMyAdmin\Plugins\Transformations;
 
-use PMA\libraries\plugins\transformations\abs\LongToIPv4TransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\LongToIPv4TransformationsPlugin;
 
 /**
  * Handles the long to ipv4 transformation for text plain
diff --git a/libraries/plugins/transformations/Text_Plain_PreApPend.php b/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php
similarity index 86%
rename from libraries/plugins/transformations/Text_Plain_PreApPend.php
rename to libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php
index 57818d98a3..60b3d55e18 100644
--- a/libraries/plugins/transformations/Text_Plain_PreApPend.php
+++ b/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage PreApPend
  */
-namespace PMA\libraries\plugins\transformations;
+namespace PhpMyAdmin\Plugins\Transformations;
 
-use PMA\libraries\plugins\transformations\abs\PreApPendTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\PreApPendTransformationsPlugin;
 
 /**
  * Handles the prepend and/or append transformation for text plain.
diff --git a/libraries/plugins/transformations/Text_Plain_Substring.php b/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php
similarity index 85%
rename from libraries/plugins/transformations/Text_Plain_Substring.php
rename to libraries/classes/Plugins/Transformations/Text_Plain_Substring.php
index 9c220ac01e..6202643894 100644
--- a/libraries/plugins/transformations/Text_Plain_Substring.php
+++ b/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php
@@ -6,9 +6,9 @@
  * @package    PhpMyAdmin-Transformations
  * @subpackage Substring
  */
-namespace PMA\libraries\plugins\transformations;
+namespace PhpMyAdmin\Plugins\Transformations;
 
-use PMA\libraries\plugins\transformations\abs\SubstringTransformationsPlugin;
+use PhpMyAdmin\Plugins\Transformations\Abs\SubstringTransformationsPlugin;
 
 /**
  * Handles the substring transformation for text plain
diff --git a/libraries/plugins/TransformationsInterface.php b/libraries/classes/Plugins/TransformationsInterface.php
similarity index 96%
rename from libraries/plugins/TransformationsInterface.php
rename to libraries/classes/Plugins/TransformationsInterface.php
index 97332db9e8..8d048014b9 100644
--- a/libraries/plugins/TransformationsInterface.php
+++ b/libraries/classes/Plugins/TransformationsInterface.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins;
+namespace PhpMyAdmin\Plugins;
 
 /**
  * Provides a common interface that will have to be implemented by all of the
diff --git a/libraries/plugins/TransformationsPlugin.php b/libraries/classes/Plugins/TransformationsPlugin.php
similarity index 98%
rename from libraries/plugins/TransformationsPlugin.php
rename to libraries/classes/Plugins/TransformationsPlugin.php
index c672b173f4..da4fab66be 100644
--- a/libraries/plugins/TransformationsPlugin.php
+++ b/libraries/classes/Plugins/TransformationsPlugin.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins;
+namespace PhpMyAdmin\Plugins;
 
 /**
  * Provides a common interface that will have to
diff --git a/libraries/plugins/UploadInterface.php b/libraries/classes/Plugins/UploadInterface.php
similarity index 94%
rename from libraries/plugins/UploadInterface.php
rename to libraries/classes/Plugins/UploadInterface.php
index 061812e686..28bf9d0aef 100644
--- a/libraries/plugins/UploadInterface.php
+++ b/libraries/classes/Plugins/UploadInterface.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\plugins;
+namespace PhpMyAdmin\Plugins;
 
 /**
  * Provides a common interface that will have to implemented by all of the
diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php
new file mode 100644
index 0000000000..d976da5aa0
--- /dev/null
+++ b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php
@@ -0,0 +1,33 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup class
+ *
+ * @package PhpMyAdmin
+ */
+namespace PhpMyAdmin\Properties\Options\Groups;
+
+use PhpMyAdmin\Properties\Options\OptionsPropertyGroup;
+
+/**
+ * Group property item class of type main
+ *
+ * @package PhpMyAdmin
+ */
+class OptionsPropertyMainGroup extends OptionsPropertyGroup
+{
+    /**
+     * Returns the property item type of either an instance of
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
+     *  "text", "radio", etc ) or
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
+     *  or "subgroup" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *
+     * @return string
+     */
+    public function getItemType()
+    {
+        return "main";
+    }
+}
diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php
new file mode 100644
index 0000000000..87a5fb4a8e
--- /dev/null
+++ b/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php
@@ -0,0 +1,33 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup class
+ *
+ * @package PhpMyAdmin
+ */
+namespace PhpMyAdmin\Properties\Options\Groups;
+
+use PhpMyAdmin\Properties\Options\OptionsPropertyGroup;
+
+/**
+ * Group property item class of type root
+ *
+ * @package PhpMyAdmin
+ */
+class OptionsPropertyRootGroup extends OptionsPropertyGroup
+{
+    /**
+     * Returns the property item type of either an instance of
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
+     *  "text", "radio", etc ) or
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
+     *  or "subgroup" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *
+     * @return string
+     */
+    public function getItemType()
+    {
+        return "root";
+    }
+}
diff --git a/libraries/properties/options/groups/OptionsPropertySubgroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php
similarity index 61%
rename from libraries/properties/options/groups/OptionsPropertySubgroup.php
rename to libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php
index e7571aa8de..2532da9d8d 100644
--- a/libraries/properties/options/groups/OptionsPropertySubgroup.php
+++ b/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\properties\options\groups\OptionsPropertySubgroup class
+ * Holds the PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\options\groups;
+namespace PhpMyAdmin\Properties\Options\Groups;
 
-use PMA\libraries\properties\options\OptionsPropertyGroup;
+use PhpMyAdmin\Properties\Options\OptionsPropertyGroup;
 
 /**
  * Group property item class of type subgroup
@@ -26,11 +26,11 @@ class OptionsPropertySubgroup extends OptionsPropertyGroup
 
     /**
      * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
      *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
      *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
      *
      * @return string
      */
@@ -42,7 +42,7 @@ class OptionsPropertySubgroup extends OptionsPropertyGroup
     /**
      * Gets the subgroup header
      *
-     * @return \PMA\libraries\properties\PropertyItem
+     * @return \PhpMyAdmin\Properties\PropertyItem
      */
     public function getSubgroupHeader()
     {
@@ -52,7 +52,7 @@ class OptionsPropertySubgroup extends OptionsPropertyGroup
     /**
      * Sets the subgroup header
      *
-     * @param \PMA\libraries\properties\PropertyItem $subgroupHeader subgroup header
+     * @param \PhpMyAdmin\Properties\PropertyItem $subgroupHeader subgroup header
      *
      * @return void
      */
diff --git a/libraries/classes/Properties/Options/Items/BoolPropertyItem.php b/libraries/classes/Properties/Options/Items/BoolPropertyItem.php
new file mode 100644
index 0000000000..2a45cf0b8a
--- /dev/null
+++ b/libraries/classes/Properties/Options/Items/BoolPropertyItem.php
@@ -0,0 +1,33 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the PhpMyAdmin\Properties\Options\Items\BoolPropertyItem class
+ *
+ * @package PhpMyAdmin
+ */
+namespace PhpMyAdmin\Properties\Options\Items;
+
+use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem;
+
+/**
+ * Single property item class of type bool
+ *
+ * @package PhpMyAdmin
+ */
+class BoolPropertyItem extends OptionsPropertyOneItem
+{
+    /**
+     * Returns the property item type of either an instance of
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
+     *  "text", "radio", etc ) or
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
+     *  or "subgroup" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *
+     * @return string
+     */
+    public function getItemType()
+    {
+        return "bool";
+    }
+}
diff --git a/libraries/classes/Properties/Options/Items/DocPropertyItem.php b/libraries/classes/Properties/Options/Items/DocPropertyItem.php
new file mode 100644
index 0000000000..bfda142ef9
--- /dev/null
+++ b/libraries/classes/Properties/Options/Items/DocPropertyItem.php
@@ -0,0 +1,33 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the PhpMyAdmin\Properties\Options\Items\DocPropertyItem class
+ *
+ * @package PhpMyAdmin
+ */
+namespace PhpMyAdmin\Properties\Options\Items;
+
+use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem;
+
+/**
+ * Single property item class of type doc
+ *
+ * @package PhpMyAdmin
+ */
+class DocPropertyItem extends OptionsPropertyOneItem
+{
+    /**
+     * Returns the property item type of either an instance of
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
+     *  "text", "radio", etc ) or
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
+     *  or "subgroup" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *
+     * @return string
+     */
+    public function getItemType()
+    {
+        return "doc";
+    }
+}
diff --git a/libraries/properties/options/items/HiddenPropertyItem.php b/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php
similarity index 50%
rename from libraries/properties/options/items/HiddenPropertyItem.php
rename to libraries/classes/Properties/Options/Items/HiddenPropertyItem.php
index 7a8ac777ec..46389ce42a 100644
--- a/libraries/properties/options/items/HiddenPropertyItem.php
+++ b/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\properties\options\items\HiddenPropertyItem class
+ * Holds the PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\options\items;
+namespace PhpMyAdmin\Properties\Options\Items;
 
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
+use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem;
 
 /**
  * Single property item class of type hidden
@@ -18,11 +18,11 @@ class HiddenPropertyItem extends OptionsPropertyOneItem
 {
     /**
      * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
      *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
      *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
      *
      * @return string
      */
diff --git a/libraries/properties/options/items/MessageOnlyPropertyItem.php b/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php
similarity index 50%
rename from libraries/properties/options/items/MessageOnlyPropertyItem.php
rename to libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php
index ada4a112a4..9ff762bb73 100644
--- a/libraries/properties/options/items/MessageOnlyPropertyItem.php
+++ b/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\properties\options\items\MessageOnlyPropertyItem class
+ * Holds the PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\options\items;
+namespace PhpMyAdmin\Properties\Options\Items;
 
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
+use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem;
 
 /**
  * Single property item class of type messageOnly
@@ -18,11 +18,11 @@ class MessageOnlyPropertyItem extends OptionsPropertyOneItem
 {
     /**
      * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
      *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
      *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
      *
      * @return string
      */
diff --git a/libraries/properties/options/items/NumberPropertyItem.php b/libraries/classes/Properties/Options/Items/NumberPropertyItem.php
similarity index 50%
rename from libraries/properties/options/items/NumberPropertyItem.php
rename to libraries/classes/Properties/Options/Items/NumberPropertyItem.php
index 0c11ca523f..e1892afe6d 100644
--- a/libraries/properties/options/items/NumberPropertyItem.php
+++ b/libraries/classes/Properties/Options/Items/NumberPropertyItem.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\properties\options\items\TextPropertyItem class
+ * Holds the PhpMyAdmin\Properties\Options\Items\TextPropertyItem class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\options\items;
+namespace PhpMyAdmin\Properties\Options\Items;
 
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
+use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem;
 
 /**
  * Single property item class of type number
@@ -18,11 +18,11 @@ class NumberPropertyItem extends OptionsPropertyOneItem
 {
     /**
      * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
      *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
      *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
      *
      * @return string
      */
diff --git a/libraries/classes/Properties/Options/Items/RadioPropertyItem.php b/libraries/classes/Properties/Options/Items/RadioPropertyItem.php
new file mode 100644
index 0000000000..6424a1c0be
--- /dev/null
+++ b/libraries/classes/Properties/Options/Items/RadioPropertyItem.php
@@ -0,0 +1,33 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the PhpMyAdmin\Properties\Options\Items\RadioPropertyItem class
+ *
+ * @package PhpMyAdmin
+ */
+namespace PhpMyAdmin\Properties\Options\Items;
+
+use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem;
+
+/**
+ * Single property item class of type radio
+ *
+ * @package PhpMyAdmin
+ */
+class RadioPropertyItem extends OptionsPropertyOneItem
+{
+    /**
+     * Returns the property item type of either an instance of
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
+     *  "text", "radio", etc ) or
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
+     *  or "subgroup" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *
+     * @return string
+     */
+    public function getItemType()
+    {
+        return "radio";
+    }
+}
diff --git a/libraries/properties/options/items/SelectPropertyItem.php b/libraries/classes/Properties/Options/Items/SelectPropertyItem.php
similarity index 50%
rename from libraries/properties/options/items/SelectPropertyItem.php
rename to libraries/classes/Properties/Options/Items/SelectPropertyItem.php
index e09ee3e9a3..4960cfaa95 100644
--- a/libraries/properties/options/items/SelectPropertyItem.php
+++ b/libraries/classes/Properties/Options/Items/SelectPropertyItem.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\properties\options\items\SelectPropertyItem class
+ * Holds the PhpMyAdmin\Properties\Options\Items\SelectPropertyItem class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\options\items;
+namespace PhpMyAdmin\Properties\Options\Items;
 
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
+use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem;
 
 /**
  * Single property item class of type select
@@ -18,11 +18,11 @@ class SelectPropertyItem extends OptionsPropertyOneItem
 {
     /**
      * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
      *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
      *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
      *
      * @return string
      */
diff --git a/libraries/classes/Properties/Options/Items/TextPropertyItem.php b/libraries/classes/Properties/Options/Items/TextPropertyItem.php
new file mode 100644
index 0000000000..9a07b22c3e
--- /dev/null
+++ b/libraries/classes/Properties/Options/Items/TextPropertyItem.php
@@ -0,0 +1,33 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the PhpMyAdmin\Properties\Options\Items\TextPropertyItem class
+ *
+ * @package PhpMyAdmin
+ */
+namespace PhpMyAdmin\Properties\Options\Items;
+
+use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem;
+
+/**
+ * Single property item class of type text
+ *
+ * @package PhpMyAdmin
+ */
+class TextPropertyItem extends OptionsPropertyOneItem
+{
+    /**
+     * Returns the property item type of either an instance of
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
+     *  "text", "radio", etc ) or
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
+     *  or "subgroup" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *
+     * @return string
+     */
+    public function getItemType()
+    {
+        return "text";
+    }
+}
diff --git a/libraries/properties/options/OptionsPropertyGroup.php b/libraries/classes/Properties/Options/OptionsPropertyGroup.php
similarity index 93%
rename from libraries/properties/options/OptionsPropertyGroup.php
rename to libraries/classes/Properties/Options/OptionsPropertyGroup.php
index d07d655efc..f75f3d538c 100644
--- a/libraries/properties/options/OptionsPropertyGroup.php
+++ b/libraries/classes/Properties/Options/OptionsPropertyGroup.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\options;
+namespace PhpMyAdmin\Properties\Options;
 
 /**
  * Parents group property items and provides methods to manage groups of
@@ -17,7 +17,7 @@ namespace PMA\libraries\properties\options;
 abstract class OptionsPropertyGroup extends OptionsPropertyItem
 {
     /**
-     * Holds a group of properties (PMA\libraries\properties\options\OptionsPropertyItem instances)
+     * Holds a group of properties (PhpMyAdmin\Properties\Options\OptionsPropertyItem instances)
      *
      * @var array
      */
diff --git a/libraries/properties/options/OptionsPropertyItem.php b/libraries/classes/Properties/Options/OptionsPropertyItem.php
similarity index 93%
rename from libraries/properties/options/OptionsPropertyItem.php
rename to libraries/classes/Properties/Options/OptionsPropertyItem.php
index 5841c83cc2..2e4d6ac0f6 100644
--- a/libraries/properties/options/OptionsPropertyItem.php
+++ b/libraries/classes/Properties/Options/OptionsPropertyItem.php
@@ -6,13 +6,13 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\options;
+namespace PhpMyAdmin\Properties\Options;
 
-use PMA\libraries\properties\PropertyItem;
+use PhpMyAdmin\Properties\PropertyItem;
 
 /**
  * Superclass for
- *  - PMA\libraries\properties\options\OptionsPropertyOneItem and
+ *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem and
  *  - OptionsProperty Group
  *
  * @package PhpMyAdmin
diff --git a/libraries/properties/options/OptionsPropertyOneItem.php b/libraries/classes/Properties/Options/OptionsPropertyOneItem.php
similarity index 98%
rename from libraries/properties/options/OptionsPropertyOneItem.php
rename to libraries/classes/Properties/Options/OptionsPropertyOneItem.php
index ef08c0ddce..9f93d52712 100644
--- a/libraries/properties/options/OptionsPropertyOneItem.php
+++ b/libraries/classes/Properties/Options/OptionsPropertyOneItem.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\options;
+namespace PhpMyAdmin\Properties\Options;
 
 /**
  * Parents only single property items (not groups).
diff --git a/libraries/properties/plugins/ExportPluginProperties.php b/libraries/classes/Properties/Plugins/ExportPluginProperties.php
similarity index 78%
rename from libraries/properties/plugins/ExportPluginProperties.php
rename to libraries/classes/Properties/Plugins/ExportPluginProperties.php
index 44914629b9..a5a19da926 100644
--- a/libraries/properties/plugins/ExportPluginProperties.php
+++ b/libraries/classes/Properties/Plugins/ExportPluginProperties.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\plugins;
+namespace PhpMyAdmin\Properties\Plugins;
 
 /**
  * Defines possible options and getters and setters for them.
@@ -25,11 +25,11 @@ class ExportPluginProperties extends PluginPropertyItem
 
     /**
      * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
      *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
      *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
      *
      * @return string
      */
diff --git a/libraries/properties/plugins/ImportPluginProperties.php b/libraries/classes/Properties/Plugins/ImportPluginProperties.php
similarity index 61%
rename from libraries/properties/plugins/ImportPluginProperties.php
rename to libraries/classes/Properties/Plugins/ImportPluginProperties.php
index afb82e1d79..bbcdd59eaa 100644
--- a/libraries/properties/plugins/ImportPluginProperties.php
+++ b/libraries/classes/Properties/Plugins/ImportPluginProperties.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\plugins;
+namespace PhpMyAdmin\Properties\Plugins;
 
 /**
  * Defines possible options and getters and setters for them.
@@ -16,11 +16,11 @@ class ImportPluginProperties extends PluginPropertyItem
 {
     /**
      * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
      *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
      *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
      *
      * @return string
      */
diff --git a/libraries/properties/plugins/PluginPropertyItem.php b/libraries/classes/Properties/Plugins/PluginPropertyItem.php
similarity index 90%
rename from libraries/properties/plugins/PluginPropertyItem.php
rename to libraries/classes/Properties/Plugins/PluginPropertyItem.php
index 0fc0cdc0fc..8b041d4454 100644
--- a/libraries/properties/plugins/PluginPropertyItem.php
+++ b/libraries/classes/Properties/Plugins/PluginPropertyItem.php
@@ -6,15 +6,15 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\plugins;
+namespace PhpMyAdmin\Properties\Plugins;
 
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\PropertyItem;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\PropertyItem;
 
 /**
  * Superclass for
- *  - PMA\libraries\properties\plugins\ExportPluginProperties,
- *  - PMA\libraries\properties\plugins\ImportPluginProperties and
+ *  - PhpMyAdmin\Properties\Plugins\ExportPluginProperties,
+ *  - PhpMyAdmin\Properties\Plugins\ImportPluginProperties and
  *  - TransformationsPluginProperties
  *
  * @package PhpMyAdmin
diff --git a/libraries/properties/plugins/SchemaPluginProperties.php b/libraries/classes/Properties/Plugins/SchemaPluginProperties.php
similarity index 73%
rename from libraries/properties/plugins/SchemaPluginProperties.php
rename to libraries/classes/Properties/Plugins/SchemaPluginProperties.php
index 7aba43c413..e3635337d7 100644
--- a/libraries/properties/plugins/SchemaPluginProperties.php
+++ b/libraries/classes/Properties/Plugins/SchemaPluginProperties.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties\plugins;
+namespace PhpMyAdmin\Properties\Plugins;
 
 /**
  * Defines possible options and getters and setters for them.
@@ -18,11 +18,11 @@ class SchemaPluginProperties extends PluginPropertyItem
 
     /**
      * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool",
      *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main"
      *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export",
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export",
      *  "import", "transformations" )
      *
      * @return string
diff --git a/libraries/properties/PropertyItem.php b/libraries/classes/Properties/PropertyItem.php
similarity index 61%
rename from libraries/properties/PropertyItem.php
rename to libraries/classes/Properties/PropertyItem.php
index 40f910cea9..a01b103fa7 100644
--- a/libraries/properties/PropertyItem.php
+++ b/libraries/classes/Properties/PropertyItem.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\properties;
+namespace PhpMyAdmin\Properties;
 
 /**
  * Provides an interface for Property classes
@@ -23,19 +23,19 @@ abstract class PropertyItem
 
     /**
      * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool", "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main" or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool", "text", "radio", etc ) or
+     *  - PhpMyAdmin\Properties\Options\OptionsPropertyGroup   ( "root", "main" or "subgroup" )
+     *  - PhpMyAdmin\Properties\Plugins\PluginPropertyItem     ( "export", "import", "transformations" )
      *
      * @return string
      */
     public abstract function getItemType();
 
     /**
-     * Only overwritten in the PMA\libraries\properties\options\OptionsPropertyGroup class:
+     * Only overwritten in the PhpMyAdmin\Properties\Options\OptionsPropertyGroup class:
      * Used to tell whether we can use the current item as a group by calling
      * the addProperty() or removeProperty() methods, which are not available
-     * for simple PMA\libraries\properties\options\OptionsPropertyOneItem subclasses.
+     * for simple PhpMyAdmin\Properties\Options\OptionsPropertyOneItem subclasses.
      *
      * @return string
      */
diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php
index 334479a977..c1e869df6a 100644
--- a/libraries/classes/Table.php
+++ b/libraries/classes/Table.php
@@ -10,7 +10,7 @@ namespace PhpMyAdmin;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\export\ExportSql;
+use PhpMyAdmin\Plugins\Export\ExportSql;
 use PhpMyAdmin\SqlParser\Components\Expression;
 use PhpMyAdmin\SqlParser\Components\OptionsArray;
 use PhpMyAdmin\SqlParser\Context;
@@ -913,12 +913,12 @@ class Table
             /**
              * Instance used for exporting the current structure of the table.
              *
-             * @var \PMA\libraries\plugins\export\ExportSql
+             * @var \PhpMyAdmin\Plugins\Export\ExportSql
              */
             $export_sql_plugin = PMA_getPlugin(
                 "export",
                 "sql",
-                'libraries/plugins/export/',
+                'libraries/classes/Plugins/Export/',
                 array(
                     'export_type' => 'table',
                     'single_table' => false,
diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php
index 5f9c64b6de..e1974b27f0 100644
--- a/libraries/classes/Template.php
+++ b/libraries/classes/Template.php
@@ -7,12 +7,12 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\twig\CharsetsExtension;
-use PMA\libraries\twig\I18nExtension;
-use PMA\libraries\twig\MessageExtension;
-use PMA\libraries\twig\SanitizeExtension;
-use PMA\libraries\twig\UrlExtension;
-use PMA\libraries\twig\UtilExtension;
+use PhpMyAdmin\Twig\CharsetsExtension;
+use PhpMyAdmin\Twig\I18nExtension;
+use PhpMyAdmin\Twig\MessageExtension;
+use PhpMyAdmin\Twig\SanitizeExtension;
+use PhpMyAdmin\Twig\UrlExtension;
+use PhpMyAdmin\Twig\UtilExtension;
 use Twig_Environment;
 use Twig_Loader_Filesystem;
 
diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php
index 2f08f15ab4..03d5f36fce 100644
--- a/libraries/classes/Tracker.php
+++ b/libraries/classes/Tracker.php
@@ -7,7 +7,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\plugins\export\ExportSql;
+use PhpMyAdmin\Plugins\Export\ExportSql;
 use PhpMyAdmin\SqlParser\Parser;
 use PhpMyAdmin\SqlParser\Statements\AlterStatement;
 use PhpMyAdmin\SqlParser\Statements\CreateStatement;
@@ -192,11 +192,11 @@ class Tracker
 
         // get Export SQL instance
         include_once "libraries/plugin_interface.lib.php";
-        /* @var $export_sql_plugin \PMA\libraries\plugins\export\ExportSql */
+        /* @var $export_sql_plugin \PhpMyAdmin\Plugins\Export\ExportSql */
         $export_sql_plugin = PMA_getPlugin(
             "export",
             "sql",
-            'libraries/plugins/export/',
+            'libraries/classes/Plugins/Export/',
             array(
                 'export_type' => $export_type,
                 'single_table' => false,
diff --git a/libraries/classes/Transformations.php b/libraries/classes/Transformations.php
index 5f33c646f4..dd7c58f3c2 100644
--- a/libraries/classes/Transformations.php
+++ b/libraries/classes/Transformations.php
@@ -100,13 +100,13 @@ class Transformations
 
         $stack = array();
         $sub_dirs = array(
-            'input/' => 'input_',
-            'output/' => '',
+            'Input/' => 'input_',
+            'Output/' => '',
             '' => ''
         );
 
         foreach ($sub_dirs as $sd => $prefix) {
-            $handle = opendir('libraries/plugins/transformations/' . $sd);
+            $handle = opendir('libraries/classes/Plugins/Transformations/' . $sd);
 
             if (! $handle) {
                 $stack[$prefix . 'transformation'] = array();
@@ -170,7 +170,7 @@ class Transformations
     {
         // get the transformation class name
         $class_name = explode(".php", $filename);
-        $class_name = 'PMA\\' . str_replace('/', '\\', $class_name[0]);
+        $class_name = 'PhpMyAdmin\\' . str_replace('/', '\\', mb_substr($class_name[0], 18));
 
         return $class_name;
     }
@@ -184,8 +184,8 @@ class Transformations
      */
     public static function getDescription($file)
     {
-        $include_file = 'libraries/plugins/transformations/' . $file;
-        /* @var $class_name PMA\libraries\plugins\TransformationsInterface */
+        $include_file = 'libraries/classes/Plugins/Transformations/' . $file;
+        /* @var $class_name PhpMyAdmin\Plugins\TransformationsInterface */
         $class_name = self::getClassName($include_file);
         // include and instantiate the class
         include_once $include_file;
@@ -201,8 +201,8 @@ class Transformations
      */
     public static function getName($file)
     {
-        $include_file = 'libraries/plugins/transformations/' . $file;
-        /* @var $class_name PMA\libraries\plugins\TransformationsInterface */
+        $include_file = 'libraries/classes/Plugins/Transformations/' . $file;
+        /* @var $class_name PhpMyAdmin\Plugins\TransformationsInterface */
         $class_name = self::getClassName($include_file);
         // include and instantiate the class
         include_once $include_file;
diff --git a/libraries/twig/CharsetsExtension.php b/libraries/classes/Twig/CharsetsExtension.php
similarity index 79%
rename from libraries/twig/CharsetsExtension.php
rename to libraries/classes/Twig/CharsetsExtension.php
index 49d1ca58b1..1f332772e0 100644
--- a/libraries/twig/CharsetsExtension.php
+++ b/libraries/classes/Twig/CharsetsExtension.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\libraries\twig\CharsetsExtension class
+ * hold PhpMyAdmin\Twig\CharsetsExtension class
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
-namespace PMA\libraries\twig;
+namespace PhpMyAdmin\Twig;
 
 use Twig_Extension;
 use Twig_SimpleFunction;
@@ -13,7 +13,7 @@ use Twig_SimpleFunction;
 /**
  * Class CharsetsExtension
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
 class CharsetsExtension extends Twig_Extension
 {
diff --git a/libraries/twig/i18n/NodeTrans.php b/libraries/classes/Twig/I18n/NodeTrans.php
similarity index 96%
rename from libraries/twig/i18n/NodeTrans.php
rename to libraries/classes/Twig/I18n/NodeTrans.php
index 6bc1269cbf..f2fbc53ccd 100644
--- a/libraries/twig/i18n/NodeTrans.php
+++ b/libraries/classes/Twig/I18n/NodeTrans.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\libraries\twig\i18n\NodeTrans class
+ * hold PhpMyAdmin\Twig\I18n\NodeTrans class
  *
- * @package PMA\libraries\twig\i18n
+ * @package PhpMyAdmin\Twig\I18n
  */
-namespace PMA\libraries\twig\i18n;
+namespace PhpMyAdmin\Twig\I18n;
 
 use Twig_Compiler;
 use Twig_Extensions_Node_Trans;
@@ -15,7 +15,7 @@ use Twig_Node_Expression;
 /**
  * Class NodeTrans
  *
- * @package PMA\libraries\twig\i18n
+ * @package PhpMyAdmin\Twig\I18n
  */
 class NodeTrans extends Twig_Extensions_Node_Trans
 {
diff --git a/libraries/twig/i18n/TokenParserTrans.php b/libraries/classes/Twig/I18n/TokenParserTrans.php
similarity index 93%
rename from libraries/twig/i18n/TokenParserTrans.php
rename to libraries/classes/Twig/I18n/TokenParserTrans.php
index 939e2097c6..5b8e934fcf 100644
--- a/libraries/twig/i18n/TokenParserTrans.php
+++ b/libraries/classes/Twig/I18n/TokenParserTrans.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\libraries\twig\i18n\TokenParserTrans class
+ * hold PhpMyAdmin\Twig\I18n\TokenParserTrans class
  *
- * @package PMA\libraries\twig\i18n
+ * @package PhpMyAdmin\Twig\I18n
  */
-namespace PMA\libraries\twig\i18n;
+namespace PhpMyAdmin\Twig\I18n;
 
 use Twig_Extensions_TokenParser_Trans;
 use Twig_Token;
@@ -13,7 +13,7 @@ use Twig_Token;
 /**
  * Class TokenParserTrans
  *
- * @package PMA\libraries\twig\i18n
+ * @package PhpMyAdmin\Twig\I18n
  */
 class TokenParserTrans extends Twig_Extensions_TokenParser_Trans
 {
diff --git a/libraries/twig/I18nExtension.php b/libraries/classes/Twig/I18nExtension.php
similarity index 75%
rename from libraries/twig/I18nExtension.php
rename to libraries/classes/Twig/I18nExtension.php
index 73884d11bb..5a34d47386 100644
--- a/libraries/twig/I18nExtension.php
+++ b/libraries/classes/Twig/I18nExtension.php
@@ -1,19 +1,20 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\libraries\twig\I18nExtension class
+ * hold PhpMyAdmin\Twig\I18nExtension class
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
-namespace PMA\libraries\twig;
+namespace PhpMyAdmin\Twig;
 
+use PhpMyAdmin\Twig\I18n\TokenParserTrans;
 use Twig_Extensions_Extension_I18n;
 use Twig_SimpleFilter;
 
 /**
  * Class I18nExtension
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
 class I18nExtension extends Twig_Extensions_Extension_I18n
 {
@@ -24,7 +25,7 @@ class I18nExtension extends Twig_Extensions_Extension_I18n
      */
     public function getTokenParsers()
     {
-        return array(new i18n\TokenParserTrans());
+        return array(new TokenParserTrans());
     }
 
     /**
diff --git a/libraries/twig/MessageExtension.php b/libraries/classes/Twig/MessageExtension.php
similarity index 82%
rename from libraries/twig/MessageExtension.php
rename to libraries/classes/Twig/MessageExtension.php
index 35af642833..f981eb05f1 100644
--- a/libraries/twig/MessageExtension.php
+++ b/libraries/classes/Twig/MessageExtension.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\libraries\twig\MessageExtension class
+ * hold PhpMyAdmin\Twig\MessageExtension class
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
-namespace PMA\libraries\twig;
+namespace PhpMyAdmin\Twig;
 
 use Twig_Extension;
 use Twig_SimpleFunction;
@@ -14,7 +14,7 @@ use PhpMyAdmin\Message;
 /**
  * Class MessageExtension
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
 class MessageExtension extends Twig_Extension
 {
diff --git a/libraries/twig/SanitizeExtension.php b/libraries/classes/Twig/SanitizeExtension.php
similarity index 80%
rename from libraries/twig/SanitizeExtension.php
rename to libraries/classes/Twig/SanitizeExtension.php
index d645e1824b..3420daa024 100644
--- a/libraries/twig/SanitizeExtension.php
+++ b/libraries/classes/Twig/SanitizeExtension.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\libraries\twig\SanitizeExtension class
+ * hold PhpMyAdmin\Twig\SanitizeExtension class
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
-namespace PMA\libraries\twig;
+namespace PhpMyAdmin\Twig;
 
 use Twig_Extension;
 use Twig_SimpleFunction;
@@ -13,7 +13,7 @@ use Twig_SimpleFunction;
 /**
  * Class SanitizeExtension
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
 class SanitizeExtension extends Twig_Extension
 {
diff --git a/libraries/twig/UrlExtension.php b/libraries/classes/Twig/UrlExtension.php
similarity index 87%
rename from libraries/twig/UrlExtension.php
rename to libraries/classes/Twig/UrlExtension.php
index 22915b9fb8..40d0045062 100644
--- a/libraries/twig/UrlExtension.php
+++ b/libraries/classes/Twig/UrlExtension.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\libraries\twig\UrlExtension class
+ * hold PhpMyAdmin\Twig\UrlExtension class
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
-namespace PMA\libraries\twig;
+namespace PhpMyAdmin\Twig;
 
 use Twig_Extension;
 use Twig_SimpleFunction;
@@ -13,7 +13,7 @@ use Twig_SimpleFunction;
 /**
  * Class UrlExtension
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
 class UrlExtension extends Twig_Extension
 {
diff --git a/libraries/twig/UtilExtension.php b/libraries/classes/Twig/UtilExtension.php
similarity index 96%
rename from libraries/twig/UtilExtension.php
rename to libraries/classes/Twig/UtilExtension.php
index 8d1199259a..f5e6a98921 100644
--- a/libraries/twig/UtilExtension.php
+++ b/libraries/classes/Twig/UtilExtension.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\libraries\twig\UtilExtension class
+ * hold PhpMyAdmin\Twig\UtilExtension class
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
-namespace PMA\libraries\twig;
+namespace PhpMyAdmin\Twig;
 
 use Twig_Extension;
 use Twig_SimpleFunction;
@@ -13,7 +13,7 @@ use Twig_SimpleFunction;
 /**
  * Class UtilExtension
  *
- * @package PMA\libraries\twig
+ * @package PhpMyAdmin\Twig
  */
 class UtilExtension extends Twig_Extension
 {
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 3bbf0b41ca..5b0fd1cc29 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -10,7 +10,7 @@ namespace PhpMyAdmin;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\ImportPlugin;
+use PhpMyAdmin\Plugins\ImportPlugin;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\SqlParser\Context;
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index b8d015f88c..db59f35865 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -36,7 +36,7 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\ErrorHandler;
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\AuthenticationPlugin;
+use PhpMyAdmin\Plugins\AuthenticationPlugin;
 use PhpMyAdmin\DbList;
 use PhpMyAdmin\ThemeManager;
 use PhpMyAdmin\Tracker;
@@ -649,7 +649,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
          */
         $auth_class = "Authentication" . ucfirst($cfg['Server']['auth_type']);
         if (! @file_exists(
-            './libraries/plugins/auth/'
+            './libraries/classes/Plugins/Auth/'
             . $auth_class . '.php'
         )) {
             Core::fatalError(
@@ -660,7 +660,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         if (isset($_REQUEST['pma_password']) && strlen($_REQUEST['pma_password']) > 256) {
             $_REQUEST['pma_password'] = substr($_REQUEST['pma_password'], 0, 256);
         }
-        $fqnAuthClass = 'PMA\libraries\plugins\auth\\' . $auth_class;
+        $fqnAuthClass = 'PhpMyAdmin\Plugins\Auth\\' . $auth_class;
         // todo: add plugin manager
         $plugin_manager = null;
         /** @var AuthenticationPlugin $auth_plugin */
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
index 493109564a..4fe39242da 100644
--- a/libraries/db_designer.lib.php
+++ b/libraries/db_designer.lib.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\SchemaPlugin;
+use PhpMyAdmin\Plugins\SchemaPlugin;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -109,7 +109,7 @@ function PMA_getHtmlForSchemaExport($db, $page)
     /* @var $export_list SchemaPlugin[] */
     $export_list = PMA_getPlugins(
         "schema",
-        'libraries/plugins/schema/',
+        'libraries/classes/Plugins/Schema/',
         null
     );
 
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index ac5ae6474e..7764b625f6 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -10,7 +10,7 @@
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\ExportPlugin;
+use PhpMyAdmin\Plugins\ExportPlugin;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Template;
@@ -1000,7 +1000,7 @@ function PMA_getExportDisplay(
     /* @var $export_list ExportPlugin[] */
     $export_list = PMA_getPlugins(
         "export",
-        'libraries/plugins/export/',
+        'libraries/classes/Plugins/Export/',
         array(
             'export_type' => $export_type,
             'single_table' => isset($GLOBALS['single_table'])
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index a139309134..7ba314398e 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -13,7 +13,7 @@ use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\ImportPlugin;
+use PhpMyAdmin\Plugins\ImportPlugin;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Sanitize;
 
@@ -63,7 +63,7 @@ function PMA_getHtmlForImportJS($upload_id)
     // hide form
     $html .= '        $("#upload_form_form").css("display", "none");';
 
-    if ($_SESSION[$SESSION_KEY]["handler"] != 'PMA\libraries\plugins\import\upload\UploadNoplugin') {
+    if ($_SESSION[$SESSION_KEY]["handler"] != 'PhpMyAdmin\Plugins\Import\Upload\UploadNoplugin') {
 
         $html .= PMA_getHtmlForImportWithPlugin($upload_id);
 
@@ -437,7 +437,7 @@ function PMA_getHtmlForImport(
     $html .= '    <form id="import_file_form" action="import.php" method="post" '
         . 'enctype="multipart/form-data"';
     $html .= '        name="import"';
-    if ($_SESSION[$SESSION_KEY]["handler"] != 'PMA\libraries\plugins\import\upload\UploadNoplugin') {
+    if ($_SESSION[$SESSION_KEY]["handler"] != 'PhpMyAdmin\Plugins\Import\Upload\UploadNoplugin') {
         $html .= ' target="import_upload_iframe"';
     }
     $html .= ' class="ajax"';
@@ -656,7 +656,7 @@ function PMA_getImportDisplay($import_type, $db, $table, $max_upload_size)
     /* @var $import_list ImportPlugin[] */
     $import_list = PMA_getPlugins(
         "import",
-        'libraries/plugins/import/',
+        'libraries/classes/Plugins/Import/',
         $import_type
     );
 
diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
index 6465014fc2..79119036ab 100644
--- a/libraries/display_import_ajax.lib.php
+++ b/libraries/display_import_ajax.lib.php
@@ -50,7 +50,7 @@ function PMA_uploadProgressSetup()
         $check = "PMA_Import_" . $plugin . "Check";
 
         if ($check()) {
-            $upload_class = 'PMA\libraries\plugins\import\upload\Upload' . ucwords(
+            $upload_class = 'PhpMyAdmin\Plugins\Import\Upload\Upload' . ucwords(
                 $plugin
             );
             $_SESSION[$SESSION_KEY]["handler"] = $upload_class;
@@ -78,10 +78,10 @@ function PMA_Import_apcCheck()
 }
 
 /**
- * Checks if PMA\libraries\plugins\import\upload\UploadProgress bar extension is
+ * Checks if PhpMyAdmin\Plugins\Import\Upload\UploadProgress bar extension is
  * available.
  *
- * @return boolean true if PMA\libraries\plugins\import\upload\UploadProgress
+ * @return boolean true if PhpMyAdmin\Plugins\Import\Upload\UploadProgress
  * extension is available, false if it is not
  */
 function PMA_Import_progressCheck()
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index 23e225c158..76f3654c4f 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -8,7 +8,7 @@
  */
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\ExportPlugin;
+use PhpMyAdmin\Plugins\ExportPlugin;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\ZipExtension;
 use PhpMyAdmin\Url;
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 4352af1eb0..4d1c9823e8 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Message;
-use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Plugins\TransformationsPlugin;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\Transformations;
@@ -2175,7 +2175,7 @@ function PMA_getLinkForRelationalDisplayField($map, $relation_field,
 function PMA_transformEditedValues($db, $table,
     $transformation, &$edited_values, $file, $column_name, $extra_data, $type
 ) {
-    $include_file = 'libraries/plugins/transformations/' . $file;
+    $include_file = 'libraries/classes/Plugins/Transformations/' . $file;
     if (is_file($include_file)) {
         include_once $include_file;
         $_url_params = array(
@@ -2889,7 +2889,7 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
     $transformed_html = '';
     if (!empty($column_mime['input_transformation'])) {
         $file = $column_mime['input_transformation'];
-        $include_file = 'libraries/plugins/transformations/' . $file;
+        $include_file = 'libraries/classes/Plugins/Transformations/' . $file;
         if (is_file($include_file)) {
             include_once $include_file;
             $class_name = Transformations::getClassName($include_file);
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 83aa1d83cb..f5a57dc5c0 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -10,7 +10,7 @@ use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Partition;
-use PMA\libraries\plugins\export\ExportSql;
+use PhpMyAdmin\Plugins\Export\ExportSql;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\StorageEngine;
 use PhpMyAdmin\Table;
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index df33d58b0e..10422c8171 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -5,11 +5,11 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
-use PMA\libraries\properties\options\OptionsPropertyItem;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\plugins\PluginPropertyItem;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup;
+use PhpMyAdmin\Properties\Options\OptionsPropertyItem;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Plugins\PluginPropertyItem;
+use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties;
 
 /**
  * Includes and instantiates the specified plugin type for a certain format
@@ -36,7 +36,7 @@ function PMA_getPlugin(
     $file = $class_name . ".php";
     if (is_file($plugins_dir . $file)) {
         //include_once $plugins_dir . $file;
-        $fqnClass = 'PMA\\' . str_replace('/', '\\', $plugins_dir) . $class_name;
+        $fqnClass = 'PhpMyAdmin\\' . str_replace('/', '\\', mb_substr($plugins_dir, 18)) . $class_name;
         // check if class exists, could be caused by skip_import
         if (class_exists($fqnClass)) {
             return new $fqnClass;
@@ -65,7 +65,7 @@ function PMA_getPlugins($plugin_type, $plugins_dir, $plugin_param)
         return $plugin_list;
     }
 
-    $namespace = 'PMA\\' . str_replace('/', '\\', $plugins_dir);
+    $namespace = 'PhpMyAdmin\\' . str_replace('/', '\\', mb_substr($plugins_dir, 18));
     $class_type = mb_strtoupper($plugin_type[0], 'UTF-8')
         . mb_strtolower(mb_substr($plugin_type, 1), 'UTF-8');
 
@@ -259,7 +259,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
  *                                                                     for plugin
  * @param string                                       $plugin_name    unique plugin
  *                                                                     name
- * @param array|\PMA\libraries\properties\PropertyItem &$propertyGroup options
+ * @param array|\PhpMyAdmin\Properties\PropertyItem &$propertyGroup options
  *                                                                     property main
  *                                                                     group
  *                                                                     instance
@@ -375,10 +375,10 @@ function PMA_pluginGetOneOption(
 
     // Close the list element after $doc link is displayed
     if (isset($property_class)) {
-        if ($property_class == 'PMA\libraries\properties\options\items\BoolPropertyItem'
-            || $property_class == 'PMA\libraries\properties\options\items\MessageOnlyPropertyItem'
-            || $property_class == 'PMA\libraries\properties\options\items\SelectPropertyItem'
-            || $property_class == 'PMA\libraries\properties\options\items\TextPropertyItem'
+        if ($property_class == 'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem'
+            || $property_class == 'PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem'
+            || $property_class == 'PhpMyAdmin\Properties\Options\Items\SelectPropertyItem'
+            || $property_class == 'PhpMyAdmin\Properties\Options\Items\TextPropertyItem'
         ) {
             $ret .= '</li>';
         }
@@ -403,7 +403,7 @@ function PMA_getHtmlForProperty(
     $ret = null;
     $property_class = get_class($propertyItem);
     switch ($property_class) {
-    case 'PMA\libraries\properties\options\items\BoolPropertyItem':
+    case 'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem':
         $ret .= '<li>' . "\n";
         $ret .= '<input type="checkbox" name="' . $plugin_name . '_'
             . $propertyItem->getName() . '"'
@@ -430,10 +430,10 @@ function PMA_getHtmlForProperty(
             . $propertyItem->getName() . '">'
             . PMA_getString($propertyItem->getText()) . '</label>';
         break;
-    case 'PMA\libraries\properties\options\items\DocPropertyItem':
-        echo 'PMA\libraries\properties\options\items\DocPropertyItem';
+    case 'PhpMyAdmin\Properties\Options\Items\DocPropertyItem':
+        echo 'PhpMyAdmin\Properties\Options\Items\DocPropertyItem';
         break;
-    case 'PMA\libraries\properties\options\items\HiddenPropertyItem':
+    case 'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem':
         $ret .= '<li><input type="hidden" name="' . $plugin_name . '_'
             . $propertyItem->getName() . '"'
             . ' value="' . PMA_pluginGetDefault(
@@ -442,11 +442,11 @@ function PMA_getHtmlForProperty(
             )
             . '"' . ' /></li>';
         break;
-    case 'PMA\libraries\properties\options\items\MessageOnlyPropertyItem':
+    case 'PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem':
         $ret .= '<li>' . "\n";
         $ret .= '<p>' . PMA_getString($propertyItem->getText()) . '</p>';
         break;
-    case 'PMA\libraries\properties\options\items\RadioPropertyItem':
+    case 'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem':
         $default = PMA_pluginGetDefault(
             $section,
             $plugin_name . '_' . $propertyItem->getName()
@@ -464,7 +464,7 @@ function PMA_getHtmlForProperty(
                 . PMA_getString($val) . '</label></li>';
         }
         break;
-    case 'PMA\libraries\properties\options\items\SelectPropertyItem':
+    case 'PhpMyAdmin\Properties\Options\Items\SelectPropertyItem':
         $ret .= '<li>' . "\n";
         $ret .= '<label for="select_' . $plugin_name . '_'
             . $propertyItem->getName() . '" class="desc">'
@@ -486,8 +486,8 @@ function PMA_getHtmlForProperty(
         }
         $ret .= '</select>';
         break;
-    case 'PMA\libraries\properties\options\items\TextPropertyItem':
-    case 'PMA\libraries\properties\options\items\NumberPropertyItem':
+    case 'PhpMyAdmin\Properties\Options\Items\TextPropertyItem':
+    case 'PhpMyAdmin\Properties\Options\Items\NumberPropertyItem':
         $ret .= '<li>' . "\n";
         $ret .= '<label for="text_' . $plugin_name . '_'
             . $propertyItem->getName() . '" class="desc">'
@@ -555,7 +555,7 @@ function PMA_pluginGetOptions($section, &$list)
                 // check for hidden properties
                 $no_options = true;
                 foreach ($propertyMainGroup->getProperties() as $propertyItem) {
-                    if (strcmp('PMA\libraries\properties\options\items\HiddenPropertyItem', get_class($propertyItem))) {
+                    if (strcmp('PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem', get_class($propertyItem))) {
                         $no_options = false;
                         break;
                     }
diff --git a/libraries/properties/options/groups/OptionsPropertyMainGroup.php b/libraries/properties/options/groups/OptionsPropertyMainGroup.php
deleted file mode 100644
index 0ff6124c9c..0000000000
--- a/libraries/properties/options/groups/OptionsPropertyMainGroup.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\groups\OptionsPropertyMainGroup class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\groups;
-
-use PMA\libraries\properties\options\OptionsPropertyGroup;
-
-/**
- * Group property item class of type main
- *
- * @package PhpMyAdmin
- */
-class OptionsPropertyMainGroup extends OptionsPropertyGroup
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "main";
-    }
-}
diff --git a/libraries/properties/options/groups/OptionsPropertyRootGroup.php b/libraries/properties/options/groups/OptionsPropertyRootGroup.php
deleted file mode 100644
index 62a3c97606..0000000000
--- a/libraries/properties/options/groups/OptionsPropertyRootGroup.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\groups\OptionsPropertyRootGroup class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\groups;
-
-use PMA\libraries\properties\options\OptionsPropertyGroup;
-
-/**
- * Group property item class of type root
- *
- * @package PhpMyAdmin
- */
-class OptionsPropertyRootGroup extends OptionsPropertyGroup
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "root";
-    }
-}
diff --git a/libraries/properties/options/items/BoolPropertyItem.php b/libraries/properties/options/items/BoolPropertyItem.php
deleted file mode 100644
index c4315a8fbf..0000000000
--- a/libraries/properties/options/items/BoolPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\BoolPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type bool
- *
- * @package PhpMyAdmin
- */
-class BoolPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "bool";
-    }
-}
diff --git a/libraries/properties/options/items/DocPropertyItem.php b/libraries/properties/options/items/DocPropertyItem.php
deleted file mode 100644
index 09399f34e9..0000000000
--- a/libraries/properties/options/items/DocPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\DocPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type doc
- *
- * @package PhpMyAdmin
- */
-class DocPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "doc";
-    }
-}
diff --git a/libraries/properties/options/items/RadioPropertyItem.php b/libraries/properties/options/items/RadioPropertyItem.php
deleted file mode 100644
index 5ec02b27e7..0000000000
--- a/libraries/properties/options/items/RadioPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\RadioPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type radio
- *
- * @package PhpMyAdmin
- */
-class RadioPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "radio";
-    }
-}
diff --git a/libraries/properties/options/items/TextPropertyItem.php b/libraries/properties/options/items/TextPropertyItem.php
deleted file mode 100644
index 98143b5fab..0000000000
--- a/libraries/properties/options/items/TextPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\TextPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type text
- *
- * @package PhpMyAdmin
- */
-class TextPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "text";
-    }
-}
diff --git a/schema_export.php b/schema_export.php
index 97f7791b69..c223552efd 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\plugins\SchemaPlugin;
+use PhpMyAdmin\Plugins\SchemaPlugin;
 
 /**
  * Gets some core libraries
@@ -58,7 +58,7 @@ function PMA_processExportSchema($export_type)
     $export_plugin = PMA_getPlugin(
         "schema",
         $export_type,
-        'libraries/plugins/schema/'
+        'libraries/classes/Plugins/Schema/'
     );
 
     // Check schema export type
diff --git a/scripts/generate-twig-cache b/scripts/generate-twig-cache
index 472faf2e68..a03e3264f5 100644
--- a/scripts/generate-twig-cache
+++ b/scripts/generate-twig-cache
@@ -4,12 +4,12 @@ define('PHPMYADMIN', 1);
 require_once 'libraries/vendor_config.php';
 require_once AUTOLOAD_FILE;
 
-use PMA\libraries\twig\CharsetsExtension;
-use PMA\libraries\twig\I18nExtension;
-use PMA\libraries\twig\MessageExtension;
-use PMA\libraries\twig\SanitizeExtension;
-use PMA\libraries\twig\UrlExtension;
-use PMA\libraries\twig\UtilExtension;
+use PhpMyAdmin\Twig\CharsetsExtension;
+use PhpMyAdmin\Twig\I18nExtension;
+use PhpMyAdmin\Twig\MessageExtension;
+use PhpMyAdmin\Twig\SanitizeExtension;
+use PhpMyAdmin\Twig\UrlExtension;
+use PhpMyAdmin\Twig\UtilExtension;
 
 $tplDir = dirname(__FILE__) . '/../templates';
 $tmpDir = dirname(__FILE__) . '/../twig-templates';
diff --git a/tbl_replace.php b/tbl_replace.php
index ae70b799ef..e02179fcf6 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -13,7 +13,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\plugins\IOTransformationsPlugin;
+use PhpMyAdmin\Plugins\IOTransformationsPlugin;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Transformations;
@@ -217,7 +217,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
         if (!empty($mime_map[$column_name])
             && !empty($mime_map[$column_name]['input_transformation'])
         ) {
-            $filename = 'libraries/plugins/transformations/'
+            $filename = 'libraries/classes/Plugins/Transformations/'
                 . $mime_map[$column_name]['input_transformation'];
             if (is_file($filename)) {
                 include_once $filename;
diff --git a/test/classes/DisplayResultsTest.php b/test/classes/DisplayResultsTest.php
index 29b00f4bdd..a58ba14409 100644
--- a/test/classes/DisplayResultsTest.php
+++ b/test/classes/DisplayResultsTest.php
@@ -10,7 +10,7 @@
  */
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DisplayResults;
-use PMA\libraries\plugins\transformations\Text_Plain_Link;
+use PhpMyAdmin\Plugins\Transformations\Text_Plain_Link;
 
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php
index 437800944d..e6799f8874 100644
--- a/test/classes/TransformationsTest.php
+++ b/test/classes/TransformationsTest.php
@@ -120,21 +120,21 @@ class TransformationsTest extends PHPUnit_Framework_TestCase
                     18 => 'Text/Plain: Substring',
                     ),
                 'transformation_file' => array (
-                    0 => 'output/Application_Octetstream_Download.php',
-                    1 => 'output/Application_Octetstream_Hex.php',
-                    2 => 'output/Image_JPEG_Inline.php',
-                    3 => 'output/Image_JPEG_Link.php',
-                    4 => 'output/Image_PNG_Inline.php',
-                    5 => 'output/Text_Octetstream_Sql.php',
-                    6 => 'output/Text_Plain_Binarytoip.php',
-                    7 => 'output/Text_Plain_Bool2Text.php',
-                    8 => 'output/Text_Plain_Dateformat.php',
-                    9 => 'output/Text_Plain_External.php',
-                    10 => 'output/Text_Plain_Formatted.php',
-                    11 => 'output/Text_Plain_Imagelink.php',
-                    12 => 'output/Text_Plain_Json.php',
-                    13 => 'output/Text_Plain_Sql.php',
-                    14 => 'output/Text_Plain_Xml.php',
+                    0 => 'Output/Application_Octetstream_Download.php',
+                    1 => 'Output/Application_Octetstream_Hex.php',
+                    2 => 'Output/Image_JPEG_Inline.php',
+                    3 => 'Output/Image_JPEG_Link.php',
+                    4 => 'Output/Image_PNG_Inline.php',
+                    5 => 'Output/Text_Octetstream_Sql.php',
+                    6 => 'Output/Text_Plain_Binarytoip.php',
+                    7 => 'Output/Text_Plain_Bool2Text.php',
+                    8 => 'Output/Text_Plain_Dateformat.php',
+                    9 => 'Output/Text_Plain_External.php',
+                    10 => 'Output/Text_Plain_Formatted.php',
+                    11 => 'Output/Text_Plain_Imagelink.php',
+                    12 => 'Output/Text_Plain_Json.php',
+                    13 => 'Output/Text_Plain_Sql.php',
+                    14 => 'Output/Text_Plain_Xml.php',
                     15 => 'Text_Plain_Link.php',
                     16 => 'Text_Plain_Longtoipv4.php',
                     17 => 'Text_Plain_PreApPend.php',
@@ -154,13 +154,13 @@ class TransformationsTest extends PHPUnit_Framework_TestCase
                     'Text/Plain: Substring',
                 ),
                 'input_transformation_file' => array(
-                    'input/Image_JPEG_Upload.php',
-                    'input/Text_Plain_FileUpload.php',
-                    'input/Text_Plain_Iptobinary.php',
-                    'input/Text_Plain_JsonEditor.php',
-                    'input/Text_Plain_RegexValidation.php',
-                    'input/Text_Plain_SqlEditor.php',
-                    'input/Text_Plain_XmlEditor.php',
+                    'Input/Image_JPEG_Upload.php',
+                    'Input/Text_Plain_FileUpload.php',
+                    'Input/Text_Plain_Iptobinary.php',
+                    'Input/Text_Plain_JsonEditor.php',
+                    'Input/Text_Plain_RegexValidation.php',
+                    'Input/Text_Plain_SqlEditor.php',
+                    'Input/Text_Plain_XmlEditor.php',
                     'Text_Plain_Link.php',
                     'Text_Plain_Longtoipv4.php',
                     'Text_Plain_PreApPend.php',
diff --git a/test/classes/plugin/auth/AuthenticationConfigTest.php b/test/classes/plugin/auth/AuthenticationConfigTest.php
index 841c535109..32c3e8cfc8 100644
--- a/test/classes/plugin/auth/AuthenticationConfigTest.php
+++ b/test/classes/plugin/auth/AuthenticationConfigTest.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\auth\AuthenticationConfig class
+ * tests for PhpMyAdmin\Plugins\Auth\AuthenticationConfig class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\plugins\auth\AuthenticationConfig;
+use PhpMyAdmin\Plugins\Auth\AuthenticationConfig;
 
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\auth\AuthenticationConfig class
+ * tests for PhpMyAdmin\Plugins\Auth\AuthenticationConfig class
  *
  * @package PhpMyAdmin-test
  */
@@ -46,7 +46,7 @@ class AuthenticationConfigTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::auth
      *
      * @return void
      */
@@ -58,7 +58,7 @@ class AuthenticationConfigTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck
      *
      * @return void
      */
@@ -70,7 +70,7 @@ class AuthenticationConfigTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authSetUser
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authSetUser
      *
      * @return void
      */
@@ -82,7 +82,7 @@ class AuthenticationConfigTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authFails
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authFails
      *
      * @return void
      */
diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php
index 1221f4bcef..8783bef005 100644
--- a/test/classes/plugin/auth/AuthenticationCookieTest.php
+++ b/test/classes/plugin/auth/AuthenticationCookieTest.php
@@ -1,23 +1,22 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\auth\AuthenticationCookie class
+ * tests for PhpMyAdmin\Plugins\Auth\AuthenticationCookie class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\plugins\auth\AuthenticationCookie;
+use PhpMyAdmin\Plugins\Auth\AuthenticationCookie;
 use PhpMyAdmin\Theme;
 
 $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
 
 require_once 'libraries/config.default.php';
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/plugins/auth/AuthenticationCookie.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\auth\AuthenticationCookie class
+ * tests for PhpMyAdmin\Plugins\Auth\AuthenticationCookie class
  *
  * @package PhpMyAdmin-test
  */
@@ -57,7 +56,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::auth
      *
      * @return void
      * @group medium
@@ -89,7 +88,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::auth
      *
      * @return void
      * @group medium
@@ -258,7 +257,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::auth
      *
      * @return void
      * @group medium
@@ -341,7 +340,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth with headers
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::auth with headers
      *
      * @return void
      */
@@ -359,7 +358,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth with headers
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::auth with headers
      *
      * @return void
      */
@@ -379,7 +378,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck
      *
      * @return void
      */
@@ -401,7 +400,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck
      *
      * @return void
      */
@@ -425,7 +424,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck
      *
      * @return void
      */
@@ -451,7 +450,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck
      *
      * @return void
      */
@@ -490,7 +489,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck
      *
      * @return void
      */
@@ -510,7 +509,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck
      *
      * @return void
      */
@@ -531,7 +530,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck (mock blowfish functions reqd)
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck (mock blowfish functions reqd)
      *
      * @return void
      */
@@ -549,7 +548,7 @@ class AuthenticationCookieTest extends PMATestCase
         $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
 
         // mock for blowfish function
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
             ->setMethods(array('cookieDecrypt'))
             ->getMock();
@@ -569,7 +568,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck (mocking blowfish functions)
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck (mocking blowfish functions)
      *
      * @return void
      */
@@ -589,7 +588,7 @@ class AuthenticationCookieTest extends PMATestCase
         $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
 
         // mock for blowfish function
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
             ->setMethods(array('cookieDecrypt'))
             ->getMock();
@@ -614,7 +613,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck (mocking the object itself)
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck (mocking the object itself)
      *
      * @return void
      */
@@ -633,7 +632,7 @@ class AuthenticationCookieTest extends PMATestCase
         $GLOBALS['cfg']['LoginCookieValidity'] = 0;
         $_SESSION['browser_access_time']['default'] = -1;
         // mock for blowfish function
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
             ->setMethods(array('authFails'))
             ->getMock();
@@ -651,7 +650,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authSetUser
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authSetUser
      *
      * @return void
      */
@@ -707,7 +706,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authSetUser (check for headers redirect)
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authSetUser (check for headers redirect)
      *
      * @return void
      */
@@ -743,13 +742,13 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authFails
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authFails
      *
      * @return void
      */
     public function testAuthFailsNoPass()
     {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
             ->setMethods(array('auth'))
             ->getMock();
@@ -775,7 +774,7 @@ class AuthenticationCookieTest extends PMATestCase
 
     public function testAuthFailsDeny()
     {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
             ->setMethods(array('auth'))
             ->getMock();
@@ -800,7 +799,7 @@ class AuthenticationCookieTest extends PMATestCase
 
     public function testAuthFailsActivity()
     {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
             ->setMethods(array('auth'))
             ->getMock();
@@ -826,7 +825,7 @@ class AuthenticationCookieTest extends PMATestCase
 
     public function testAuthFailsDBI()
     {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
             ->setMethods(array('auth'))
             ->getMock();
@@ -860,7 +859,7 @@ class AuthenticationCookieTest extends PMATestCase
 
     public function testAuthFailsErrno()
     {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
             ->setMethods(array('auth'))
             ->getMock();
@@ -892,14 +891,14 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::_getEncryptionSecret
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::_getEncryptionSecret
      *
      * @return void
      */
     public function testGetEncryptionSecretEmpty()
     {
         $method = new \ReflectionMethod(
-            'PMA\libraries\plugins\auth\AuthenticationCookie',
+            'PhpMyAdmin\Plugins\Auth\AuthenticationCookie',
             '_getEncryptionSecret'
         );
         $method->setAccessible(true);
@@ -921,14 +920,14 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::_getEncryptionSecret
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::_getEncryptionSecret
      *
      * @return void
      */
     public function testGetEncryptionSecretConfigured()
     {
         $method = new \ReflectionMethod(
-            'PMA\libraries\plugins\auth\AuthenticationCookie',
+            'PhpMyAdmin\Plugins\Auth\AuthenticationCookie',
             '_getEncryptionSecret'
         );
         $method->setAccessible(true);
@@ -944,7 +943,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieEncrypt
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieEncrypt
      *
      * @return void
      */
@@ -959,7 +958,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieEncrypt
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieEncrypt
      *
      * @return void
      */
@@ -970,7 +969,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieEncrypt
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieEncrypt
      *
      * @return void
      */
@@ -984,7 +983,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieDecrypt
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieDecrypt
      *
      * @return void
      */
@@ -1001,7 +1000,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieDecrypt
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieDecrypt
      *
      * @return void
      */
@@ -1012,7 +1011,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieDecrypt
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieDecrypt
      *
      * @return void
      */
@@ -1026,7 +1025,7 @@ class AuthenticationCookieTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieDecrypt
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieDecrypt
      *
      * @return void
      */
@@ -1087,7 +1086,7 @@ class AuthenticationCookieTest extends PMATestCase
             'server' => 'b 2'
         );
         $method = new \ReflectionMethod(
-            'PMA\libraries\plugins\auth\AuthenticationCookie',
+            'PhpMyAdmin\Plugins\Auth\AuthenticationCookie',
             '_getSessionEncryptionSecret'
         );
         $method->setAccessible(true);
diff --git a/test/classes/plugin/auth/AuthenticationHttpTest.php b/test/classes/plugin/auth/AuthenticationHttpTest.php
index e331f54b80..64237a6f08 100644
--- a/test/classes/plugin/auth/AuthenticationHttpTest.php
+++ b/test/classes/plugin/auth/AuthenticationHttpTest.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\auth\AuthenticationHttp class
+ * tests for PhpMyAdmin\Plugins\Auth\AuthenticationHttp class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\plugins\auth\AuthenticationHttp;
+use PhpMyAdmin\Plugins\Auth\AuthenticationHttp;
 
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\auth\AuthenticationHttp class
+ * tests for PhpMyAdmin\Plugins\Auth\AuthenticationHttp class
  *
  * @package PhpMyAdmin-test
  */
@@ -113,7 +113,7 @@ class AuthenticationHttpTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationHttp::auth
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationHttp::auth
      *
      * @return void
      */
@@ -169,7 +169,7 @@ class AuthenticationHttpTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationHttp::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationHttp::authCheck
      *
      * @param string $user           test username
      * @param string $pass           test password
@@ -271,7 +271,7 @@ class AuthenticationHttpTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationHttp::authSetUser
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationHttp::authSetUser
      *
      * @return void
      */
@@ -378,7 +378,7 @@ class AuthenticationHttpTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationHttp::authSetFails
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationHttp::authSetFails
      *
      * @return void
      *
@@ -415,7 +415,7 @@ class AuthenticationHttpTest extends PMATestCase
             $result
         );
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationHttp')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationHttp')
             ->disableOriginalConstructor()
             ->setMethods(array('authForm'))
             ->getMock();
diff --git a/test/classes/plugin/auth/AuthenticationSignonTest.php b/test/classes/plugin/auth/AuthenticationSignonTest.php
index 921c291778..5704045522 100644
--- a/test/classes/plugin/auth/AuthenticationSignonTest.php
+++ b/test/classes/plugin/auth/AuthenticationSignonTest.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\auth\AuthenticationSignon class
+ * tests for PhpMyAdmin\Plugins\Auth\AuthenticationSignon class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\plugins\auth\AuthenticationSignon;
+use PhpMyAdmin\Plugins\Auth\AuthenticationSignon;
 
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\auth\AuthenticationSignon class
+ * tests for PhpMyAdmin\Plugins\Auth\AuthenticationSignon class
  *
  * @package PhpMyAdmin-test
  */
@@ -45,7 +45,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::auth
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::auth
      *
      * @return void
      */
@@ -64,7 +64,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::auth
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::auth
      *
      * @return void
      */
@@ -79,7 +79,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::auth
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::auth
      *
      * @return void
      */
@@ -95,7 +95,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authCheck
      *
      * @return void
      */
@@ -110,7 +110,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authCheck
      *
      * @return void
      */
@@ -146,7 +146,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authCheck
      *
      * @return void
      */
@@ -202,7 +202,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authCheck
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authCheck
      *
      * @return void
      */
@@ -240,7 +240,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authSetUser
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authSetUser
      *
      * @return void
      */
@@ -265,7 +265,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authFails
      *
      * @return void
      */
@@ -274,7 +274,7 @@ class AuthenticationSignonTest extends PMATestCase
         $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession';
         $_COOKIE['newSession'] = '42';
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon')
             ->disableOriginalConstructor()
             ->setMethods(array('auth'))
             ->getMock();
@@ -294,7 +294,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authFails
      *
      * @return void
      */
@@ -303,7 +303,7 @@ class AuthenticationSignonTest extends PMATestCase
         $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession';
         $_COOKIE['newSession'] = '42';
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon')
             ->disableOriginalConstructor()
             ->setMethods(array('auth'))
             ->getMock();
@@ -323,7 +323,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authFails
      *
      * @return void
      */
@@ -332,7 +332,7 @@ class AuthenticationSignonTest extends PMATestCase
         $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession';
         $_COOKIE['newSession'] = '42';
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon')
             ->disableOriginalConstructor()
             ->setMethods(array('auth'))
             ->getMock();
@@ -353,7 +353,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authFails
      *
      * @return void
      */
@@ -362,7 +362,7 @@ class AuthenticationSignonTest extends PMATestCase
         $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession';
         $_COOKIE['newSession'] = '42';
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon')
             ->disableOriginalConstructor()
             ->setMethods(array('auth'))
             ->getMock();
@@ -390,7 +390,7 @@ class AuthenticationSignonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authFails
      *
      * @return void
      */
@@ -399,7 +399,7 @@ class AuthenticationSignonTest extends PMATestCase
         $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession';
         $_COOKIE['newSession'] = '42';
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon')
             ->disableOriginalConstructor()
             ->setMethods(array('auth'))
             ->getMock();
diff --git a/test/classes/plugin/export/ExportCodegenTest.php b/test/classes/plugin/export/ExportCodegenTest.php
index 87a51ef212..1327fe1a03 100644
--- a/test/classes/plugin/export/ExportCodegenTest.php
+++ b/test/classes/plugin/export/ExportCodegenTest.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportCodegen class
+ * tests for PhpMyAdmin\Plugins\Export\ExportCodegen class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportCodegen;
+use PhpMyAdmin\Plugins\Export\ExportCodegen;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportCodegen class
+ * tests for PhpMyAdmin\Plugins\Export\ExportCodegen class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -43,21 +43,21 @@ class ExportCodegenTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::initSpecificVariables
+     * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::initSpecificVariables
      *
      * @return void
      */
     public function testInitSpecificVariables()
     {
 
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', 'initSpecificVariables');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportCodegen', 'initSpecificVariables');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrCgFormats = new ReflectionProperty('PMA\libraries\plugins\export\ExportCodegen', '_cgFormats');
+        $attrCgFormats = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportCodegen', '_cgFormats');
         $attrCgFormats->setAccessible(true);
 
-        $attrCgHandlers = new ReflectionProperty('PMA\libraries\plugins\export\ExportCodegen', '_cgHandlers');
+        $attrCgHandlers = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportCodegen', '_cgHandlers');
         $attrCgHandlers->setAccessible(true);
 
         $this->assertEquals(
@@ -78,22 +78,22 @@ class ExportCodegenTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportCodegen', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportCodegen', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportCodegen', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -120,7 +120,7 @@ class ExportCodegenTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -133,7 +133,7 @@ class ExportCodegenTest extends PMATestCase
         $generalOptions = $generalOptionsArray[0];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -147,7 +147,7 @@ class ExportCodegenTest extends PMATestCase
         $hidden = $generalProperties[0];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem',
             $hidden
         );
 
@@ -159,7 +159,7 @@ class ExportCodegenTest extends PMATestCase
         $select = $generalProperties[1];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\SelectPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\SelectPropertyItem',
             $select
         );
 
@@ -183,7 +183,7 @@ class ExportCodegenTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::exportHeader
      *
      * @return void
      */
@@ -195,7 +195,7 @@ class ExportCodegenTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::exportFooter
      *
      * @return void
      */
@@ -207,7 +207,7 @@ class ExportCodegenTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::exportDBHeader
      *
      * @return void
      */
@@ -219,7 +219,7 @@ class ExportCodegenTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::exportDBFooter
      *
      * @return void
      */
@@ -231,7 +231,7 @@ class ExportCodegenTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::exportData
      *
      * @return void
      */
@@ -287,7 +287,7 @@ class ExportCodegenTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::cgMakeIdentifier
+     * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::cgMakeIdentifier
      *
      * @return void
      */
@@ -310,7 +310,7 @@ class ExportCodegenTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::_handleNHibernateCSBody
+     * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::_handleNHibernateCSBody
      *
      * @return void
      */
@@ -336,7 +336,7 @@ class ExportCodegenTest extends PMATestCase
             ->will($this->returnValue(null));
 
         $GLOBALS['dbi'] = $dbi;
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', '_handleNHibernateCSBody');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportCodegen', '_handleNHibernateCSBody');
         $method->setAccessible(true);
         $result = $method->invoke($this->object, 'db', 'table', "\n");
 
@@ -375,7 +375,7 @@ class ExportCodegenTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::_handleNHibernateXMLBody
+     * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::_handleNHibernateXMLBody
      *
      * @return void
      */
@@ -406,7 +406,7 @@ class ExportCodegenTest extends PMATestCase
             ->will($this->returnValue(null));
 
         $GLOBALS['dbi'] = $dbi;
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', '_handleNHibernateXMLBody');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportCodegen', '_handleNHibernateXMLBody');
         $method->setAccessible(true);
         $result = $method->invoke($this->object, 'db', 'table', "\n");
 
@@ -431,14 +431,14 @@ class ExportCodegenTest extends PMATestCase
 
     /**
      * Test for
-     *     - PMA\libraries\plugins\export\ExportCodegen::_getCgFormats
-     *     - PMA\libraries\plugins\export\ExportCodegen::_setCgFormats
+     *     - PhpMyAdmin\Plugins\Export\ExportCodegen::_getCgFormats
+     *     - PhpMyAdmin\Plugins\Export\ExportCodegen::_setCgFormats
      *
      * @return void
      */
     public function testSetGetCgFormats()
     {
-        $reflection = new ReflectionClass('PMA\libraries\plugins\export\ExportCodegen');
+        $reflection = new ReflectionClass('PhpMyAdmin\Plugins\Export\ExportCodegen');
 
         $getter = $reflection->getMethod('_getCgFormats');
         $setter = $reflection->getMethod('_setCgFormats');
@@ -456,14 +456,14 @@ class ExportCodegenTest extends PMATestCase
 
     /**
      * Test for
-     *     - PMA\libraries\plugins\export\ExportCodegen::_getCgHandlers
-     *     - PMA\libraries\plugins\export\ExportCodegen::_setCgHandlers
+     *     - PhpMyAdmin\Plugins\Export\ExportCodegen::_getCgHandlers
+     *     - PhpMyAdmin\Plugins\Export\ExportCodegen::_setCgHandlers
      *
      * @return void
      */
     public function testSetGetCgHandlers()
     {
-        $reflection = new ReflectionClass('PMA\libraries\plugins\export\ExportCodegen');
+        $reflection = new ReflectionClass('PhpMyAdmin\Plugins\Export\ExportCodegen');
 
         $getter = $reflection->getMethod('_getCgHandlers');
         $setter = $reflection->getMethod('_setCgHandlers');
diff --git a/test/classes/plugin/export/ExportCsvTest.php b/test/classes/plugin/export/ExportCsvTest.php
index cb07536007..361ba46d3b 100644
--- a/test/classes/plugin/export/ExportCsvTest.php
+++ b/test/classes/plugin/export/ExportCsvTest.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportCsv class
+ * tests for PhpMyAdmin\Plugins\Export\ExportCsv class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportCsv;
+use PhpMyAdmin\Plugins\Export\ExportCsv;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportCsv class
+ * tests for PhpMyAdmin\Plugins\Export\ExportCsv class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -43,22 +43,22 @@ class ExportCsvTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportCsv::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCsv', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportCsv', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportCsv', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportCsv', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -85,7 +85,7 @@ class ExportCsvTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -98,7 +98,7 @@ class ExportCsvTest extends PMATestCase
         $generalOptions = $generalOptionsArray[0];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -112,7 +112,7 @@ class ExportCsvTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -129,7 +129,7 @@ class ExportCsvTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -146,7 +146,7 @@ class ExportCsvTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -163,7 +163,7 @@ class ExportCsvTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -180,7 +180,7 @@ class ExportCsvTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -197,7 +197,7 @@ class ExportCsvTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -214,7 +214,7 @@ class ExportCsvTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -231,7 +231,7 @@ class ExportCsvTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem',
             $property
         );
 
@@ -243,7 +243,7 @@ class ExportCsvTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportHeader
      *
      * @return void
      */
@@ -420,7 +420,7 @@ class ExportCsvTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportFooter
      *
      * @return void
      */
@@ -432,7 +432,7 @@ class ExportCsvTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportDBHeader
      *
      * @return void
      */
@@ -444,7 +444,7 @@ class ExportCsvTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportDBFooter
      *
      * @return void
      */
@@ -456,7 +456,7 @@ class ExportCsvTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportDBCreate
      *
      * @return void
      */
@@ -468,7 +468,7 @@ class ExportCsvTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportData
      *
      * @return void
      */
diff --git a/test/classes/plugin/export/ExportExcelTest.php b/test/classes/plugin/export/ExportExcelTest.php
index 97f1341a4d..56db3037c0 100644
--- a/test/classes/plugin/export/ExportExcelTest.php
+++ b/test/classes/plugin/export/ExportExcelTest.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportExcel class
+ * tests for PhpMyAdmin\Plugins\Export\ExportExcel class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportExcel;
+use PhpMyAdmin\Plugins\Export\ExportExcel;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportExcel class
+ * tests for PhpMyAdmin\Plugins\Export\ExportExcel class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -43,22 +43,22 @@ class ExportExcelTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportExcel::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportExcel::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportExcel', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportExcel', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportExcel', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportExcel', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -85,7 +85,7 @@ class ExportExcelTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -98,7 +98,7 @@ class ExportExcelTest extends PMATestCase
         $generalOptions = $generalOptionsArray[0];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -112,7 +112,7 @@ class ExportExcelTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -129,7 +129,7 @@ class ExportExcelTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -146,7 +146,7 @@ class ExportExcelTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -163,7 +163,7 @@ class ExportExcelTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\SelectPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\SelectPropertyItem',
             $property
         );
 
@@ -189,7 +189,7 @@ class ExportExcelTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem',
             $property
         );
 
diff --git a/test/classes/plugin/export/ExportHtmlwordTest.php b/test/classes/plugin/export/ExportHtmlwordTest.php
index 320ba463aa..63af384f2f 100644
--- a/test/classes/plugin/export/ExportHtmlwordTest.php
+++ b/test/classes/plugin/export/ExportHtmlwordTest.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportHtmlword class
+ * tests for PhpMyAdmin\Plugins\Export\ExportHtmlword class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportHtmlword;
+use PhpMyAdmin\Plugins\Export\ExportHtmlword;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
@@ -13,7 +13,7 @@ require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportHtmlword class
+ * tests for PhpMyAdmin\Plugins\Export\ExportHtmlword class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -49,22 +49,22 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportHtmlword', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportHtmlword', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportHtmlword', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportHtmlword', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -95,7 +95,7 @@ class ExportHtmlwordTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -108,7 +108,7 @@ class ExportHtmlwordTest extends PMATestCase
         $generalOptions = $generalOptionsArray[0];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -127,7 +127,7 @@ class ExportHtmlwordTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem',
             $property
         );
 
@@ -148,7 +148,7 @@ class ExportHtmlwordTest extends PMATestCase
         $generalOptions = $generalOptionsArray[1];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -172,7 +172,7 @@ class ExportHtmlwordTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -189,7 +189,7 @@ class ExportHtmlwordTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -205,7 +205,7 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportHeader
      *
      * @return void
      */
@@ -262,7 +262,7 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportFooter
      *
      * @return void
      */
@@ -281,7 +281,7 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportDBHeader
      *
      * @return void
      */
@@ -300,7 +300,7 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportDBFooter
      *
      * @return void
      */
@@ -312,7 +312,7 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportDBCreate
      *
      * @return void
      */
@@ -324,7 +324,7 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportData
      *
      * @return void
      */
@@ -394,13 +394,13 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::getTableDefStandIn
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::getTableDefStandIn
      *
      * @return void
      */
     public function testGetTableDefStandIn()
     {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword')
             ->setMethods(array('formatOneColumnDefinition'))
             ->getMock();
 
@@ -450,13 +450,13 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::getTableDef
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::getTableDef
      *
      * @return void
      */
     public function testGetTableDef()
     {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword')
             ->setMethods(array('formatOneColumnDefinition'))
             ->getMock();
 
@@ -723,7 +723,7 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::getTriggers
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::getTriggers
      *
      * @return void
      */
@@ -749,7 +749,7 @@ class ExportHtmlwordTest extends PMATestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportHtmlword', 'getTriggers');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportHtmlword', 'getTriggers');
         $method->setAccessible(true);
         $result = $method->invoke($this->object, 'database', 'table');
 
@@ -763,7 +763,7 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportStructure
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportStructure
      *
      * @return void
      */
@@ -779,7 +779,7 @@ class ExportHtmlwordTest extends PMATestCase
             ->with('db', 'tbl')
             ->will($this->returnValue(1));
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword')
             ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
             ->getMock();
 
@@ -859,14 +859,14 @@ class ExportHtmlwordTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::formatOneColumnDefinition
+     * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::formatOneColumnDefinition
      *
      * @return void
      */
     public function testFormatOneColumnDefinition()
     {
         $method = new ReflectionMethod(
-            'PMA\libraries\plugins\export\ExportHtmlword', 'formatOneColumnDefinition'
+            'PhpMyAdmin\Plugins\Export\ExportHtmlword', 'formatOneColumnDefinition'
         );
         $method->setAccessible(true);
 
diff --git a/test/classes/plugin/export/ExportJsonTest.php b/test/classes/plugin/export/ExportJsonTest.php
index 8150456539..c037e96f91 100644
--- a/test/classes/plugin/export/ExportJsonTest.php
+++ b/test/classes/plugin/export/ExportJsonTest.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportJson class
+ * tests for PhpMyAdmin\Plugins\Export\ExportJson class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportJson;
+use PhpMyAdmin\Plugins\Export\ExportJson;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportJson class
+ * tests for PhpMyAdmin\Plugins\Export\ExportJson class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -48,22 +48,22 @@ class ExportJsonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportJson::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportJson::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportJson', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportJson', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportJson', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportJson', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -90,7 +90,7 @@ class ExportJsonTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -103,7 +103,7 @@ class ExportJsonTest extends PMATestCase
         $generalOptions = $generalOptionsArray[0];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -117,7 +117,7 @@ class ExportJsonTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem',
             $property
         );
 
@@ -129,7 +129,7 @@ class ExportJsonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportHeader
      *
      * @return void
      */
@@ -150,7 +150,7 @@ class ExportJsonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportFooter
      *
      * @return void
      */
@@ -166,7 +166,7 @@ class ExportJsonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportDBHeader
      *
      * @return void
      */
@@ -184,7 +184,7 @@ class ExportJsonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportDBFooter
      *
      * @return void
      */
@@ -196,7 +196,7 @@ class ExportJsonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportDBCreate
      *
      * @return void
      */
@@ -208,7 +208,7 @@ class ExportJsonTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportData
      *
      * @return void
      */
diff --git a/test/classes/plugin/export/ExportLatexTest.php b/test/classes/plugin/export/ExportLatexTest.php
index 046fc33c3f..e99fc217b2 100644
--- a/test/classes/plugin/export/ExportLatexTest.php
+++ b/test/classes/plugin/export/ExportLatexTest.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportLatex class
+ * tests for PhpMyAdmin\Plugins\Export\ExportLatex class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportLatex;
+use PhpMyAdmin\Plugins\Export\ExportLatex;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
@@ -13,7 +13,7 @@ require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportLatex class
+ * tests for PhpMyAdmin\Plugins\Export\ExportLatex class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -53,7 +53,7 @@ class ExportLatexTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportLatex::setProperties
      *
      * @return void
      */
@@ -63,16 +63,16 @@ class ExportLatexTest extends PMATestCase
         $GLOBALS['plugin_param']['single_table'] = false;
         $GLOBALS['cfgRelation']['mimework'] = true;
 
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportLatex', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportLatex', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportLatex', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportLatex', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -99,7 +99,7 @@ class ExportLatexTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -113,7 +113,7 @@ class ExportLatexTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -127,7 +127,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -144,7 +144,7 @@ class ExportLatexTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -163,7 +163,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem',
             $property
         );
 
@@ -185,7 +185,7 @@ class ExportLatexTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -209,7 +209,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -231,7 +231,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -253,7 +253,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -275,7 +275,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -292,7 +292,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -309,7 +309,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -327,7 +327,7 @@ class ExportLatexTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -351,7 +351,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -368,7 +368,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -390,7 +390,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -412,7 +412,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -434,7 +434,7 @@ class ExportLatexTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -464,7 +464,7 @@ class ExportLatexTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportHeader
      *
      * @return void
      */
@@ -487,7 +487,7 @@ class ExportLatexTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportFooter
      *
      * @return void
      */
@@ -499,7 +499,7 @@ class ExportLatexTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportDBHeader
      *
      * @return void
      */
@@ -517,7 +517,7 @@ class ExportLatexTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportDBFooter
      *
      * @return void
      */
@@ -529,7 +529,7 @@ class ExportLatexTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportDBCreate
      *
      * @return void
      */
@@ -541,7 +541,7 @@ class ExportLatexTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportData
      *
      * @return void
      */
@@ -655,13 +655,13 @@ class ExportLatexTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportStructure
+     * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportStructure
      *
      * @return void
      */
     public function testExportStructure()
     {
-        // $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword')
+        // $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword')
         //     ->setMethods(array('formatOneColumnDefinition'))
         //     ->getMock();
 
@@ -973,7 +973,7 @@ class ExportLatexTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::texEscape
+     * Test for PhpMyAdmin\Plugins\Export\ExportLatex::texEscape
      *
      * @return void
      */
diff --git a/test/classes/plugin/export/ExportMediawikiTest.php b/test/classes/plugin/export/ExportMediawikiTest.php
index 7cc415bde4..e5e490f58b 100644
--- a/test/classes/plugin/export/ExportMediawikiTest.php
+++ b/test/classes/plugin/export/ExportMediawikiTest.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportMediawiki class
+ * tests for PhpMyAdmin\Plugins\Export\ExportMediawiki class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportMediawiki;
+use PhpMyAdmin\Plugins\Export\ExportMediawiki;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportMediawiki class
+ * tests for PhpMyAdmin\Plugins\Export\ExportMediawiki class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -48,22 +48,22 @@ class ExportMediawikiTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportMediawiki', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportMediawiki', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportMediawiki', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportMediawiki', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -90,7 +90,7 @@ class ExportMediawikiTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -103,7 +103,7 @@ class ExportMediawikiTest extends PMATestCase
         $generalOptions = $generalOptionsArray[0];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -122,7 +122,7 @@ class ExportMediawikiTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertySubgroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup',
             $property
         );
 
@@ -139,7 +139,7 @@ class ExportMediawikiTest extends PMATestCase
         $sgHeader = $property->getSubGroupHeader();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem',
             $sgHeader
         );
 
@@ -160,7 +160,7 @@ class ExportMediawikiTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -177,7 +177,7 @@ class ExportMediawikiTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -193,7 +193,7 @@ class ExportMediawikiTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportHeader
      *
      * @return void
      */
@@ -205,7 +205,7 @@ class ExportMediawikiTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportFooter
      *
      * @return void
      */
@@ -217,7 +217,7 @@ class ExportMediawikiTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportDBHeader
      *
      * @return void
      */
@@ -229,7 +229,7 @@ class ExportMediawikiTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportDBFooter
      *
      * @return void
      */
@@ -241,7 +241,7 @@ class ExportMediawikiTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportDBCreate
      *
      * @return void
      */
@@ -343,7 +343,7 @@ class ExportMediawikiTest extends PMATestCase
         */
     }
     /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportData
      *
      * @return void
      */
diff --git a/test/classes/plugin/export/ExportOdsTest.php b/test/classes/plugin/export/ExportOdsTest.php
index 3ce45b9a0d..52887dbd6f 100644
--- a/test/classes/plugin/export/ExportOdsTest.php
+++ b/test/classes/plugin/export/ExportOdsTest.php
@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportOds class
+ * tests for PhpMyAdmin\Plugins\Export\ExportOds class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportOds;
+use PhpMyAdmin\Plugins\Export\ExportOds;
 
-//ExportOds required because of initialisation inside
-require_once 'libraries/plugins/export/ExportOds.php';
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportOds class
+ * tests for PhpMyAdmin\Plugins\Export\ExportOds class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -50,22 +48,22 @@ class ExportOdsTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOds::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportOds::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportOds', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportOds', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportOds', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportOds', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -96,7 +94,7 @@ class ExportOdsTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -109,7 +107,7 @@ class ExportOdsTest extends PMATestCase
         $generalOptions = $generalOptionsArray[0];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -123,7 +121,7 @@ class ExportOdsTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -140,7 +138,7 @@ class ExportOdsTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -157,7 +155,7 @@ class ExportOdsTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem',
             $property
         );
 
@@ -169,7 +167,7 @@ class ExportOdsTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportHeader
      *
      * @return void
      */
@@ -185,7 +183,7 @@ class ExportOdsTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportFooter
      *
      * @return void
      */
@@ -222,7 +220,7 @@ class ExportOdsTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportDBHeader
      *
      * @return void
      */
@@ -234,7 +232,7 @@ class ExportOdsTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportDBFooter
      *
      * @return void
      */
@@ -246,7 +244,7 @@ class ExportOdsTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportDBCreate
      *
      * @return void
      */
@@ -258,7 +256,7 @@ class ExportOdsTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportData
      *
      * @return void
      */
@@ -383,7 +381,7 @@ class ExportOdsTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportData
      *
      * @return void
      */
diff --git a/test/classes/plugin/export/ExportOdtTest.php b/test/classes/plugin/export/ExportOdtTest.php
index 1aa201d635..5a31144706 100644
--- a/test/classes/plugin/export/ExportOdtTest.php
+++ b/test/classes/plugin/export/ExportOdtTest.php
@@ -1,21 +1,19 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportOdt class
+ * tests for PhpMyAdmin\Plugins\Export\ExportOdt class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportOdt;
+use PhpMyAdmin\Plugins\Export\ExportOdt;
 
-//ExportOdt required because of initialisation inside
-require_once 'libraries/plugins/export/ExportOdt.php';
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportOdt class
+ * tests for PhpMyAdmin\Plugins\Export\ExportOdt class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -55,7 +53,7 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::setProperties
      *
      * @return void
      */
@@ -65,16 +63,16 @@ class ExportOdtTest extends PMATestCase
         $GLOBALS['plugin_param']['single_table'] = false;
         $GLOBALS['cfgRelation']['mimework'] = true;
 
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportOdt', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportOdt', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportOdt', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportOdt', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -105,7 +103,7 @@ class ExportOdtTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -119,7 +117,7 @@ class ExportOdtTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -138,7 +136,7 @@ class ExportOdtTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem',
             $property
         );
 
@@ -159,7 +157,7 @@ class ExportOdtTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -183,7 +181,7 @@ class ExportOdtTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -200,7 +198,7 @@ class ExportOdtTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -217,7 +215,7 @@ class ExportOdtTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -235,7 +233,7 @@ class ExportOdtTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -259,7 +257,7 @@ class ExportOdtTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -276,7 +274,7 @@ class ExportOdtTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -306,7 +304,7 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportHeader
      *
      * @return void
      */
@@ -327,7 +325,7 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportFooter
      *
      * @return void
      */
@@ -354,7 +352,7 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportDBHeader
      *
      * @return void
      */
@@ -378,7 +376,7 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportDBFooter
      *
      * @return void
      */
@@ -390,7 +388,7 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportDBCreate
      *
      * @return void
      */
@@ -402,7 +400,7 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportData
      *
      * @return void
      */
@@ -498,7 +496,7 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportData
      *
      * @return void
      */
@@ -623,7 +621,7 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::getTableDefStandIn
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::getTableDefStandIn
      *
      * @return void
      */
@@ -640,7 +638,7 @@ class ExportOdtTest extends PMATestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportOdt')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportOdt')
             ->disableOriginalConstructor()
             ->setMethods(array('formatOneColumnDefinition'))
             ->getMock();
@@ -672,13 +670,13 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::getTableDef
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::getTableDef
      *
      * @return void
      */
     public function testGetTableDef()
     {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportOdt')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportOdt')
             ->setMethods(array('formatOneColumnDefinition'))
             ->getMock();
 
@@ -866,7 +864,7 @@ class ExportOdtTest extends PMATestCase
     }
 
      /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::getTriggers
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::getTriggers
      *
      * @return void
      */
@@ -892,7 +890,7 @@ class ExportOdtTest extends PMATestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportOdt', 'getTriggers');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportOdt', 'getTriggers');
         $method->setAccessible(true);
         $result = $method->invoke($this->object, 'database', 'ta<ble');
 
@@ -927,7 +925,7 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportStructure
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportStructure
      *
      * @return void
      */
@@ -943,7 +941,7 @@ class ExportOdtTest extends PMATestCase
             ->with('db', 't&bl')
             ->will($this->returnValue(1));
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportOdt')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportOdt')
             ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
             ->getMock();
 
@@ -1031,14 +1029,14 @@ class ExportOdtTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::formatOneColumnDefinition
+     * Test for PhpMyAdmin\Plugins\Export\ExportOdt::formatOneColumnDefinition
      *
      * @return void
      */
     public function testFormatOneColumnDefinition()
     {
         $method = new ReflectionMethod(
-            'PMA\libraries\plugins\export\ExportOdt', 'formatOneColumnDefinition'
+            'PhpMyAdmin\Plugins\Export\ExportOdt', 'formatOneColumnDefinition'
         );
         $method->setAccessible(true);
 
diff --git a/test/classes/plugin/export/ExportPdfTest.php b/test/classes/plugin/export/ExportPdfTest.php
index 9bc4676326..c588bcba35 100644
--- a/test/classes/plugin/export/ExportPdfTest.php
+++ b/test/classes/plugin/export/ExportPdfTest.php
@@ -1,19 +1,19 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportPdf class
+ * tests for PhpMyAdmin\Plugins\Export\ExportPdf class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportPdf;
-use PMA\libraries\plugins\export\helpers\Pdf;
+use PhpMyAdmin\Plugins\Export\ExportPdf;
+use PhpMyAdmin\Plugins\Export\Helpers\Pdf;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportPdf class
+ * tests for PhpMyAdmin\Plugins\Export\ExportPdf class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -49,22 +49,22 @@ class ExportPdfTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportPdf::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportPdf', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportPdf', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -95,7 +95,7 @@ class ExportPdfTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -109,7 +109,7 @@ class ExportPdfTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -123,7 +123,7 @@ class ExportPdfTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -135,7 +135,7 @@ class ExportPdfTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -154,7 +154,7 @@ class ExportPdfTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem',
             $property
         );
 
@@ -175,13 +175,13 @@ class ExportPdfTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportHeader
      *
      * @return void
      */
     public function testExportHeader()
     {
-        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\helpers\Pdf')
+        $pdf = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\Helpers\Pdf')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -194,7 +194,7 @@ class ExportPdfTest extends PMATestCase
         $pdf->expects($this->once())
             ->method('setTopMargin');
 
-        $attrPdf = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', '_pdf');
+        $attrPdf = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportPdf', '_pdf');
         $attrPdf->setAccessible(true);
         $attrPdf->setValue($this->object, $pdf);
 
@@ -204,20 +204,20 @@ class ExportPdfTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportFooter
      *
      * @return void
      */
     public function testExportFooter()
     {
-        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\helpers\Pdf')
+        $pdf = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\Helpers\Pdf')
             ->disableOriginalConstructor()
             ->getMock();
 
         $pdf->expects($this->once())
             ->method('getPDFData');
 
-        $attrPdf = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', '_pdf');
+        $attrPdf = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportPdf', '_pdf');
         $attrPdf->setAccessible(true);
         $attrPdf->setValue($this->object, $pdf);
 
@@ -227,7 +227,7 @@ class ExportPdfTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportDBHeader
      *
      * @return void
      */
@@ -239,7 +239,7 @@ class ExportPdfTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportDBFooter
      *
      * @return void
      */
@@ -251,7 +251,7 @@ class ExportPdfTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportDBCreate
      *
      * @return void
      */
@@ -263,13 +263,13 @@ class ExportPdfTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportData
      *
      * @return void
      */
     public function testExportData()
     {
-        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\helpers\Pdf')
+        $pdf = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\Helpers\Pdf')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -287,7 +287,7 @@ class ExportPdfTest extends PMATestCase
             ->method('mysqlReport')
             ->with('SELECT');
 
-        $attrPdf = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', '_pdf');
+        $attrPdf = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportPdf', '_pdf');
         $attrPdf->setAccessible(true);
         $attrPdf->setValue($this->object, $pdf);
 
@@ -300,39 +300,39 @@ class ExportPdfTest extends PMATestCase
 
     /**
      * Test for
-     *     - PMA\libraries\plugins\export\ExportPdf::_setPdf
-     *     - PMA\libraries\plugins\export\ExportPdf::_getPdf
+     *     - PhpMyAdmin\Plugins\Export\ExportPdf::_setPdf
+     *     - PhpMyAdmin\Plugins\Export\ExportPdf::_getPdf
      *
      * @return void
      */
     public function testSetGetPdf()
     {
-        $setter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_setPdf');
+        $setter = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportPdf', '_setPdf');
         $setter->setAccessible(true);
         $setter->invoke($this->object, new Pdf);
 
-        $getter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_getPdf');
+        $getter = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportPdf', '_getPdf');
         $getter->setAccessible(true);
         $this->assertInstanceOf(
-            'PMA\libraries\plugins\export\helpers\Pdf',
+            'PhpMyAdmin\Plugins\Export\Helpers\Pdf',
             $getter->invoke($this->object)
         );
     }
 
     /**
      * Test for
-     *     - PMA\libraries\plugins\export\ExportPdf::_setPdfReportTitle
-     *     - PMA\libraries\plugins\export\ExportPdf::_getPdfReportTitle
+     *     - PhpMyAdmin\Plugins\Export\ExportPdf::_setPdfReportTitle
+     *     - PhpMyAdmin\Plugins\Export\ExportPdf::_getPdfReportTitle
      *
      * @return void
      */
     public function testSetGetPdfTitle()
     {
-        $setter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_setPdfReportTitle');
+        $setter = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportPdf', '_setPdfReportTitle');
         $setter->setAccessible(true);
         $setter->invoke($this->object, "title");
 
-        $getter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_getPdfReportTitle');
+        $getter = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportPdf', '_getPdfReportTitle');
         $getter->setAccessible(true);
         $this->assertEquals(
             'title',
diff --git a/test/classes/plugin/export/ExportPhparrayTest.php b/test/classes/plugin/export/ExportPhparrayTest.php
index 2c603c59c8..90533317cb 100644
--- a/test/classes/plugin/export/ExportPhparrayTest.php
+++ b/test/classes/plugin/export/ExportPhparrayTest.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportPhparray class
+ * tests for PhpMyAdmin\Plugins\Export\ExportPhparray class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportPhparray;
+use PhpMyAdmin\Plugins\Export\ExportPhparray;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportPhparray class
+ * tests for PhpMyAdmin\Plugins\Export\ExportPhparray class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -48,22 +48,22 @@ class ExportPhparrayTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportPhparray', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportPhparray', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportPhparray', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportPhparray', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -90,7 +90,7 @@ class ExportPhparrayTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -103,7 +103,7 @@ class ExportPhparrayTest extends PMATestCase
         $generalOptions = $generalOptionsArray[0];
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -117,13 +117,13 @@ class ExportPhparrayTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem',
             $property
         );
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportHeader
      *
      * @return void
      */
@@ -144,7 +144,7 @@ class ExportPhparrayTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportFooter
      *
      * @return void
      */
@@ -156,7 +156,7 @@ class ExportPhparrayTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportDBHeader
      *
      * @return void
      */
@@ -177,7 +177,7 @@ class ExportPhparrayTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportDBFooter
      *
      * @return void
      */
@@ -189,7 +189,7 @@ class ExportPhparrayTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportDBCreate
      *
      * @return void
      */
@@ -201,7 +201,7 @@ class ExportPhparrayTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportData
      *
      * @return void
      */
diff --git a/test/classes/plugin/export/ExportSqlTest.php b/test/classes/plugin/export/ExportSqlTest.php
index 0036b2e457..490663ef6c 100644
--- a/test/classes/plugin/export/ExportSqlTest.php
+++ b/test/classes/plugin/export/ExportSqlTest.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportSql class
+ * tests for PhpMyAdmin\Plugins\Export\ExportSql class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportSql;
+use PhpMyAdmin\Plugins\Export\ExportSql;
 use PhpMyAdmin\Table;
 
 require_once 'libraries/export.lib.php';
@@ -14,7 +14,7 @@ require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportSql class
+ * tests for PhpMyAdmin\Plugins\Export\ExportSql class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -55,7 +55,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::setProperties
      *
      * @return void
      * @group medium
@@ -67,11 +67,11 @@ class ExportSqlTest extends PMATestCase
         $GLOBALS['plugin_param']['single_table'] = false;
         $GLOBALS['cfgRelation']['mimework'] = true;
 
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportSql', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportSql', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportSql', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
@@ -101,7 +101,7 @@ class ExportSqlTest extends PMATestCase
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -113,7 +113,7 @@ class ExportSqlTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -122,7 +122,7 @@ class ExportSqlTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -131,12 +131,12 @@ class ExportSqlTest extends PMATestCase
         $property = array_shift($properties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertySubgroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup',
             $property
         );
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property->getSubgroupHeader()
         );
 
@@ -144,55 +144,55 @@ class ExportSqlTest extends PMATestCase
 
         $leaf = array_shift($leaves);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $leaf
         );
 
         $leaf = array_shift($leaves);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $leaf
         );
 
         $leaf = array_shift($leaves);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $leaf
         );
 
         $leaf = array_shift($leaves);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $leaf
         );
 
         $property = array_shift($properties);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
         $property = array_shift($properties);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
         $property = array_shift($properties);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
         $property = array_shift($properties);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
         $property = array_shift($properties);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\SelectPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\SelectPropertyItem',
             $property
         );
 
@@ -206,19 +206,19 @@ class ExportSqlTest extends PMATestCase
 
         $property = array_shift($properties);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertySubgroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup',
             $property
         );
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem',
             $property->getSubgroupHeader()
         );
 
         $structureOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $structureOptions
         );
 
@@ -227,12 +227,12 @@ class ExportSqlTest extends PMATestCase
         $property = array_shift($properties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertySubgroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup',
             $property
         );
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\MessageOnlyPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem',
             $property->getSubgroupHeader()
         );
 
@@ -240,13 +240,13 @@ class ExportSqlTest extends PMATestCase
 
         $leaf = array_shift($leaves);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $leaf
         );
 
         $leaf = array_shift($leaves);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $leaf
         );
 
@@ -258,7 +258,7 @@ class ExportSqlTest extends PMATestCase
 
         $leaf = array_shift($leaves);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertySubgroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup',
             $leaf
         );
 
@@ -268,37 +268,37 @@ class ExportSqlTest extends PMATestCase
         );
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $leaf->getSubgroupHeader()
         );
 
         $leaf = array_shift($leaves);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $leaf
         );
 
         $leaf = array_shift($leaves);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $leaf
         );
 
         $leaf = array_shift($leaves);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $leaf
         );
 
         $property = array_shift($properties);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
         $dataOptions = array_shift($generalOptionsArray);
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $dataOptions
         );
 
@@ -316,7 +316,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportRoutines
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportRoutines
      *
      * @return void
      */
@@ -366,13 +366,13 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::_exportComment
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::_exportComment
      *
      * @return void
      */
     public function testExportComment()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_exportComment');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportSql', '_exportComment');
         $method->setAccessible(true);
 
         $GLOBALS['crlf'] = '##';
@@ -404,13 +404,13 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::_possibleCRLF
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::_possibleCRLF
      *
      * @return void
      */
     public function testPossibleCRLF()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_possibleCRLF');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportSql', '_possibleCRLF');
         $method->setAccessible(true);
 
         $GLOBALS['crlf'] = '##';
@@ -442,7 +442,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportFooter
      *
      * @return void
      */
@@ -476,7 +476,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportHeader
      *
      * @return void
      */
@@ -553,7 +553,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportDBCreate
      *
      * @return void
      */
@@ -643,7 +643,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportDBHeader
      *
      * @return void
      */
@@ -682,7 +682,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportEvents
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportEvents
      *
      * @return void
      */
@@ -748,7 +748,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportDBFooter
      *
      * @return void
      */
@@ -780,7 +780,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::getTableDefStandIn
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::getTableDefStandIn
      *
      * @return void
      */
@@ -820,7 +820,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::_getTableDefForView
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::_getTableDefForView
      *
      * @return void
      */
@@ -856,7 +856,7 @@ class ExportSqlTest extends PMATestCase
         $GLOBALS['dbi'] = $dbi;
         $GLOBALS['sql_compatibility'] = 'MSSQL';
 
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_getTableDefForView');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportSql', '_getTableDefForView');
         $method->setAccessible(true);
         $result = $method->invoke(
             $this->object, 'db', 'view', "\n"
@@ -910,7 +910,7 @@ class ExportSqlTest extends PMATestCase
 
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::getTableDef
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::getTableDef
      *
      * @return void
      * @group medium
@@ -1078,7 +1078,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::getTableDef
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::getTableDef
      *
      * @return void
      */
@@ -1162,7 +1162,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::_getTableComments
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::_getTableComments
      *
      * @return void
      */
@@ -1207,7 +1207,7 @@ class ExportSqlTest extends PMATestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_getTableComments');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportSql', '_getTableComments');
         $method->setAccessible(true);
         $result = $method->invoke(
             $this->object, 'db', '', "\n", true, true
@@ -1229,7 +1229,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportStructure
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportStructure
      *
      * @return void
      * @group medium
@@ -1254,7 +1254,7 @@ class ExportSqlTest extends PMATestCase
                 )
             );
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportSql')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportSql')
             ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
             ->getMock();
 
@@ -1402,7 +1402,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportData
      *
      * @return void
      * @group medium
@@ -1550,7 +1550,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportData
      *
      * @return void
      * @group medium
@@ -1659,7 +1659,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportData
      *
      * @return void
     */
@@ -1715,7 +1715,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportData
      *
      * @return void
     */
@@ -1764,7 +1764,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::_makeCreateTableMSSQLCompatible
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::_makeCreateTableMSSQLCompatible
      *
      * @return void
      */
@@ -1789,7 +1789,7 @@ class ExportSqlTest extends PMATestCase
             " \" double NOT NULL DEFAULT '213'\n";
 
         $method = new ReflectionMethod(
-            'PMA\libraries\plugins\export\ExportSql', '_makeCreateTableMSSQLCompatible'
+            'PhpMyAdmin\Plugins\Export\ExportSql', '_makeCreateTableMSSQLCompatible'
         );
         $method->setAccessible(true);
         $result = $method->invoke(
@@ -1821,7 +1821,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::initAlias
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::initAlias
      *
      * @return void
     */
@@ -1863,7 +1863,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::getAlias
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::getAlias
      *
      * @return void
     */
@@ -1908,7 +1908,7 @@ class ExportSqlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportSql::replaceWithAlias
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::replaceWithAlias
      *
      * @return void
     */
diff --git a/test/classes/plugin/export/ExportTexytextTest.php b/test/classes/plugin/export/ExportTexytextTest.php
index 61aafb9f3c..e0ee14ac8f 100644
--- a/test/classes/plugin/export/ExportTexytextTest.php
+++ b/test/classes/plugin/export/ExportTexytextTest.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportTexytext class
+ * tests for PhpMyAdmin\Plugins\Export\ExportTexytext class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportTexytext;
+use PhpMyAdmin\Plugins\Export\ExportTexytext;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
@@ -13,7 +13,7 @@ require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportTexytext class
+ * tests for PhpMyAdmin\Plugins\Export\ExportTexytext class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -52,22 +52,22 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportTexytext', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportTexytext', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportTexytext', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportTexytext', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -89,7 +89,7 @@ class ExportTexytextTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -103,7 +103,7 @@ class ExportTexytextTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -122,14 +122,14 @@ class ExportTexytextTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem',
             $property
         );
 
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -143,7 +143,7 @@ class ExportTexytextTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
@@ -155,7 +155,7 @@ class ExportTexytextTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\TextPropertyItem',
             $property
         );
 
@@ -166,7 +166,7 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportHeader
      *
      * @return void
      */
@@ -178,7 +178,7 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportFooter
      *
      * @return void
      */
@@ -190,7 +190,7 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportDBHeader
      *
      * @return void
      */
@@ -205,7 +205,7 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportDBFooter
      *
      * @return void
      */
@@ -217,7 +217,7 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportDBCreate
      *
      * @return void
      */
@@ -229,7 +229,7 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportData
      *
      * @return void
      */
@@ -292,7 +292,7 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::getTableDefStandIn
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::getTableDefStandIn
      *
      * @return void
      */
@@ -329,7 +329,7 @@ class ExportTexytextTest extends PMATestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportTexytext')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportTexytext')
             ->disableOriginalConstructor()
             ->setMethods(array('formatOneColumnDefinition'))
             ->getMock();
@@ -353,13 +353,13 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::getTableDef
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::getTableDef
      *
      * @return void
      */
     public function testGetTableDef()
     {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportTexytext')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportTexytext')
             ->setMethods(array('formatOneColumnDefinition'))
             ->getMock();
         $GLOBALS['controllink'] = null;
@@ -457,7 +457,7 @@ class ExportTexytextTest extends PMATestCase
     }
 
      /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::getTriggers
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::getTriggers
      *
      * @return void
      */
@@ -498,7 +498,7 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportStructure
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportStructure
      *
      * @return void
      */
@@ -514,7 +514,7 @@ class ExportTexytextTest extends PMATestCase
             ->with('db', 't&bl')
             ->will($this->returnValue(1));
 
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportTexytext')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportTexytext')
             ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
             ->getMock();
 
@@ -601,7 +601,7 @@ class ExportTexytextTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::formatOneColumnDefinition
+     * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::formatOneColumnDefinition
      *
      * @return void
      */
diff --git a/test/classes/plugin/export/ExportXmlTest.php b/test/classes/plugin/export/ExportXmlTest.php
index 1733a75129..c9c18ecef5 100644
--- a/test/classes/plugin/export/ExportXmlTest.php
+++ b/test/classes/plugin/export/ExportXmlTest.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportXml class
+ * tests for PhpMyAdmin\Plugins\Export\ExportXml class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportXml;
+use PhpMyAdmin\Plugins\Export\ExportXml;
 use PhpMyAdmin\Table;
 
 $GLOBALS['db'] = 'db';
@@ -15,7 +15,7 @@ require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportXml class
+ * tests for PhpMyAdmin\Plugins\Export\ExportXml class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -54,23 +54,23 @@ class ExportXmlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportXml::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportXml::setProperties
      *
      * @return void
      * @group medium
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportXml', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportXml', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportXml', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportXml', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -92,7 +92,7 @@ class ExportXmlTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -106,7 +106,7 @@ class ExportXmlTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -120,14 +120,14 @@ class ExportXmlTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem',
             $property
         );
 
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -141,42 +141,42 @@ class ExportXmlTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
 
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -190,13 +190,13 @@ class ExportXmlTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem',
             $property
         );
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportHeader
      *
      * @return void
      * @group medium
@@ -377,7 +377,7 @@ class ExportXmlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportFooter
      *
      * @return void
      */
@@ -392,7 +392,7 @@ class ExportXmlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportDBHeader
      *
      * @return void
      */
@@ -419,7 +419,7 @@ class ExportXmlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportDBFooter
      *
      * @return void
      */
@@ -446,7 +446,7 @@ class ExportXmlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportDBCreate
      *
      * @return void
      */
@@ -458,7 +458,7 @@ class ExportXmlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportData
      *
      * @return void
      */
diff --git a/test/classes/plugin/export/ExportYamlTest.php b/test/classes/plugin/export/ExportYamlTest.php
index b681a5d974..e971d247ac 100644
--- a/test/classes/plugin/export/ExportYamlTest.php
+++ b/test/classes/plugin/export/ExportYamlTest.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\ExportYaml class
+ * tests for PhpMyAdmin\Plugins\Export\ExportYaml class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\ExportYaml;
+use PhpMyAdmin\Plugins\Export\ExportYaml;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
@@ -13,7 +13,7 @@ require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\ExportYaml class
+ * tests for PhpMyAdmin\Plugins\Export\ExportYaml class
  *
  * @package PhpMyAdmin-test
  * @group medium
@@ -50,22 +50,22 @@ class ExportYamlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::setProperties
+     * Test for PhpMyAdmin\Plugins\Export\ExportYaml::setProperties
      *
      * @return void
      */
     public function testSetProperties()
     {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportYaml', 'setProperties');
+        $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportYaml', 'setProperties');
         $method->setAccessible(true);
         $method->invoke($this->object, null);
 
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportYaml', 'properties');
+        $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportYaml', 'properties');
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
+            'PhpMyAdmin\Properties\Plugins\ExportPluginProperties',
             $properties
         );
 
@@ -87,7 +87,7 @@ class ExportYamlTest extends PMATestCase
         $options = $properties->getOptions();
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup',
             $options
         );
 
@@ -101,7 +101,7 @@ class ExportYamlTest extends PMATestCase
         $generalOptions = array_shift($generalOptionsArray);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
+            'PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup',
             $generalOptions
         );
 
@@ -115,13 +115,13 @@ class ExportYamlTest extends PMATestCase
         $property = array_shift($generalProperties);
 
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
+            'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem',
             $property
         );
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportHeader
      *
      * @return void
      */
@@ -140,7 +140,7 @@ class ExportYamlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportFooter
      *
      * @return void
      */
@@ -155,7 +155,7 @@ class ExportYamlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportDBHeader
+     * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportDBHeader
      *
      * @return void
      */
@@ -167,7 +167,7 @@ class ExportYamlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportDBFooter
+     * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportDBFooter
      *
      * @return void
      */
@@ -179,7 +179,7 @@ class ExportYamlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportDBCreate
+     * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportDBCreate
      *
      * @return void
      */
@@ -191,7 +191,7 @@ class ExportYamlTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportData
+     * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportData
      *
      * @return void
      */
diff --git a/test/classes/plugin/export/helpers/TablePropertyTest.php b/test/classes/plugin/export/helpers/TablePropertyTest.php
index 7bb29e23a7..f447934b4d 100644
--- a/test/classes/plugin/export/helpers/TablePropertyTest.php
+++ b/test/classes/plugin/export/helpers/TablePropertyTest.php
@@ -1,17 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\helpers\TableProperty class
+ * tests for PhpMyAdmin\Plugins\Export\Helpers\TableProperty class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\helpers\TableProperty;
+use PhpMyAdmin\Plugins\Export\Helpers\TableProperty;
 
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\helpers\TableProperty class
+ * tests for PhpMyAdmin\Plugins\Export\Helpers\TableProperty class
  *
  * @package PhpMyAdmin-test
  */
@@ -42,7 +42,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::__construct
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::__construct
      *
      * @return void
     */
@@ -80,7 +80,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::getPureType
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::getPureType
      *
      * @return void
     */
@@ -102,7 +102,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::isNotNull
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::isNotNull
      *
      * @param string $nullable nullable value
      * @param string $expected expected output
@@ -135,7 +135,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::isUnique
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::isUnique
      *
      * @param string $key      key value
      * @param string $expected expected output
@@ -170,7 +170,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::getDotNetPrimitiveType
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::getDotNetPrimitiveType
      *
      * @param string $type     type value
      * @param string $expected expected output
@@ -211,7 +211,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::getDotNetObjectType
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::getDotNetObjectType
      *
      * @param string $type     type value
      * @param string $expected expected output
@@ -252,7 +252,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::getIndexName
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::getIndexName
      *
      * @return void
      */
@@ -275,7 +275,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::isPK
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::isPK
      *
      * @return void
      */
@@ -295,7 +295,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::formatCs
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::formatCs
      *
      * @return void
     */
@@ -310,7 +310,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::formatXml
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::formatXml
      *
      * @return void
     */
@@ -325,7 +325,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\helpers\TableProperty::format
+     * Test for PhpMyAdmin\Plugins\Export\Helpers\TableProperty::format
      *
      * @return void
     */
diff --git a/test/classes/plugin/import/ImportCsvTest.php b/test/classes/plugin/import/ImportCsvTest.php
index e15444066d..8545aa0a41 100644
--- a/test/classes/plugin/import/ImportCsvTest.php
+++ b/test/classes/plugin/import/ImportCsvTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\plugins\import\ImportCsv class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportCsv class
  *
  * @package PhpMyAdmin-test
  */
@@ -9,7 +9,7 @@
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.lib.php' will use it globally
  */
-use PMA\libraries\plugins\import\ImportCsv;
+use PhpMyAdmin\Plugins\Import\ImportCsv;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\File;
 
@@ -23,7 +23,7 @@ require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\plugins\import\ImportCsv class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportCsv class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/plugin/import/ImportLdiTest.php b/test/classes/plugin/import/ImportLdiTest.php
index ee1c083264..201ce1abe6 100644
--- a/test/classes/plugin/import/ImportLdiTest.php
+++ b/test/classes/plugin/import/ImportLdiTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\plugins\import\ImportLdi class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportLdi class
  *
  * @package PhpMyAdmin-test
  */
@@ -9,7 +9,7 @@
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.lib.php' will use it globally
  */
-use PMA\libraries\plugins\import\ImportLdi;
+use PhpMyAdmin\Plugins\Import\ImportLdi;
 use PhpMyAdmin\File;
 
 $GLOBALS['server'] = 0;
@@ -23,7 +23,7 @@ require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\plugins\import\ImportLdi class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportLdi class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/plugin/import/ImportMediawikiTest.php b/test/classes/plugin/import/ImportMediawikiTest.php
index 404dcf2dda..3c1b0b5c20 100644
--- a/test/classes/plugin/import/ImportMediawikiTest.php
+++ b/test/classes/plugin/import/ImportMediawikiTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\plugins\import\ImportMediawiki class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportMediawiki class
  *
  * @package PhpMyAdmin-test
  */
@@ -8,7 +8,7 @@
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.lib.php' will use it globally
  */
-use PMA\libraries\plugins\import\ImportMediawiki;
+use PhpMyAdmin\Plugins\Import\ImportMediawiki;
 use PhpMyAdmin\File;
 
 $GLOBALS['server'] = 0;
@@ -21,7 +21,7 @@ require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\plugins\import\ImportMediawiki class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportMediawiki class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/plugin/import/ImportOdsTest.php b/test/classes/plugin/import/ImportOdsTest.php
index ec8ee66c1a..4b2b85013f 100644
--- a/test/classes/plugin/import/ImportOdsTest.php
+++ b/test/classes/plugin/import/ImportOdsTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\plugins\import\ImportOds class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportOds class
  *
  * @package PhpMyAdmin-test
  */
@@ -9,7 +9,7 @@
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.lib.php' will use it globally
  */
-use PMA\libraries\plugins\import\ImportOds;
+use PhpMyAdmin\Plugins\Import\ImportOds;
 use PhpMyAdmin\File;
 
 $GLOBALS['server'] = 0;
@@ -19,11 +19,10 @@ $GLOBALS['server'] = 0;
  */
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
-require_once 'libraries/plugins/import/ImportOds.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\plugins\import\ImportOds class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportOds class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/plugin/import/ImportShpTest.php b/test/classes/plugin/import/ImportShpTest.php
index 87c3a95dcd..51de09a478 100644
--- a/test/classes/plugin/import/ImportShpTest.php
+++ b/test/classes/plugin/import/ImportShpTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\plugins\import\ImportShp class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportShp class
  *
  * @package PhpMyAdmin-test
  */
@@ -9,7 +9,7 @@
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.lib.php' will use it globally
  */
-use PMA\libraries\plugins\import\ImportShp;
+use PhpMyAdmin\Plugins\Import\ImportShp;
 use PhpMyAdmin\File;
 
 $GLOBALS['server'] = 0;
@@ -19,7 +19,7 @@ require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\plugins\import\ImportShp class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportShp class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/plugin/import/ImportSqlTest.php b/test/classes/plugin/import/ImportSqlTest.php
index 077983fbee..ceae3f5f70 100644
--- a/test/classes/plugin/import/ImportSqlTest.php
+++ b/test/classes/plugin/import/ImportSqlTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\plugins\import\ImportSql class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportSql class
  *
  * @package PhpMyAdmin-test
  */
@@ -9,7 +9,7 @@
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.lib.php' will use it globally
  */
-use PMA\libraries\plugins\import\ImportSql;
+use PhpMyAdmin\Plugins\Import\ImportSql;
 use PhpMyAdmin\File;
 
 $GLOBALS['server'] = 0;
@@ -22,7 +22,7 @@ require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\plugins\import\ImportSql class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportSql class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/plugin/import/ImportXmlTest.php b/test/classes/plugin/import/ImportXmlTest.php
index d9b1d2c104..2b2475e8e8 100644
--- a/test/classes/plugin/import/ImportXmlTest.php
+++ b/test/classes/plugin/import/ImportXmlTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\plugins\import\ImportXml class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportXml class
  *
  * @package PhpMyAdmin-test
  */
@@ -9,7 +9,7 @@
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.lib.php' will use it globally
  */
-use PMA\libraries\plugins\import\ImportXml;
+use PhpMyAdmin\Plugins\Import\ImportXml;
 use PhpMyAdmin\File;
 
 $GLOBALS['server'] = 0;
@@ -22,7 +22,7 @@ require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\plugins\import\ImportXml class
+ * Tests for PhpMyAdmin\Plugins\Import\ImportXml class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/plugin/transformations/TransformationPluginsTest.php b/test/classes/plugin/transformations/TransformationPluginsTest.php
index 3c9d259cbb..568a65e594 100644
--- a/test/classes/plugin/transformations/TransformationPluginsTest.php
+++ b/test/classes/plugin/transformations/TransformationPluginsTest.php
@@ -5,23 +5,23 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\plugins\transformations\input\Image_JPEG_Upload;
-use PMA\libraries\plugins\transformations\input\Text_Plain_RegexValidation;
-use PMA\libraries\plugins\transformations\input\Text_Plain_FileUpload;
-use PMA\libraries\plugins\transformations\output\Application_Octetstream_Download;
-use PMA\libraries\plugins\transformations\output\Application_Octetstream_Hex;
-use PMA\libraries\plugins\transformations\output\Image_JPEG_Inline;
-use PMA\libraries\plugins\transformations\output\Image_JPEG_Link;
-use PMA\libraries\plugins\transformations\output\Image_PNG_Inline;
-use PMA\libraries\plugins\transformations\output\Text_Plain_Dateformat;
-use PMA\libraries\plugins\transformations\output\Text_Plain_External;
-use PMA\libraries\plugins\transformations\output\Text_Plain_Formatted;
-use PMA\libraries\plugins\transformations\output\Text_Plain_Imagelink;
-use PMA\libraries\plugins\transformations\output\Text_Plain_Sql;
-use PMA\libraries\plugins\transformations\Text_Plain_Link;
-use PMA\libraries\plugins\transformations\Text_Plain_Longtoipv4;
-use PMA\libraries\plugins\transformations\Text_Plain_PreApPend;
-use PMA\libraries\plugins\transformations\Text_Plain_Substring;
+use PhpMyAdmin\Plugins\Transformations\Input\Image_JPEG_Upload;
+use PhpMyAdmin\Plugins\Transformations\Input\Text_Plain_RegexValidation;
+use PhpMyAdmin\Plugins\Transformations\Input\Text_Plain_FileUpload;
+use PhpMyAdmin\Plugins\Transformations\Output\Application_Octetstream_Download;
+use PhpMyAdmin\Plugins\Transformations\Output\Application_Octetstream_Hex;
+use PhpMyAdmin\Plugins\Transformations\Output\Image_JPEG_Inline;
+use PhpMyAdmin\Plugins\Transformations\Output\Image_JPEG_Link;
+use PhpMyAdmin\Plugins\Transformations\Output\Image_PNG_Inline;
+use PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Dateformat;
+use PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_External;
+use PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Formatted;
+use PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Imagelink;
+use PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql;
+use PhpMyAdmin\Plugins\Transformations\Text_Plain_Link;
+use PhpMyAdmin\Plugins\Transformations\Text_Plain_Longtoipv4;
+use PhpMyAdmin\Plugins\Transformations\Text_Plain_PreApPend;
+use PhpMyAdmin\Plugins\Transformations\Text_Plain_Substring;
 
 /*
  * Include to test.
@@ -77,7 +77,7 @@ class TransformationPluginsTest extends PMATestCase
     public function multiDataProvider()
     {
         return array(
-            // Test data for PMA\libraries\plugins\transformations\input\Image_JPEG_Upload plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Input\Image_JPEG_Upload plugin
             array(
                 new Image_JPEG_Upload(),
                 'getName',
@@ -240,7 +240,7 @@ class TransformationPluginsTest extends PMATestCase
                     array(), 0, '', array(), '', 'ltr', 0, 0, 0
                 )
             ),
-            // Test data for PMA\libraries\plugins\transformations\output\Application_Octetstream_Download plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Output\Application_Octetstream_Download plugin
             array(
                 new Application_Octetstream_Download(),
                 'getName',
@@ -265,7 +265,7 @@ class TransformationPluginsTest extends PMATestCase
                 'getMIMESubtype',
                 'OctetStream'
             ),
-            // Test data for PMA\libraries\plugins\transformations\output\Application_Octetstream_Hex plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Output\Application_Octetstream_Hex plugin
             array(
                 new Application_Octetstream_Hex(),
                 'getName',
@@ -288,7 +288,7 @@ class TransformationPluginsTest extends PMATestCase
                 'getMIMESubtype',
                 'OctetStream'
             ),
-            // Test data for PMA\libraries\plugins\transformations\output\Image_JPEG_Inline plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Output\Image_JPEG_Inline plugin
             array(
                 new Image_JPEG_Inline(),
                 'getName',
@@ -310,7 +310,7 @@ class TransformationPluginsTest extends PMATestCase
                 'getMIMESubtype',
                 'JPEG'
             ),
-            // Test data for PMA\libraries\plugins\transformations\output\Image_JPEG_Link plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Output\Image_JPEG_Link plugin
             array(
                 new Image_JPEG_Link(),
                 'getName',
@@ -336,7 +336,7 @@ class TransformationPluginsTest extends PMATestCase
                 'applyTransformationNoWrap',
                 null
             ),
-            // Test data for PMA\libraries\plugins\transformations\output\Image_PNG_Inline plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Output\Image_PNG_Inline plugin
             array(
                 new Image_PNG_Inline(),
                 'getName',
@@ -358,7 +358,7 @@ class TransformationPluginsTest extends PMATestCase
                 'getMIMESubtype',
                 'PNG'
             ),
-            // Test data for PMA\libraries\plugins\transformations\output\Text_Plain_Dateformat plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Dateformat plugin
             array(
                 new Text_Plain_Dateformat(),
                 'getName',
@@ -387,7 +387,7 @@ class TransformationPluginsTest extends PMATestCase
                 'getMIMESubtype',
                 'Plain'
             ),
-            // Test data for PMA\libraries\plugins\transformations\output\Text_Plain_External plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_External plugin
             array(
                 new Text_Plain_External(),
                 'getName',
@@ -401,7 +401,7 @@ class TransformationPluginsTest extends PMATestCase
                 . ' data via standard input. Returns the standard output of the'
                 . ' application. The default is Tidy, to pretty-print HTML code.'
                 . ' For security reasons, you have to manually edit the file'
-                . ' libraries/plugins/transformations/output/Text_Plain_External'
+                . ' libraries/classes/Plugins/Transformations/Output/Text_Plain_External'
                 . '.php and list the tools you want to make available.'
                 . ' The first option is then the number of the program you want to'
                 . ' use and the second option is the parameters for the program.'
@@ -465,7 +465,7 @@ class TransformationPluginsTest extends PMATestCase
                     )
                 )
             ),
-            // Test data for PMA\libraries\plugins\transformations\output\Text_Plain_Formatted plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Formatted plugin
             array(
                 new Text_Plain_Formatted(),
                 'getName',
@@ -488,7 +488,7 @@ class TransformationPluginsTest extends PMATestCase
                 'getMIMESubtype',
                 'Plain'
             ),
-            // Test data for PMA\libraries\plugins\transformations\output\Text_Plain_Imagelink plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Imagelink plugin
             array(
                 new Text_Plain_Imagelink(),
                 'getName',
@@ -513,7 +513,7 @@ class TransformationPluginsTest extends PMATestCase
                 'getMIMESubtype',
                 'Plain'
             ),
-            // Test data for PMA\libraries\plugins\transformations\output\Text_Plain_Sql plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql plugin
             array(
                 new Text_Plain_Sql(),
                 'getName',
@@ -534,7 +534,7 @@ class TransformationPluginsTest extends PMATestCase
                 'getMIMESubtype',
                 'Plain'
             ),
-            // Test data for PMA\libraries\plugins\transformations\Text_Plain_Link plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Text_Plain_Link plugin
             array(
                 new Text_Plain_Link(),
                 'getName',
@@ -557,7 +557,7 @@ class TransformationPluginsTest extends PMATestCase
                 'getMIMESubtype',
                 'Plain'
             ),
-            // Test data for PMA\libraries\plugins\transformations\Text_Plain_Longtoipv4 plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Text_Plain_Longtoipv4 plugin
             array(
                 new Text_Plain_Longtoipv4(),
                 'getName',
@@ -602,7 +602,7 @@ class TransformationPluginsTest extends PMATestCase
                 'getMIMESubtype',
                 'Plain'
             ),
-            // Test data for PMA\libraries\plugins\transformations\Text_Plain_Substring plugin
+            // Test data for PhpMyAdmin\Plugins\Transformations\Text_Plain_Substring plugin
             array(
                 new Text_Plain_Substring(),
                 'getName',
diff --git a/test/classes/properties/PropertyItemTest.php b/test/classes/properties/PropertyItemTest.php
index 08e5606be0..66a41e9dad 100644
--- a/test/classes/properties/PropertyItemTest.php
+++ b/test/classes/properties/PropertyItemTest.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\properties\PropertyItem class
+ * tests for PhpMyAdmin\Properties\PropertyItem class
  *
  * @package PhpMyAdmin-test
  */
 
 /**
- * Tests for PMA\libraries\properties\PropertyItem class
+ * Tests for PhpMyAdmin\Properties\PropertyItem class
  *
  * @package PhpMyAdmin-test
  */
@@ -22,7 +22,7 @@ class PropertyItemTest extends PHPUnit_Framework_TestCase
      */
     protected function setup()
     {
-        $this->stub = $this->getMockForAbstractClass('PMA\libraries\properties\PropertyItem');
+        $this->stub = $this->getMockForAbstractClass('PhpMyAdmin\Properties\PropertyItem');
     }
 
     /**
@@ -36,7 +36,7 @@ class PropertyItemTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\PropertyItem::getGroup
+     * Test for PhpMyAdmin\Properties\PropertyItem::getGroup
      *
      * @return void
      */
diff --git a/test/classes/properties/options/OptionsPropertyGroupTest.php b/test/classes/properties/options/OptionsPropertyGroupTest.php
index 5bfcc3616e..217b650200 100644
--- a/test/classes/properties/options/OptionsPropertyGroupTest.php
+++ b/test/classes/properties/options/OptionsPropertyGroupTest.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\properties\options\OptionsPropertyGroup class
+ * tests for PhpMyAdmin\Properties\Options\OptionsPropertyGroup class
  *
  * @package PhpMyAdmin-test
  */
 
 /**
- * Tests for PMA\libraries\properties\options\OptionsPropertyGroup class
+ * Tests for PhpMyAdmin\Properties\Options\OptionsPropertyGroup class
  *
  * @package PhpMyAdmin-test
  */
@@ -22,7 +22,7 @@ class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
      */
     protected function setup()
     {
-        $this->stub = $this->getMockForAbstractClass('PMA\libraries\properties\options\OptionsPropertyGroup');
+        $this->stub = $this->getMockForAbstractClass('PhpMyAdmin\Properties\Options\OptionsPropertyGroup');
     }
 
     /**
@@ -36,13 +36,13 @@ class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyGroup::addProperty
+     * Test for PhpMyAdmin\Properties\Options\OptionsPropertyGroup::addProperty
      *
      * @return void
      */
     public function testAddProperty()
     {
-        $properties = new \ReflectionProperty('PMA\libraries\properties\options\OptionsPropertyGroup', '_properties');
+        $properties = new \ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
 
         $properties->setValue($this->stub, array(1, 2, 3));
@@ -60,13 +60,13 @@ class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyGroup::removeProperty
+     * Test for PhpMyAdmin\Properties\Options\OptionsPropertyGroup::removeProperty
      *
      * @return void
      */
     public function testRemoveProperty()
     {
-        $properties = new \ReflectionProperty('PMA\libraries\properties\options\OptionsPropertyGroup', '_properties');
+        $properties = new \ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
 
         $properties->setValue($this->stub, array(1, 2, 'test', 3));
@@ -83,26 +83,26 @@ class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyGroup::getGroup
+     * Test for PhpMyAdmin\Properties\Options\OptionsPropertyGroup::getGroup
      *
      * @return void
      */
     public function testGetGroup()
     {
         $this->assertInstanceOf(
-            'PMA\libraries\properties\options\OptionsPropertyGroup',
+            'PhpMyAdmin\Properties\Options\OptionsPropertyGroup',
             $this->stub->getGroup()
         );
     }
 
     /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyGroup::getProperties
+     * Test for PhpMyAdmin\Properties\Options\OptionsPropertyGroup::getProperties
      *
      * @return void
      */
     public function testGetProperties()
     {
-        $properties = new \ReflectionProperty('PMA\libraries\properties\options\OptionsPropertyGroup', '_properties');
+        $properties = new \ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
         $properties->setValue($this->stub, array(1, 2, 3));
 
@@ -113,13 +113,13 @@ class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyGroup::getProperties
+     * Test for PhpMyAdmin\Properties\Options\OptionsPropertyGroup::getProperties
      *
      * @return void
      */
     public function testGetNrOfProperties()
     {
-        $properties = new \ReflectionProperty('PMA\libraries\properties\options\OptionsPropertyGroup', '_properties');
+        $properties = new \ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
         $properties->setValue($this->stub, array(1, 2, 3));
 
diff --git a/test/classes/properties/options/OptionsPropertyItemTest.php b/test/classes/properties/options/OptionsPropertyItemTest.php
index 8ed3c26d6a..af5e801e9b 100644
--- a/test/classes/properties/options/OptionsPropertyItemTest.php
+++ b/test/classes/properties/options/OptionsPropertyItemTest.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\properties\options\OptionsPropertyItem class
+ * tests for PhpMyAdmin\Properties\Options\OptionsPropertyItem class
  *
  * @package PhpMyAdmin-test
  */
 
 /**
- * Tests for PMA\libraries\properties\options\OptionsPropertyItem class
+ * Tests for PhpMyAdmin\Properties\Options\OptionsPropertyItem class
  *
  * @package PhpMyAdmin-test
  */
@@ -22,7 +22,7 @@ class OptionsPropertyItemTest extends PHPUnit_Framework_TestCase
      */
     protected function setup()
     {
-        $this->stub = $this->getMockForAbstractClass('PMA\libraries\properties\options\OptionsPropertyItem');
+        $this->stub = $this->getMockForAbstractClass('PhpMyAdmin\Properties\Options\OptionsPropertyItem');
     }
 
     /**
@@ -37,8 +37,8 @@ class OptionsPropertyItemTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::getName
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::setName
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyItem::getName
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyItem::setName
      *
      * @return void
      */
@@ -54,8 +54,8 @@ class OptionsPropertyItemTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::getText
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::setText
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyItem::getText
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyItem::setText
      *
      * @return void
      */
@@ -71,8 +71,8 @@ class OptionsPropertyItemTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::getForce
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::setForce
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyItem::getForce
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyItem::setForce
      *
      * @return void
      */
@@ -87,7 +87,7 @@ class OptionsPropertyItemTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyItem::getPropertyType
+     * Test for PhpMyAdmin\Properties\Options\OptionsPropertyItem::getPropertyType
      *
      * @return void
      */
diff --git a/test/classes/properties/options/OptionsPropertyOneItemTest.php b/test/classes/properties/options/OptionsPropertyOneItemTest.php
index e312442198..f430e00350 100644
--- a/test/classes/properties/options/OptionsPropertyOneItemTest.php
+++ b/test/classes/properties/options/OptionsPropertyOneItemTest.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\properties\options\OptionsPropertyOneItem class
+ * tests for PhpMyAdmin\Properties\Options\OptionsPropertyOneItem class
  *
  * @package PhpMyAdmin-test
  */
 
 /**
- * Tests for PMA\libraries\properties\options\OptionsPropertyOneItem class
+ * Tests for PhpMyAdmin\Properties\Options\OptionsPropertyOneItem class
  *
  * @package PhpMyAdmin-test
  */
@@ -22,7 +22,7 @@ class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase
      */
     protected function setup()
     {
-        $this->stub = $this->getMockForAbstractClass('PMA\libraries\properties\options\OptionsPropertyOneItem');
+        $this->stub = $this->getMockForAbstractClass('PhpMyAdmin\Properties\Options\OptionsPropertyOneItem');
     }
 
     /**
@@ -37,8 +37,8 @@ class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::getValues
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::setValues
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem::getValues
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem::setValues
      *
      * @return void
      */
@@ -54,8 +54,8 @@ class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::getLen
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::setLen
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem::getLen
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem::setLen
      *
      * @return void
      */
@@ -71,8 +71,8 @@ class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::getForce
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::setForce
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem::getForce
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem::setForce
      *
      * @return void
      */
@@ -88,8 +88,8 @@ class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::getDoc
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::setDoc
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem::getDoc
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem::setDoc
      *
      * @return void
      */
@@ -105,8 +105,8 @@ class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::getSize
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::setSize
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem::getSize
+     *     - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem::setSize
      *
      * @return void
      */
diff --git a/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php b/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
index 5474c4d72c..ad7e682550 100644
--- a/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
+++ b/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
@@ -1,15 +1,15 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertyMainGroup class
+ * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
 
 /**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertyMainGroup class
+ * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup class
  *
  * @package PhpMyAdmin-test
  */
@@ -38,7 +38,7 @@ class OptionsPropertyMainGroupTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\groups\OptionsPropertyMainGroup::getItemType
+     * Test for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup::getItemType
      *
      * @return void
      */
diff --git a/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php b/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
index b52eb4e1ae..2cbca17c4b 100644
--- a/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
+++ b/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
@@ -1,15 +1,15 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertyRootGroup class
+ * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
 
 /**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertyRootGroup class
+ * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup class
  *
  * @package PhpMyAdmin-test
  */
@@ -38,7 +38,7 @@ class OptionsPropertyRootGroupTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\groups\OptionsPropertyRootGroup::getItemType
+     * Test for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup::getItemType
      *
      * @return void
      */
diff --git a/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php b/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
index b12f6257f4..4c3db9d8d2 100644
--- a/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
+++ b/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
@@ -1,15 +1,15 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertySubgroup class
+ * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
+use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup;
 
 /**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertySubgroup class
+ * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup class
  *
  * @package PhpMyAdmin-test
  */
@@ -38,7 +38,7 @@ class OptionsPropertySubgroupTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\groups\OptionsPropertySubgroup::getItemType
+     * Test for PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup::getItemType
      *
      * @return void
      */
@@ -52,8 +52,8 @@ class OptionsPropertySubgroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\options\groups\OptionsPropertySubgroup::getSubgroupHeader
-     *     - PMA\libraries\properties\options\groups\OptionsPropertySubgroup::setSubgroupHeader
+     *     - PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup::getSubgroupHeader
+     *     - PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup::setSubgroupHeader
      *
      * @return void
      */
diff --git a/test/classes/properties/options/items/PropertyItemsTest.php b/test/classes/properties/options/items/PropertyItemsTest.php
index 04317210e9..f1dce1ffa2 100644
--- a/test/classes/properties/options/items/PropertyItemsTest.php
+++ b/test/classes/properties/options/items/PropertyItemsTest.php
@@ -1,28 +1,28 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for *PMA\libraries\properties\PropertyItem class
+ * tests for *PhpMyAdmin\Properties\PropertyItem class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\DocPropertyItem;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\items\MessageOnlyPropertyItem;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\DocPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
+use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
 
 /**
- * tests for *PMA\libraries\properties\PropertyItem class
+ * tests for *PhpMyAdmin\Properties\PropertyItem class
  *
  * @package PhpMyAdmin-test
  */
 class PropertyItemsTest extends PHPUnit_Framework_TestCase
 {
     /**
-     * Test for PMA\libraries\properties\options\items\BoolPropertyItem::getText
+     * Test for PhpMyAdmin\Properties\Options\Items\BoolPropertyItem::getText
      *
      * @return void
      */
@@ -44,7 +44,7 @@ class PropertyItemsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\items\BoolPropertyItem::getName
+     * Test for PhpMyAdmin\Properties\Options\Items\BoolPropertyItem::getName
      *
      * @return void
      */
@@ -66,7 +66,7 @@ class PropertyItemsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\items\BoolPropertyItem::getItemType
+     * Test for PhpMyAdmin\Properties\Options\Items\BoolPropertyItem::getItemType
      *
      * @return void
      */
@@ -81,7 +81,7 @@ class PropertyItemsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\items\DocPropertyItem::getItemType
+     * Test for PhpMyAdmin\Properties\Options\Items\DocPropertyItem::getItemType
      *
      * @return void
      */
@@ -96,7 +96,7 @@ class PropertyItemsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\items\HiddenPropertyItem::getItemType
+     * Test for PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem::getItemType
      *
      * @return void
      */
@@ -111,7 +111,7 @@ class PropertyItemsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\items\MessageOnlyPropertyItem::getItemType
+     * Test for PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem::getItemType
      *
      * @return void
      */
@@ -126,7 +126,7 @@ class PropertyItemsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\items\RadioPropertyItem::getItemType
+     * Test for PhpMyAdmin\Properties\Options\Items\RadioPropertyItem::getItemType
      *
      * @return void
      */
@@ -141,7 +141,7 @@ class PropertyItemsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\items\SelectPropertyItem::getItemType
+     * Test for PhpMyAdmin\Properties\Options\Items\SelectPropertyItem::getItemType
      *
      * @return void
      */
@@ -156,7 +156,7 @@ class PropertyItemsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\options\items\TextPropertyItem::getItemType
+     * Test for PhpMyAdmin\Properties\Options\Items\TextPropertyItem::getItemType
      *
      * @return void
      */
diff --git a/test/classes/properties/plugins/ExportPluginPropertiesTest.php b/test/classes/properties/plugins/ExportPluginPropertiesTest.php
index e89a3f4e16..1a456699fe 100644
--- a/test/classes/properties/plugins/ExportPluginPropertiesTest.php
+++ b/test/classes/properties/plugins/ExportPluginPropertiesTest.php
@@ -1,17 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\properties\plugins\ExportPluginProperties class
+ * tests for PhpMyAdmin\Properties\Plugins\ExportPluginProperties class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\properties\plugins\ExportPluginProperties;
+use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
 
 require_once 'test/classes/properties/plugins/ImportPluginPropertiesTest.php';
 
 /**
- * Tests for PMA\libraries\properties\plugins\ExportPluginProperties class. Extends PMA_ImportPluginProperties_Tests
+ * Tests for PhpMyAdmin\Properties\Plugins\ExportPluginProperties class. Extends PMA_ImportPluginProperties_Tests
  * and adds tests for methods that are not common to both
  *
  * @package PhpMyAdmin-test
@@ -41,7 +41,7 @@ class ExportPluginPropertiesTest extends ImportPluginPropertiesTest
     }
 
     /**
-     * Test for PMA\libraries\properties\plugins\ExportPluginProperties::getItemType
+     * Test for PhpMyAdmin\Properties\Plugins\ExportPluginProperties::getItemType
      *
      * @return void
      */
@@ -55,8 +55,8 @@ class ExportPluginPropertiesTest extends ImportPluginPropertiesTest
 
     /**
      * Test for
-     *     - PMA\libraries\properties\plugins\ExportPluginProperties::getForceFile
-     *     - PMA\libraries\properties\plugins\ExportPluginProperties::setForceFile
+     *     - PhpMyAdmin\Properties\Plugins\ExportPluginProperties::getForceFile
+     *     - PhpMyAdmin\Properties\Plugins\ExportPluginProperties::setForceFile
      *
      * @return void
      */
diff --git a/test/classes/properties/plugins/ImportPluginPropertiesTest.php b/test/classes/properties/plugins/ImportPluginPropertiesTest.php
index 53eb0455ff..a0d43f6296 100644
--- a/test/classes/properties/plugins/ImportPluginPropertiesTest.php
+++ b/test/classes/properties/plugins/ImportPluginPropertiesTest.php
@@ -1,15 +1,15 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\properties\plugins\ImportPluginProperties class
+ * tests for PhpMyAdmin\Properties\Plugins\ImportPluginProperties class
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\properties\plugins\ImportPluginProperties;
+use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
 
 /**
- * tests for PMA\libraries\properties\plugins\ImportPluginProperties class
+ * tests for PhpMyAdmin\Properties\Plugins\ImportPluginProperties class
  *
  * @package PhpMyAdmin-test
  */
@@ -38,7 +38,7 @@ class ImportPluginPropertiesTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\plugins\ImportPluginProperties::getItemType
+     * Test for PhpMyAdmin\Properties\Plugins\ImportPluginProperties::getItemType
      *
      * @return void
      */
@@ -52,8 +52,8 @@ class ImportPluginPropertiesTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\plugins\ImportPluginProperties::getOptionsText
-     *     - PMA\libraries\properties\plugins\ImportPluginProperties::setOptionsText
+     *     - PhpMyAdmin\Properties\Plugins\ImportPluginProperties::getOptionsText
+     *     - PhpMyAdmin\Properties\Plugins\ImportPluginProperties::setOptionsText
      *
      * @return void
      */
@@ -69,8 +69,8 @@ class ImportPluginPropertiesTest extends PHPUnit_Framework_TestCase
 
     /**
      * Test for
-     *     - PMA\libraries\properties\plugins\ImportPluginProperties::setMimeType
-     *     - PMA\libraries\properties\plugins\ImportPluginProperties::getMimeType
+     *     - PhpMyAdmin\Properties\Plugins\ImportPluginProperties::setMimeType
+     *     - PhpMyAdmin\Properties\Plugins\ImportPluginProperties::getMimeType
      *
      * @return void
      */
diff --git a/test/classes/properties/plugins/PluginPropertyItemTest.php b/test/classes/properties/plugins/PluginPropertyItemTest.php
index 8668822b65..7c28b506a1 100644
--- a/test/classes/properties/plugins/PluginPropertyItemTest.php
+++ b/test/classes/properties/plugins/PluginPropertyItemTest.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\properties\plugins\PluginPropertyItem class
+ * tests for PhpMyAdmin\Properties\Plugins\PluginPropertyItem class
  *
  * @package PhpMyAdmin-test
  */
 
 /**
- * Tests for PMA\libraries\properties\plugins\PluginPropertyItem class
+ * Tests for PhpMyAdmin\Properties\Plugins\PluginPropertyItem class
  *
  * @package PhpMyAdmin-test
  */
@@ -22,7 +22,7 @@ class PluginPropertyItemTest extends PHPUnit_Framework_TestCase
      */
     protected function setup()
     {
-        $this->stub = $this->getMockForAbstractClass('PMA\libraries\properties\plugins\PluginPropertyItem');
+        $this->stub = $this->getMockForAbstractClass('PhpMyAdmin\Properties\Plugins\PluginPropertyItem');
     }
 
     /**
@@ -36,7 +36,7 @@ class PluginPropertyItemTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\properties\plugins\PluginPropertyItem::getPropertyType
+     * Test for PhpMyAdmin\Properties\Plugins\PluginPropertyItem::getPropertyType
      *
      * @return void
      */
diff --git a/test/classes/schema/DiaRelationSchemaTest.php b/test/classes/schema/DiaRelationSchemaTest.php
index 3e2278ceff..dc8bd7d409 100644
--- a/test/classes/schema/DiaRelationSchemaTest.php
+++ b/test/classes/schema/DiaRelationSchemaTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\plugins\schema\dia\DiaRelationSchema class
+ * Tests for PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
@@ -8,14 +8,14 @@
 /*
  * Include to test.
  */
-use PMA\libraries\plugins\schema\dia\DiaRelationSchema;
+use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema;
 
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\plugins\schema\dia\DiaRelationSchema class
+ * Tests for PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/schema/EpsRelationSchemaTest.php b/test/classes/schema/EpsRelationSchemaTest.php
index d1d5474e0b..0c0a791602 100644
--- a/test/classes/schema/EpsRelationSchemaTest.php
+++ b/test/classes/schema/EpsRelationSchemaTest.php
@@ -8,7 +8,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\plugins\schema\eps\EpsRelationSchema;
+use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema;
 
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/schema/ExportRelationSchemaTest.php b/test/classes/schema/ExportRelationSchemaTest.php
index c8526b6f38..3f75fc9d20 100644
--- a/test/classes/schema/ExportRelationSchemaTest.php
+++ b/test/classes/schema/ExportRelationSchemaTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\plugins\schema\ExportRelationSchema class
+ * Tests for PhpMyAdmin\Plugins\Schema\ExportRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
@@ -9,14 +9,14 @@
  * Include to test.
  */
 
-use PMA\libraries\plugins\schema\ExportRelationSchema;
+use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
 
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\plugins\schema\ExportRelationSchema class
+ * Tests for PhpMyAdmin\Plugins\Schema\ExportRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/schema/PdfRelationSchemaTest.php b/test/classes/schema/PdfRelationSchemaTest.php
index 2b8d2681b0..ab27bf604d 100644
--- a/test/classes/schema/PdfRelationSchemaTest.php
+++ b/test/classes/schema/PdfRelationSchemaTest.php
@@ -8,7 +8,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\plugins\schema\pdf\PdfRelationSchema;
+use PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema;
 
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/schema/SvgRelationSchemaTest.php b/test/classes/schema/SvgRelationSchemaTest.php
index 5c690850c8..f85874295d 100644
--- a/test/classes/schema/SvgRelationSchemaTest.php
+++ b/test/classes/schema/SvgRelationSchemaTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\plugins\schema\svg\SvgRelationSchema class
+ * Tests for PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
@@ -8,14 +8,14 @@
 /*
  * Include to test.
  */
-use PMA\libraries\plugins\schema\svg\SvgRelationSchema;
+use PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema;
 
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\plugins\schema\svg\SvgRelationSchema class
+ * Tests for PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php
index deb203830e..c682127a00 100644
--- a/test/libraries/PMA_display_export_test.php
+++ b/test/libraries/PMA_display_export_test.php
@@ -148,7 +148,7 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase
         /* Scan for plugins */
         $export_list = PMA_getPlugins(
             "export",
-            'libraries/plugins/export/',
+            'libraries/classes/Plugins/Export/',
             array(
                 'export_type' => $export_type,
                 'single_table' => isset($single_table)
diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
index ac5d55338a..8282dd3ff9 100644
--- a/test/libraries/PMA_insert_edit_test.php
+++ b/test/libraries/PMA_insert_edit_test.php
@@ -2872,7 +2872,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             md5('col') => 'val'
         );
         $column_mime = array(
-            'input_transformation' => 'input/Image_JPEG_Upload.php',
+            'input_transformation' => 'Input/Image_JPEG_Upload.php',
             'input_transformation_options' => '150'
         );