diff --git a/lib/Cake/Controller/Component/SessionComponent.php b/lib/Cake/Controller/Component/SessionComponent.php
index 855cbcd20..5e326d5e8 100644
--- a/lib/Cake/Controller/Component/SessionComponent.php
+++ b/lib/Cake/Controller/Component/SessionComponent.php
@@ -18,7 +18,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::uses('CakeSession', 'Model');
+App::uses('CakeSession', 'Model/Datasource');
 
 /**
  * Session Component.
diff --git a/lib/Cake/Model/CakeSession.php b/lib/Cake/Model/Datasource/CakeSession.php
similarity index 100%
rename from lib/Cake/Model/CakeSession.php
rename to lib/Cake/Model/Datasource/CakeSession.php
diff --git a/lib/Cake/View/Helper/SessionHelper.php b/lib/Cake/View/Helper/SessionHelper.php
index 997e2c422..67d09f056 100644
--- a/lib/Cake/View/Helper/SessionHelper.php
+++ b/lib/Cake/View/Helper/SessionHelper.php
@@ -19,7 +19,7 @@
  */
 
 App::uses('AppHelper', 'View/Helper');
-App::uses('CakeSession', 'Model');
+App::uses('CakeSession', 'Model/Datasource');
 
 /**
  * Session Helper.