diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php
index 21fce12eec5..ffa3e14ebae 100644
--- a/lib/Cake/Controller/Controller.php
+++ b/lib/Cake/Controller/Controller.php
@@ -22,7 +22,7 @@
  * Include files
  */
 App::uses('CakeResponse', 'Network');
-App::uses('ClassRegistry', 'Core');
+App::uses('ClassRegistry', 'Utility');
 App::uses('ComponentCollection', 'Controller');
 App::uses('View', 'View');
 
diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index a363ad407bc..4242a47d915 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -733,9 +733,7 @@ private static function __settings($type, $plugin, $parent) {
 
 		switch ($load) {
 			case 'model':
-				if (!class_exists('Model')) {
-					require LIBS . 'model' . DS . 'model.php';
-				}
+				App::uses('Model', 'Model');
 				if (!class_exists('AppModel')) {
 					App::import($type, 'AppModel', false);
 				}
diff --git a/cake/libs/model/model.php b/lib/Cake/Model/Model.php
similarity index 100%
rename from cake/libs/model/model.php
rename to lib/Cake/Model/Model.php
diff --git a/cake/libs/class_registry.php b/lib/Cake/Utility/ClassRegistry.php
similarity index 100%
rename from cake/libs/class_registry.php
rename to lib/Cake/Utility/ClassRegistry.php
diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php
index 7a86facdf22..95b499161c9 100644
--- a/lib/Cake/Utility/Set.php
+++ b/lib/Cake/Utility/Set.php
@@ -18,7 +18,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::uses('String', 'Core');
+App::uses('String', 'Utility');
 
 /**
  * Class used for manipulation of arrays.