diff --git a/lib/Cake/Model/Aco.php b/lib/Cake/Model/Aco.php
new file mode 100644
index 000000000..f8a92bcf4
--- /dev/null
+++ b/lib/Cake/Model/Aco.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Load Model and AppModel
+ */
+App::uses('AppModel', 'Model');
+
+/**
+ * Access Control Object
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class Aco extends AclNode {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	public $name = 'Aco';
+
+/**
+ * Binds to ARO nodes through permissions settings
+ *
+ * @var array
+ * @access public
+ */
+	public $hasAndBelongsToMany = array('Aro' => array('with' => 'Permission'));
+}
\ No newline at end of file
diff --git a/lib/Cake/Model/AcoAction.php b/lib/Cake/Model/AcoAction.php
new file mode 100644
index 000000000..fe9734228
--- /dev/null
+++ b/lib/Cake/Model/AcoAction.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Load Model and AppModel
+ */
+App::uses('AppModel', 'Model');
+
+/**
+ * Action for Access Control Object
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class AcoAction extends AppModel {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	public $name = 'AcoAction';
+
+/**
+ * ACO Actions belong to ACOs
+ *
+ * @var array
+ * @access public
+ */
+	public $belongsTo = array('Aco');
+}
\ No newline at end of file
diff --git a/lib/Cake/Model/AppModel.php b/lib/Cake/Model/AppModel.php
index e18dca1c1..464d3323f 100644
--- a/lib/Cake/Model/AppModel.php
+++ b/lib/Cake/Model/AppModel.php
@@ -21,6 +21,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('Model', 'Model');
+
 /**
  * Application model for Cake.
  *
diff --git a/lib/Cake/Model/Aro.php b/lib/Cake/Model/Aro.php
new file mode 100644
index 000000000..8c76de100
--- /dev/null
+++ b/lib/Cake/Model/Aro.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Load Model and AppModel
+ */
+App::uses('AppModel', 'Model');
+
+/**
+ * Access Request Object
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class Aro extends AclNode {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	public $name = 'Aro';
+
+/**
+ * AROs are linked to ACOs by means of Permission
+ *
+ * @var array
+ * @access public
+ */
+	public $hasAndBelongsToMany = array('Aco' => array('with' => 'Permission'));
+}
\ No newline at end of file
diff --git a/lib/Cake/Model/DbAcl.php b/lib/Cake/Model/DbAcl.php
index 2a0f20c79..9936a6e99 100644
--- a/lib/Cake/Model/DbAcl.php
+++ b/lib/Cake/Model/DbAcl.php
@@ -1,8 +1,5 @@
 <?php
 /**
- * This is core configuration file.
- *
- * Use it to configure core behaviour ofCake.
  *
  * PHP 5
  *
@@ -188,140 +185,4 @@ class AclNode extends AppModel {
 		}
 		return $result;
 	}
-}
-
-/**
- * Access Control Object
- *
- * @package       cake
- * @subpackage    cake.cake.libs.model
- */
-class Aco extends AclNode {
-
-/**
- * Model name
- *
- * @var string
- * @access public
- */
-	public $name = 'Aco';
-
-/**
- * Binds to ARO nodes through permissions settings
- *
- * @var array
- * @access public
- */
-	public $hasAndBelongsToMany = array('Aro' => array('with' => 'Permission'));
-}
-
-/**
- * Action for Access Control Object
- *
- * @package       cake
- * @subpackage    cake.cake.libs.model
- */
-class AcoAction extends AppModel {
-
-/**
- * Model name
- *
- * @var string
- * @access public
- */
-	public $name = 'AcoAction';
-
-/**
- * ACO Actions belong to ACOs
- *
- * @var array
- * @access public
- */
-	public $belongsTo = array('Aco');
-}
-
-/**
- * Access Request Object
- *
- * @package       cake
- * @subpackage    cake.cake.libs.model
- */
-class Aro extends AclNode {
-
-/**
- * Model name
- *
- * @var string
- * @access public
- */
-	public $name = 'Aro';
-
-/**
- * AROs are linked to ACOs by means of Permission
- *
- * @var array
- * @access public
- */
-	public $hasAndBelongsToMany = array('Aco' => array('with' => 'Permission'));
-}
-
-/**
- * Permissions linking AROs with ACOs
- *
- * @package       cake
- * @subpackage    cake.cake.libs.model
- */
-class Permission extends AppModel {
-
-/**
- * Model name
- *
- * @var string
- * @access public
- */
-	public $name = 'Permission';
-
-/**
- * Explicitly disable in-memory query caching
- *
- * @var boolean
- * @access public
- */
-	public $cacheQueries = false;
-
-/**
- * Override default table name
- *
- * @var string
- * @access public
- */
-	public $useTable = 'aros_acos';
-
-/**
- * Permissions link AROs with ACOs
- *
- * @var array
- * @access public
- */
-	public $belongsTo = array('Aro', 'Aco');
-
-/**
- * No behaviors for this model
- *
- * @var array
- * @access public
- */
-	public $actsAs = null;
-
-/**
- * Constructor, used to tell this model to use the
- * database configured for ACL
- */
-	function __construct() {
-		$config = Configure::read('Acl.database');
-		if (!empty($config)) {
-			$this->useDbConfig = $config;
-		}
-		parent::__construct();
-	}
-}
+}
\ No newline at end of file
diff --git a/lib/Cake/Model/Permission.php b/lib/Cake/Model/Permission.php
new file mode 100644
index 000000000..5ca0f0682
--- /dev/null
+++ b/lib/Cake/Model/Permission.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Load Model and AppModel
+ */
+App::uses('AppModel', 'Model');
+
+/**
+ * Permissions linking AROs with ACOs
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class Permission extends AppModel {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	public $name = 'Permission';
+
+/**
+ * Explicitly disable in-memory query caching
+ *
+ * @var boolean
+ * @access public
+ */
+	public $cacheQueries = false;
+
+/**
+ * Override default table name
+ *
+ * @var string
+ * @access public
+ */
+	public $useTable = 'aros_acos';
+
+/**
+ * Permissions link AROs with ACOs
+ *
+ * @var array
+ * @access public
+ */
+	public $belongsTo = array('Aro', 'Aco');
+
+/**
+ * No behaviors for this model
+ *
+ * @var array
+ * @access public
+ */
+	public $actsAs = null;
+
+/**
+ * Constructor, used to tell this model to use the
+ * database configured for ACL
+ */
+	function __construct() {
+		$config = Configure::read('Acl.database');
+		if (!empty($config)) {
+			$this->useDbConfig = $config;
+		}
+		parent::__construct();
+	}
+}
\ No newline at end of file