diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php
index 59dd5d37f..e07371a03 100644
--- a/lib/Cake/Model/ConnectionManager.php
+++ b/lib/Cake/Model/ConnectionManager.php
@@ -20,6 +20,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('DataSource', 'Model/Datasource');
+
 /**
  * Manages loaded instances of DataSource objects
  *
@@ -101,7 +103,6 @@ class ConnectionManager {
 		$conn = $_this->_connectionsEnum[$name];
 		$class = $conn['classname'];
 
-		require LIBS . 'model' . DS . 'datasources' . DS . 'datasource.php';
 		if ($_this->loadDataSource($name) === null) {
 			trigger_error(sprintf(__("ConnectionManager::getDataSource - Could not load class %s"), $class), E_USER_ERROR);
 			$null = null;
diff --git a/cake/libs/model/datasources/datasource.php b/lib/Cake/Model/Datasource/DataSource.php
similarity index 100%
rename from cake/libs/model/datasources/datasource.php
rename to lib/Cake/Model/Datasource/DataSource.php
diff --git a/cake/libs/model/datasources/dbo_source.php b/lib/Cake/Model/Datasource/DboSource.php
similarity index 100%
rename from cake/libs/model/datasources/dbo_source.php
rename to lib/Cake/Model/Datasource/DboSource.php