diff --git a/libraries/classes/File.php b/libraries/classes/File.php
index 993f0fd158..80b9d9d152 100644
--- a/libraries/classes/File.php
+++ b/libraries/classes/File.php
@@ -11,7 +11,7 @@ use PMA\libraries\config\ConfigFile;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PMA\libraries\Util;
-use PMA\libraries\ZipExtension;
+use PhpMyAdmin\ZipExtension;
 
 /**
  * File wrapper class
diff --git a/libraries/classes/OpenDocument.php b/libraries/classes/OpenDocument.php
index e47b46ec02..825b48fb9c 100644
--- a/libraries/classes/OpenDocument.php
+++ b/libraries/classes/OpenDocument.php
@@ -7,7 +7,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\ZipFile;
+use PhpMyAdmin\ZipFile;
 
 /**
  * Simplfied OpenDocument creator class
diff --git a/libraries/ZipExtension.php b/libraries/classes/ZipExtension.php
similarity index 99%
rename from libraries/ZipExtension.php
rename to libraries/classes/ZipExtension.php
index ac72ce536e..6dd715c5d5 100644
--- a/libraries/ZipExtension.php
+++ b/libraries/classes/ZipExtension.php
@@ -5,8 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use ZipArchive;
 
diff --git a/libraries/ZipFile.php b/libraries/classes/ZipFile.php
similarity index 98%
rename from libraries/ZipFile.php
rename to libraries/classes/ZipFile.php
index 652d0eafd4..8ff13a277b 100644
--- a/libraries/ZipFile.php
+++ b/libraries/classes/ZipFile.php
@@ -5,11 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
+namespace PhpMyAdmin;
 
 /**
  * Zip file creation class.
@@ -203,4 +199,4 @@ class ZipFile
             return $data . $header;
         }
     } // end of the 'file()' method
-} // end of the 'PMA\libraries\ZipFile' class
+} // end of the 'PhpMyAdmin\ZipFile' class
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index b084aa50c3..5043571bbe 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -10,7 +10,7 @@ use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\Table;
-use PMA\libraries\ZipFile;
+use PhpMyAdmin\ZipFile;
 use PMA\libraries\URL;
 use PMA\libraries\Sanitize;
 
diff --git a/libraries/plugins/import/ImportShp.php b/libraries/plugins/import/ImportShp.php
index 6cb4d0aca9..dd044ea506 100644
--- a/libraries/plugins/import/ImportShp.php
+++ b/libraries/plugins/import/ImportShp.php
@@ -16,7 +16,7 @@ use PMA\libraries\gis\GISMultilinestring;
 use PMA\libraries\gis\GISMultipoint;
 use PMA\libraries\gis\GISPoint;
 use PMA\libraries\gis\GISPolygon;
-use PMA\libraries\ZipExtension;
+use PhpMyAdmin\ZipExtension;
 
 /**
  * Handles the import for ESRI Shape files
diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php
index ac6c196717..f72d151d06 100644
--- a/test/classes/ZipExtensionTest.php
+++ b/test/classes/ZipExtensionTest.php
@@ -5,7 +5,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\ZipExtension;
+use PhpMyAdmin\ZipExtension;
 
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/ZipFileTest.php b/test/classes/ZipFileTest.php
index 027b9508c6..5fcde00bce 100644
--- a/test/classes/ZipFileTest.php
+++ b/test/classes/ZipFileTest.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * Tests PMA\libraries\ZipFile
+ * Tests PhpMyAdmin\ZipFile
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\ZipFile;
+use PhpMyAdmin\ZipFile;
 
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\ZipFile
+ * Tests for PhpMyAdmin\ZipFile
  *
  * @package PhpMyAdmin-test
  */