diff --git a/library/Zend/Debug.php b/library/Zend/Debug/Debug.php
similarity index 99%
rename from library/Zend/Debug.php
rename to library/Zend/Debug/Debug.php
index ab63f016f3b..aef01dc9a0c 100644
--- a/library/Zend/Debug.php
+++ b/library/Zend/Debug/Debug.php
@@ -8,7 +8,7 @@
  * @package   Zend_Debug.php
  */
 
-namespace Zend;
+namespace Zend\Debug;
 
 /**
  * Concrete class for generating debug dumps related to the output source.
diff --git a/library/Zend/Feed/PubSubHubbub/Publisher.php b/library/Zend/Feed/PubSubHubbub/Publisher.php
index 0327c084587..f5b60a2065c 100644
--- a/library/Zend/Feed/PubSubHubbub/Publisher.php
+++ b/library/Zend/Feed/PubSubHubbub/Publisher.php
@@ -14,7 +14,7 @@
 use Zend\Http\Request as HttpRequest;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Uri;
-use Zend\Version;
+use Zend\Version\Version;
 
 /**
  * @category   Zend
diff --git a/library/Zend/Feed/PubSubHubbub/Subscriber.php b/library/Zend/Feed/PubSubHubbub/Subscriber.php
index 5d52f19b259..de419c7032a 100644
--- a/library/Zend/Feed/PubSubHubbub/Subscriber.php
+++ b/library/Zend/Feed/PubSubHubbub/Subscriber.php
@@ -16,7 +16,7 @@
 use Zend\Http\Request as HttpRequest;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Uri;
-use Zend\Version;
+use Zend\Version\Version;
 
 /**
  * @category   Zend
diff --git a/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php b/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
index eab133c940d..74c337c069a 100644
--- a/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
+++ b/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
@@ -25,7 +25,7 @@
 use Zend\Console\AdapterInterface as ConsoleAdapter;
 use Zend\Mvc\Router\RouteInterface;
 use Zend\View\Model\ConsoleModel;
-use Zend\Version;
+use Zend\Version\Version;
 use Zend\Stdlib\ResponseInterface as Response;
 
 /**
diff --git a/library/Zend/Version.php b/library/Zend/Version/Version.php
similarity index 99%
rename from library/Zend/Version.php
rename to library/Zend/Version/Version.php
index f06775f54f7..ce634af8af8 100644
--- a/library/Zend/Version.php
+++ b/library/Zend/Version/Version.php
@@ -8,7 +8,7 @@
  * @package   Zend_Version.php
  */
 
-namespace Zend;
+namespace Zend\Version;
 
 use Zend\Json\Json;
 
diff --git a/tests/Zend/DebugTest.php b/tests/Zend/Debug/DebugTest.php
similarity index 99%
rename from tests/Zend/DebugTest.php
rename to tests/Zend/Debug/DebugTest.php
index 7a9452249ec..eb8d8e2c89b 100644
--- a/tests/Zend/DebugTest.php
+++ b/tests/Zend/Debug/DebugTest.php
@@ -10,7 +10,7 @@
 
 namespace ZendTest;
 
-use Zend\Debug;
+use Zend\Debug\Debug;
 
 /**
  * @category   Zend
diff --git a/tests/Zend/VersionTest.php b/tests/Zend/Version/VersionTest.php
similarity index 99%
rename from tests/Zend/VersionTest.php
rename to tests/Zend/Version/VersionTest.php
index d9cb6da1083..c6ea51d5c2a 100644
--- a/tests/Zend/VersionTest.php
+++ b/tests/Zend/Version/VersionTest.php
@@ -8,7 +8,7 @@
  * @package   Zend_VersionTest.php
  */
 
-use Zend\Version;
+use Zend\Version\Version;
 
 /**
  * @category   Zend