diff --git a/cake/libs/cache.php b/lib/Cake/Cache/Cache.php
similarity index 100%
rename from cake/libs/cache.php
rename to lib/Cake/Cache/Cache.php
diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index 66df9c93b..5caf05e40 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -442,7 +442,10 @@ class App {
 
 	public static function load($className) {
 		if (isset(self::$__classMap[$className])) {
-			return App::import(self::$__classMap[$className], $className, false);
+			$file = LIBS . self::$__classMap[$className] . DS . $className . '.php';
+			if (file_exists($file)) {
+				return include $file;
+			}
 		}
 		return false;
 	}
@@ -606,7 +609,7 @@ class App {
 		}
 
 		if (empty(self::$__paths)) {
-			self::$__paths = Cache::read('dir_map', '_cake_core_');
+			//self::$__paths = Cache::read('dir_map', '_cake_core_');
 		}
 
 		foreach (self::$search as $path) {
diff --git a/cake/libs/configure.php b/lib/Cake/Core/Configure.php
similarity index 100%
rename from cake/libs/configure.php
rename to lib/Cake/Core/Configure.php
diff --git a/cake/libs/cake_request.php b/lib/Cake/Network/CakeRequest.php
similarity index 100%
rename from cake/libs/cake_request.php
rename to lib/Cake/Network/CakeRequest.php
diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php
index 2b4453546..d1c396148 100644
--- a/lib/Cake/Routing/Dispatcher.php
+++ b/lib/Cake/Routing/Dispatcher.php
@@ -24,9 +24,9 @@
 /**
  * List of helpers to include
  */
-App::uses('Router', 'Core');
-App::uses('CakeRequest', 'Core');
-App::uses('CakeResponse', 'Core');
+App::uses('Router', 'Routing');
+App::uses('CakeRequest', 'Network');
+App::uses('CakeResponse', 'Network');
 App::uses('Controller', 'Controller');
 App::uses('Scaffold', 'Controller');
 App::uses('View', 'View');
diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php
index e596aa359..5a6a2e697 100644
--- a/lib/Cake/bootstrap.php
+++ b/lib/Cake/bootstrap.php
@@ -219,17 +219,21 @@ if (!defined('JS_URL')) {
 
 
 require LIBS . 'basics.php';
-require LIBS . 'app.php';
+require LIBS . 'Utility' . DS . 'Inflector.php';
+require LIBS . 'Utility' . DS . 'Folder.php';
+require LIBS . 'Core' . DS .'App.php';
+
+App::uses('Configure', 'Core');
+App::uses('Cache', 'Cache');
+
 //require LIBS . 'error' . DS . 'exceptions.php';
 //require LIBS . 'object.php';
-//require LIBS . 'inflector.php';
-//
 //require LIBS . 'configure.php';
 //require LIBS . 'set.php';
 //require LIBS . 'cache.php';
 //require LIBS . 'error' . DS . 'error_handler.php';
 
-//Configure::bootstrap(isset($boot) ? $boot : true);
+Configure::bootstrap(isset($boot) ? $boot : true);
 
 /**
  *  Full url prefix