diff --git a/lib/Cake/Controller/Component/EmailComponent.php b/lib/Cake/Controller/Component/EmailComponent.php
index 2311f0d5553..de3e1e095ea 100644
--- a/lib/Cake/Controller/Component/EmailComponent.php
+++ b/lib/Cake/Controller/Component/EmailComponent.php
@@ -19,7 +19,7 @@
 
 App::uses('Component', 'Controller');
 App::uses('Multibyte', 'I18n');
-App::uses('CakeEmail', 'Network');
+App::uses('CakeEmail', 'Network/Email');
 
 /**
  * EmailComponent
diff --git a/lib/Cake/Network/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php
similarity index 100%
rename from lib/Cake/Network/CakeEmail.php
rename to lib/Cake/Network/Email/CakeEmail.php
diff --git a/lib/Cake/tests/Case/Network/CakeEmailTest.php b/lib/Cake/tests/Case/Network/Email/CakeEmailTest.php
similarity index 99%
rename from lib/Cake/tests/Case/Network/CakeEmailTest.php
rename to lib/Cake/tests/Case/Network/Email/CakeEmailTest.php
index d44a602b903..45c7b144342 100644
--- a/lib/Cake/tests/Case/Network/CakeEmailTest.php
+++ b/lib/Cake/tests/Case/Network/Email/CakeEmailTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::uses('CakeEmail', 'Network');
+App::uses('CakeEmail', 'Network/Email');
 
 /**
  * Help to test CakeEmail
diff --git a/lib/Cake/tests/Case/Network/Email/SmtpTransportTest.php b/lib/Cake/tests/Case/Network/Email/SmtpTransportTest.php
index 2a7c1046936..5b75da480a9 100644
--- a/lib/Cake/tests/Case/Network/Email/SmtpTransportTest.php
+++ b/lib/Cake/tests/Case/Network/Email/SmtpTransportTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::uses('CakeEmail', 'Network');
+App::uses('CakeEmail', 'Network/Email');
 App::uses('AbstractTransport', 'Network/Email');
 App::uses('SmtpTransport', 'Network/Email');