diff --git a/app/View/emails/html/empty b/app/View/Emails/html/empty
similarity index 100%
rename from app/View/emails/html/empty
rename to app/View/Emails/html/empty
diff --git a/app/View/emails/text/empty b/app/View/Emails/text/empty
similarity index 100%
rename from app/View/emails/text/empty
rename to app/View/Emails/text/empty
diff --git a/app/View/errors/empty b/app/View/Errors/empty
similarity index 100%
rename from app/View/errors/empty
rename to app/View/Errors/empty
diff --git a/app/View/scaffolds/empty b/app/View/Scaffolds/empty
similarity index 100%
rename from app/View/scaffolds/empty
rename to app/View/Scaffolds/empty
diff --git a/lib/Cake/Console/templates/skel/config/acl.ini.php b/lib/Cake/Console/templates/skel/Config/acl.ini.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/acl.ini.php
rename to lib/Cake/Console/templates/skel/Config/acl.ini.php
diff --git a/lib/Cake/Console/templates/skel/config/bootstrap.php b/lib/Cake/Console/templates/skel/Config/bootstrap.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/bootstrap.php
rename to lib/Cake/Console/templates/skel/Config/bootstrap.php
diff --git a/lib/Cake/Console/templates/skel/config/core.php b/lib/Cake/Console/templates/skel/Config/core.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/core.php
rename to lib/Cake/Console/templates/skel/Config/core.php
diff --git a/lib/Cake/Console/templates/skel/config/database.php.default b/lib/Cake/Console/templates/skel/Config/database.php.default
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/database.php.default
rename to lib/Cake/Console/templates/skel/Config/database.php.default
diff --git a/lib/Cake/Console/templates/skel/config/email.php.default b/lib/Cake/Console/templates/skel/Config/email.php.default
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/email.php.default
rename to lib/Cake/Console/templates/skel/Config/email.php.default
diff --git a/lib/Cake/Console/templates/skel/config/routes.php b/lib/Cake/Console/templates/skel/Config/routes.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/routes.php
rename to lib/Cake/Console/templates/skel/Config/routes.php
diff --git a/lib/Cake/Console/templates/skel/config/schema/db_acl.php b/lib/Cake/Console/templates/skel/Config/schema/db_acl.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/db_acl.php
rename to lib/Cake/Console/templates/skel/Config/schema/db_acl.php
diff --git a/lib/Cake/Console/templates/skel/config/schema/db_acl.sql b/lib/Cake/Console/templates/skel/Config/schema/db_acl.sql
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/db_acl.sql
rename to lib/Cake/Console/templates/skel/Config/schema/db_acl.sql
diff --git a/lib/Cake/Console/templates/skel/config/schema/i18n.php b/lib/Cake/Console/templates/skel/Config/schema/i18n.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/i18n.php
rename to lib/Cake/Console/templates/skel/Config/schema/i18n.php
diff --git a/lib/Cake/Console/templates/skel/config/schema/i18n.sql b/lib/Cake/Console/templates/skel/Config/schema/i18n.sql
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/i18n.sql
rename to lib/Cake/Console/templates/skel/Config/schema/i18n.sql
diff --git a/lib/Cake/Console/templates/skel/config/schema/sessions.php b/lib/Cake/Console/templates/skel/Config/schema/sessions.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/sessions.php
rename to lib/Cake/Console/templates/skel/Config/schema/sessions.php
diff --git a/lib/Cake/Console/templates/skel/config/schema/sessions.sql b/lib/Cake/Console/templates/skel/Config/schema/sessions.sql
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/sessions.sql
rename to lib/Cake/Console/templates/skel/Config/schema/sessions.sql
diff --git a/lib/Cake/Console/templates/skel/View/errors/empty b/lib/Cake/Console/templates/skel/Locale/eng/LC_MESSAGES/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/errors/empty
rename to lib/Cake/Console/templates/skel/Locale/eng/LC_MESSAGES/empty
diff --git a/lib/Cake/Console/templates/skel/View/pages/empty b/lib/Cake/Console/templates/skel/Plugin/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/pages/empty
rename to lib/Cake/Console/templates/skel/Plugin/empty
diff --git a/lib/Cake/Console/templates/skel/View/scaffolds/empty b/lib/Cake/Console/templates/skel/Test/Case/Controller/Component/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/scaffolds/empty
rename to lib/Cake/Console/templates/skel/Test/Case/Controller/Component/empty
diff --git a/lib/Cake/Console/templates/skel/locale/eng/LC_MESSAGES/empty b/lib/Cake/Console/templates/skel/Test/Case/Controller/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/locale/eng/LC_MESSAGES/empty
rename to lib/Cake/Console/templates/skel/Test/Case/Controller/empty
diff --git a/lib/Cake/Console/templates/skel/plugins/empty b/lib/Cake/Console/templates/skel/Test/Case/Model/Behavior/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/plugins/empty
rename to lib/Cake/Console/templates/skel/Test/Case/Model/Behavior/empty
diff --git a/lib/Cake/Console/templates/skel/tests/Case/Controller/Component/empty b/lib/Cake/Console/templates/skel/Test/Case/Model/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Case/Controller/Component/empty
rename to lib/Cake/Console/templates/skel/Test/Case/Model/empty
diff --git a/lib/Cake/Console/templates/skel/tests/Case/Controller/empty b/lib/Cake/Console/templates/skel/Test/Case/View/Helper/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Case/Controller/empty
rename to lib/Cake/Console/templates/skel/Test/Case/View/Helper/empty
diff --git a/lib/Cake/Console/templates/skel/tests/Case/Model/Behavior/empty b/lib/Cake/Console/templates/skel/Test/Fixture/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Case/Model/Behavior/empty
rename to lib/Cake/Console/templates/skel/Test/Fixture/empty
diff --git a/lib/Cake/Console/templates/skel/tests/Case/Model/empty b/lib/Cake/Console/templates/skel/Vendor/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Case/Model/empty
rename to lib/Cake/Console/templates/skel/Vendor/empty
diff --git a/lib/Cake/Console/templates/skel/View/emails/html/default.ctp b/lib/Cake/Console/templates/skel/View/Emails/html/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/emails/html/default.ctp
rename to lib/Cake/Console/templates/skel/View/Emails/html/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/emails/text/default.ctp b/lib/Cake/Console/templates/skel/View/Emails/text/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/emails/text/default.ctp
rename to lib/Cake/Console/templates/skel/View/Emails/text/default.ctp
diff --git a/lib/Cake/Console/templates/skel/tests/Case/View/Helper/empty b/lib/Cake/Console/templates/skel/View/Errors/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Case/View/Helper/empty
rename to lib/Cake/Console/templates/skel/View/Errors/empty
diff --git a/lib/Cake/Console/templates/skel/tests/Fixture/empty b/lib/Cake/Console/templates/skel/View/Pages/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Fixture/empty
rename to lib/Cake/Console/templates/skel/View/Pages/empty
diff --git a/lib/Cake/Console/templates/skel/vendors/empty b/lib/Cake/Console/templates/skel/View/Scaffolds/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/vendors/empty
rename to lib/Cake/Console/templates/skel/View/Scaffolds/empty
diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index b0104918c..f83e0ca7f 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -311,10 +311,11 @@ class App {
 				'locales' => array(
 					'%s' . 'locale' . DS
 				),
-				'vendors' => array('%s' . 'vendors' . DS, VENDORS),
+				'vendors' => array('%s' . 'Vendor' . DS, VENDORS),
 				'plugins' => array(
-					APP . 'plugins' . DS,
-					dirname(dirname(CAKE)) . DS . 'plugins' . DS
+					APP . 'Plugin' . DS,
+					APP . 'plugin' . DS,
+					dirname(dirname(CAKE)) . DS . 'Plugin' . DS,
 				)
 			);
 		}
diff --git a/lib/Cake/Test/test_app/config/acl.ini.php b/lib/Cake/Test/test_app/Config/acl.ini.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/acl.ini.php
rename to lib/Cake/Test/test_app/Config/acl.ini.php
diff --git a/lib/Cake/Test/test_app/config/empty.php b/lib/Cake/Test/test_app/Config/empty.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/empty.php
rename to lib/Cake/Test/test_app/Config/empty.php
diff --git a/lib/Cake/Test/test_app/config/htmlhelper_minimized.ini b/lib/Cake/Test/test_app/Config/htmlhelper_minimized.ini
similarity index 100%
rename from lib/Cake/Test/test_app/config/htmlhelper_minimized.ini
rename to lib/Cake/Test/test_app/Config/htmlhelper_minimized.ini
diff --git a/lib/Cake/Test/test_app/config/htmlhelper_tags.php b/lib/Cake/Test/test_app/Config/htmlhelper_tags.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/htmlhelper_tags.php
rename to lib/Cake/Test/test_app/Config/htmlhelper_tags.php
diff --git a/lib/Cake/Test/test_app/config/nested.ini b/lib/Cake/Test/test_app/Config/nested.ini
similarity index 100%
rename from lib/Cake/Test/test_app/config/nested.ini
rename to lib/Cake/Test/test_app/Config/nested.ini
diff --git a/lib/Cake/Test/test_app/config/no_section.ini b/lib/Cake/Test/test_app/Config/no_section.ini
similarity index 100%
rename from lib/Cake/Test/test_app/config/no_section.ini
rename to lib/Cake/Test/test_app/Config/no_section.ini
diff --git a/lib/Cake/Test/test_app/config/routes.php b/lib/Cake/Test/test_app/Config/routes.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/routes.php
rename to lib/Cake/Test/test_app/Config/routes.php
diff --git a/lib/Cake/Test/test_app/config/var_test.php b/lib/Cake/Test/test_app/Config/var_test.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/var_test.php
rename to lib/Cake/Test/test_app/Config/var_test.php
diff --git a/lib/Cake/Test/test_app/config/var_test2.php b/lib/Cake/Test/test_app/Config/var_test2.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/var_test2.php
rename to lib/Cake/Test/test_app/Config/var_test2.php
diff --git a/lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/cache_test_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/cache_test_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po b/lib/Cake/Test/test_app/Locale/cache_test_po/LC_MESSAGES/dom1.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
rename to lib/Cake/Test/test_app/Locale/cache_test_po/LC_MESSAGES/dom1.po
diff --git a/lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po b/lib/Cake/Test/test_app/Locale/cache_test_po/LC_MESSAGES/dom2.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
rename to lib/Cake/Test/test_app/Locale/cache_test_po/LC_MESSAGES/dom2.po
diff --git a/lib/Cake/Test/test_app/locale/ja_jp/LC_TIME b/lib/Cake/Test/test_app/Locale/ja_jp/LC_TIME
similarity index 100%
rename from lib/Cake/Test/test_app/locale/ja_jp/LC_TIME
rename to lib/Cake/Test/test_app/Locale/ja_jp/LC_TIME
diff --git a/lib/Cake/Test/test_app/locale/po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/po/LC_MONETARY/default.po b/lib/Cake/Test/test_app/Locale/po/LC_MONETARY/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/po/LC_MONETARY/default.po
rename to lib/Cake/Test/test_app/Locale/po/LC_MONETARY/default.po
diff --git a/lib/Cake/Test/test_app/locale/po/LC_TIME b/lib/Cake/Test/test_app/Locale/po/LC_TIME
similarity index 100%
rename from lib/Cake/Test/test_app/locale/po/LC_TIME
rename to lib/Cake/Test/test_app/Locale/po/LC_TIME
diff --git a/lib/Cake/Test/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_0_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_0_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_0_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_0_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_0_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_0_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_0_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_0_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_0_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_0_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_0_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_0_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_10_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_10_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_10_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_10_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_10_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_10_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_10_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_10_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_10_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_10_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_10_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_10_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_11_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_11_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_11_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_11_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_11_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_11_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_11_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_11_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_11_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_11_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_11_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_11_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_12_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_12_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_12_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_12_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_12_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_12_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_12_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_12_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_12_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_12_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_12_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_12_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_13_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_13_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_13_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_13_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_13_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_13_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_13_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_13_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_13_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_13_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_13_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_13_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_14_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_14_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_14_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_14_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_14_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_14_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_14_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_14_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_14_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_14_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_14_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_14_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_1_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_1_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_1_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_1_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_1_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_1_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_1_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_1_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_1_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_1_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_1_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_1_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_2_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_2_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_2_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_2_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_2_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_2_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_2_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_2_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_2_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_2_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_2_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_2_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_3_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_3_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_3_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_3_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_3_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_3_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_3_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_3_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_3_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_3_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_3_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_3_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_4_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_4_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_4_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_4_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_4_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_4_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_4_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_4_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_4_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_4_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_4_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_4_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_5_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_5_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_5_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_5_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_5_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_5_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_5_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_5_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_5_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_5_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_5_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_5_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_6_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_6_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_6_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_6_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_6_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_6_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_6_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_6_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_6_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_6_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_6_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_6_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_7_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_7_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_7_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_7_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_7_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_7_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_7_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_7_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_7_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_7_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_7_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_7_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_8_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_8_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_8_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_8_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_8_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_8_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_8_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_8_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_8_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_8_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_8_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_8_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_9_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/Locale/rule_9_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_9_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/Locale/rule_9_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/Test/test_app/locale/rule_9_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_9_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_9_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/Locale/rule_9_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/Test/test_app/locale/rule_9_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_9_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/Test/test_app/locale/rule_9_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/Locale/rule_9_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/Test/test_app/locale/time_test/LC_TIME b/lib/Cake/Test/test_app/Locale/time_test/LC_TIME
similarity index 100%
rename from lib/Cake/Test/test_app/locale/time_test/LC_TIME
rename to lib/Cake/Test/test_app/Locale/time_test/LC_TIME
diff --git a/lib/Cake/Test/test_app/plugins/PluginJs/config/bootstrap.php b/lib/Cake/Test/test_app/Plugin/PluginJs/Config/bootstrap.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/PluginJs/config/bootstrap.php
rename to lib/Cake/Test/test_app/Plugin/PluginJs/Config/bootstrap.php
diff --git a/lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js b/lib/Cake/Test/test_app/Plugin/PluginJs/webroot/js/one/plugin_one.js
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js
rename to lib/Cake/Test/test_app/Plugin/PluginJs/webroot/js/one/plugin_one.js
diff --git a/lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/plugin_js.js b/lib/Cake/Test/test_app/Plugin/PluginJs/webroot/js/plugin_js.js
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/plugin_js.js
rename to lib/Cake/Test/test_app/Plugin/PluginJs/webroot/js/plugin_js.js
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/schema/schema.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/schema/schema.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/bootstrap.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/bootstrap.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/bootstrap.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/bootstrap.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/custom_config.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/custom_config.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/custom_config.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/custom_config.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/load.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/load.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/load.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/load.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/more.load.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/more.load.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/more.load.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/more.load.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/routes.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/routes.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/routes.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/routes.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/ExampleShell.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/ExampleShell.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php
diff --git a/lib/Cake/Test/test_app/View/errors/empty b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/Test/test_app/View/errors/empty
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/empty
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/other_task.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/other_task.php
diff --git a/lib/Cake/Test/test_app/View/pages/empty b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/templates/empty
similarity index 100%
rename from lib/Cake/Test/test_app/View/pages/empty
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Console/templates/empty
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/other_component.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/other_component.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/other_component.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/other_component.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/plugins_component.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/plugins_component.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/test_plugin_component.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/test_plugin_component.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/test_plugin_other_component.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/test_plugin_other_component.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginAppController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginAppController.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginController.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestsController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestsController.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/test_plugin_library.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/test_plugin_library.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Lib/test_plugin_library.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/test_plugin_library.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po b/lib/Cake/Test/test_app/Plugin/TestPlugin/Locale/po/LC_MESSAGES/test_plugin.po
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Locale/po/LC_MESSAGES/test_plugin.po
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po b/lib/Cake/Test/test_app/Plugin/TestPlugin/Locale/po/LC_MONETARY/test_plugin.po
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Locale/po/LC_MONETARY/test_plugin.po
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/test_plugin_persister_one.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/test_plugin_persister_one.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/test_plugin_persister_two.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/test_plugin_persister_two.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Database/DboDummy.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Database/DboDummy.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Database/TestDriver.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Database/TestDriver.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Session/TestPluginSession.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Session/TestPluginSession.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/TestSource.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/TestSource.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/test_other_source.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/test_other_source.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/TestPluginPost.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/TestPluginPost.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_app_model.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_app_model.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_auth_user.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_auth_user.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_authors.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_authors.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_authors.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_authors.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_comment.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_comment.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_comment.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_comment.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/vendors/welcome.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/welcome.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/vendors/welcome.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/welcome.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/index.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Tests/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/index.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Tests/index.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Tests/scaffold.form.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Tests/scaffold.form.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/plugin_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/plugin_element.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/test_plugin_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/test_plugin_element.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/layouts/default.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/layouts/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/layouts/default.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/layouts/default.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/test_plugin_asset.css
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/test_plugin_asset.css
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/theme_one.htc b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/theme_one.htc
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/theme_one.htc
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/theme_one.htc
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/unknown.extension b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/unknown.extension
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/unknown.extension
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/unknown.extension
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/flash/plugin_test.swf
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/flash/plugin_test.swf
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/img/cake.icon.gif
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/img/cake.icon.gif
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/js/test_plugin/test.js
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/js/test_plugin/test.js
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/pdfs/plugin_test.pdf
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/pdfs/plugin_test.pdf
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/root.js b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/root.js
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/root.js
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/root.js
diff --git a/lib/Cake/Test/test_app/plugins/TestPluginTwo/config/bootstrap.php b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Config/bootstrap.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPluginTwo/config/bootstrap.php
rename to lib/Cake/Test/test_app/Plugin/TestPluginTwo/Config/bootstrap.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/ExampleShell.php b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/ExampleShell.php
rename to lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php
diff --git a/lib/Cake/Test/test_app/View/scaffolds/empty b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/Test/test_app/View/scaffolds/empty
rename to lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty
diff --git a/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/WelcomeShell.php b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/WelcomeShell.php
rename to lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/empty b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/templates/empty
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/empty
rename to lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/templates/empty
diff --git a/lib/Cake/Test/test_app/vendors/Test/MyTest.php b/lib/Cake/Test/test_app/Vendor/Test/MyTest.php
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/Test/MyTest.php
rename to lib/Cake/Test/test_app/Vendor/Test/MyTest.php
diff --git a/lib/Cake/Test/test_app/vendors/Test/hello.php b/lib/Cake/Test/test_app/Vendor/Test/hello.php
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/Test/hello.php
rename to lib/Cake/Test/test_app/Vendor/Test/hello.php
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/webroot/css/test_asset.css b/lib/Cake/Test/test_app/Vendor/css/test_asset.css
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/webroot/css/test_asset.css
rename to lib/Cake/Test/test_app/Vendor/css/test_asset.css
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/webroot/img/test.jpg b/lib/Cake/Test/test_app/Vendor/img/test.jpg
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/webroot/img/test.jpg
rename to lib/Cake/Test/test_app/Vendor/img/test.jpg
diff --git a/lib/Cake/Test/test_app/vendors/sample/configure_test_vendor_sample.php b/lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/sample/configure_test_vendor_sample.php
rename to lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php
diff --git a/lib/Cake/Test/test_app/vendors/somename/some.name.php b/lib/Cake/Test/test_app/Vendor/somename/some.name.php
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/somename/some.name.php
rename to lib/Cake/Test/test_app/Vendor/somename/some.name.php
diff --git a/lib/Cake/Test/test_app/vendors/welcome.php b/lib/Cake/Test/test_app/Vendor/welcome.php
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/welcome.php
rename to lib/Cake/Test/test_app/Vendor/welcome.php
diff --git a/lib/Cake/Test/test_app/View/emails/html/custom.ctp b/lib/Cake/Test/test_app/View/Emails/html/custom.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/emails/html/custom.ctp
rename to lib/Cake/Test/test_app/View/Emails/html/custom.ctp
diff --git a/lib/Cake/Test/test_app/View/emails/html/default.ctp b/lib/Cake/Test/test_app/View/Emails/html/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/emails/html/default.ctp
rename to lib/Cake/Test/test_app/View/Emails/html/default.ctp
diff --git a/lib/Cake/Test/test_app/View/emails/html/nested_element.ctp b/lib/Cake/Test/test_app/View/Emails/html/nested_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/emails/html/nested_element.ctp
rename to lib/Cake/Test/test_app/View/Emails/html/nested_element.ctp
diff --git a/lib/Cake/Test/test_app/View/emails/text/custom.ctp b/lib/Cake/Test/test_app/View/Emails/text/custom.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/emails/text/custom.ctp
rename to lib/Cake/Test/test_app/View/Emails/text/custom.ctp
diff --git a/lib/Cake/Test/test_app/View/emails/text/default.ctp b/lib/Cake/Test/test_app/View/Emails/text/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/emails/text/default.ctp
rename to lib/Cake/Test/test_app/View/Emails/text/default.ctp
diff --git a/lib/Cake/Test/test_app/View/emails/text/wide.ctp b/lib/Cake/Test/test_app/View/Emails/text/wide.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/emails/text/wide.ctp
rename to lib/Cake/Test/test_app/View/Emails/text/wide.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Console/templates/empty b/lib/Cake/Test/test_app/View/Errors/empty
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Console/templates/empty
rename to lib/Cake/Test/test_app/View/Errors/empty
diff --git a/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/Task/empty b/lib/Cake/Test/test_app/View/Pages/empty
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/Task/empty
rename to lib/Cake/Test/test_app/View/Pages/empty
diff --git a/lib/Cake/Test/test_app/View/pages/extract.ctp b/lib/Cake/Test/test_app/View/Pages/extract.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/pages/extract.ctp
rename to lib/Cake/Test/test_app/View/Pages/extract.ctp
diff --git a/lib/Cake/Test/test_app/View/pages/home.ctp b/lib/Cake/Test/test_app/View/Pages/home.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/pages/home.ctp
rename to lib/Cake/Test/test_app/View/Pages/home.ctp
diff --git a/lib/Cake/Test/test_app/View/posts/alt_ext.alt b/lib/Cake/Test/test_app/View/Posts/alt_ext.alt
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/alt_ext.alt
rename to lib/Cake/Test/test_app/View/Posts/alt_ext.alt
diff --git a/lib/Cake/Test/test_app/View/posts/cache_empty_sections.ctp b/lib/Cake/Test/test_app/View/Posts/cache_empty_sections.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/cache_empty_sections.ctp
rename to lib/Cake/Test/test_app/View/Posts/cache_empty_sections.ctp
diff --git a/lib/Cake/Test/test_app/View/posts/cache_form.ctp b/lib/Cake/Test/test_app/View/Posts/cache_form.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/cache_form.ctp
rename to lib/Cake/Test/test_app/View/Posts/cache_form.ctp
diff --git a/lib/Cake/Test/test_app/View/posts/helper_overwrite.ctp b/lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/helper_overwrite.ctp
rename to lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp
diff --git a/lib/Cake/Test/test_app/View/posts/index.ctp b/lib/Cake/Test/test_app/View/Posts/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/index.ctp
rename to lib/Cake/Test/test_app/View/Posts/index.ctp
diff --git a/lib/Cake/Test/test_app/View/posts/multiple_nocache.ctp b/lib/Cake/Test/test_app/View/Posts/multiple_nocache.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/multiple_nocache.ctp
rename to lib/Cake/Test/test_app/View/Posts/multiple_nocache.ctp
diff --git a/lib/Cake/Test/test_app/View/posts/nocache_multiple_element.ctp b/lib/Cake/Test/test_app/View/Posts/nocache_multiple_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/nocache_multiple_element.ctp
rename to lib/Cake/Test/test_app/View/Posts/nocache_multiple_element.ctp
diff --git a/lib/Cake/Test/test_app/View/posts/scaffold.form.ctp b/lib/Cake/Test/test_app/View/Posts/scaffold.form.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/scaffold.form.ctp
rename to lib/Cake/Test/test_app/View/Posts/scaffold.form.ctp
diff --git a/lib/Cake/Test/test_app/View/posts/sequencial_nocache.ctp b/lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/sequencial_nocache.ctp
rename to lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp
diff --git a/lib/Cake/Test/test_app/View/posts/test_nocache_tags.ctp b/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/test_nocache_tags.ctp
rename to lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/templates/empty b/lib/Cake/Test/test_app/View/Scaffolds/empty
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/templates/empty
rename to lib/Cake/Test/test_app/View/Scaffolds/empty
diff --git a/lib/Cake/Test/test_app/View/tests_apps/index.ctp b/lib/Cake/Test/test_app/View/TestsApps/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/tests_apps/index.ctp
rename to lib/Cake/Test/test_app/View/TestsApps/index.ctp
diff --git a/lib/Cake/Test/test_app/View/tests_apps/json/index.ctp b/lib/Cake/Test/test_app/View/TestsApps/json/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/tests_apps/json/index.ctp
rename to lib/Cake/Test/test_app/View/TestsApps/json/index.ctp
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/posts/index.ctp b/lib/Cake/Test/test_app/View/Themed/test_theme/Posts/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/posts/index.ctp
rename to lib/Cake/Test/test_app/View/Themed/test_theme/Posts/index.ctp
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/posts/scaffold.index.ctp b/lib/Cake/Test/test_app/View/Themed/test_theme/Posts/scaffold.index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/posts/scaffold.index.ctp
rename to lib/Cake/Test/test_app/View/Themed/test_theme/Posts/scaffold.index.ctp
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/elements/test_element.ctp b/lib/Cake/Test/test_app/View/Themed/test_theme/elements/test_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/elements/test_element.ctp
rename to lib/Cake/Test/test_app/View/Themed/test_theme/elements/test_element.ctp
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/layouts/default.ctp b/lib/Cake/Test/test_app/View/Themed/test_theme/layouts/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/layouts/default.ctp
rename to lib/Cake/Test/test_app/View/Themed/test_theme/layouts/default.ctp
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/plugins/TestPlugin/layouts/plugin_default.ctp b/lib/Cake/Test/test_app/View/Themed/test_theme/plugins/TestPlugin/layouts/plugin_default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/plugins/TestPlugin/layouts/plugin_default.ctp
rename to lib/Cake/Test/test_app/View/Themed/test_theme/plugins/TestPlugin/layouts/plugin_default.ctp
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/plugins/TestPlugin/tests/index.ctp b/lib/Cake/Test/test_app/View/Themed/test_theme/plugins/TestPlugin/tests/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/plugins/TestPlugin/tests/index.ctp
rename to lib/Cake/Test/test_app/View/Themed/test_theme/plugins/TestPlugin/tests/index.ctp
diff --git a/lib/Cake/Test/test_app/vendors/css/test_asset.css b/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/css/test_asset.css
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/css/test_asset.css
rename to lib/Cake/Test/test_app/View/Themed/test_theme/webroot/css/test_asset.css
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/webroot/css/theme_webroot.css b/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/css/theme_webroot.css
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/webroot/css/theme_webroot.css
rename to lib/Cake/Test/test_app/View/Themed/test_theme/webroot/css/theme_webroot.css
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/webroot/flash/theme_test.swf b/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/flash/theme_test.swf
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/webroot/flash/theme_test.swf
rename to lib/Cake/Test/test_app/View/Themed/test_theme/webroot/flash/theme_test.swf
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/webroot/img/cake.power.gif b/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/img/cake.power.gif
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/webroot/img/cake.power.gif
rename to lib/Cake/Test/test_app/View/Themed/test_theme/webroot/img/cake.power.gif
diff --git a/lib/Cake/Test/test_app/vendors/img/test.jpg b/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/img/test.jpg
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/img/test.jpg
rename to lib/Cake/Test/test_app/View/Themed/test_theme/webroot/img/test.jpg
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/webroot/js/one/theme_one.js b/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/js/one/theme_one.js
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/webroot/js/one/theme_one.js
rename to lib/Cake/Test/test_app/View/Themed/test_theme/webroot/js/one/theme_one.js
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/webroot/js/theme.js b/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/js/theme.js
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/webroot/js/theme.js
rename to lib/Cake/Test/test_app/View/Themed/test_theme/webroot/js/theme.js
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/webroot/pdfs/theme_test.pdf b/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/pdfs/theme_test.pdf
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/webroot/pdfs/theme_test.pdf
rename to lib/Cake/Test/test_app/View/Themed/test_theme/webroot/pdfs/theme_test.pdf
diff --git a/lib/Cake/View/emails/html/default.ctp b/lib/Cake/View/Emails/html/default.ctp
similarity index 100%
rename from lib/Cake/View/emails/html/default.ctp
rename to lib/Cake/View/Emails/html/default.ctp
diff --git a/lib/Cake/View/emails/text/default.ctp b/lib/Cake/View/Emails/text/default.ctp
similarity index 100%
rename from lib/Cake/View/emails/text/default.ctp
rename to lib/Cake/View/Emails/text/default.ctp
diff --git a/lib/Cake/View/errors/error400.ctp b/lib/Cake/View/Errors/error400.ctp
similarity index 100%
rename from lib/Cake/View/errors/error400.ctp
rename to lib/Cake/View/Errors/error400.ctp
diff --git a/lib/Cake/View/errors/error500.ctp b/lib/Cake/View/Errors/error500.ctp
similarity index 100%
rename from lib/Cake/View/errors/error500.ctp
rename to lib/Cake/View/Errors/error500.ctp
diff --git a/lib/Cake/View/errors/missing_action.ctp b/lib/Cake/View/Errors/missing_action.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_action.ctp
rename to lib/Cake/View/Errors/missing_action.ctp
diff --git a/lib/Cake/View/errors/missing_behavior_class.ctp b/lib/Cake/View/Errors/missing_behavior_class.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_behavior_class.ctp
rename to lib/Cake/View/Errors/missing_behavior_class.ctp
diff --git a/lib/Cake/View/errors/missing_behavior_file.ctp b/lib/Cake/View/Errors/missing_behavior_file.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_behavior_file.ctp
rename to lib/Cake/View/Errors/missing_behavior_file.ctp
diff --git a/lib/Cake/View/errors/missing_component_class.ctp b/lib/Cake/View/Errors/missing_component_class.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_component_class.ctp
rename to lib/Cake/View/Errors/missing_component_class.ctp
diff --git a/lib/Cake/View/errors/missing_component_file.ctp b/lib/Cake/View/Errors/missing_component_file.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_component_file.ctp
rename to lib/Cake/View/Errors/missing_component_file.ctp
diff --git a/lib/Cake/View/errors/missing_connection.ctp b/lib/Cake/View/Errors/missing_connection.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_connection.ctp
rename to lib/Cake/View/Errors/missing_connection.ctp
diff --git a/lib/Cake/View/errors/missing_controller.ctp b/lib/Cake/View/Errors/missing_controller.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_controller.ctp
rename to lib/Cake/View/Errors/missing_controller.ctp
diff --git a/lib/Cake/View/errors/missing_database.ctp b/lib/Cake/View/Errors/missing_database.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_database.ctp
rename to lib/Cake/View/Errors/missing_database.ctp
diff --git a/lib/Cake/View/errors/missing_datasource_config.ctp b/lib/Cake/View/Errors/missing_datasource_config.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_datasource_config.ctp
rename to lib/Cake/View/Errors/missing_datasource_config.ctp
diff --git a/lib/Cake/View/errors/missing_datasource_file.ctp b/lib/Cake/View/Errors/missing_datasource_file.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_datasource_file.ctp
rename to lib/Cake/View/Errors/missing_datasource_file.ctp
diff --git a/lib/Cake/View/errors/missing_helper_class.ctp b/lib/Cake/View/Errors/missing_helper_class.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_helper_class.ctp
rename to lib/Cake/View/Errors/missing_helper_class.ctp
diff --git a/lib/Cake/View/errors/missing_helper_file.ctp b/lib/Cake/View/Errors/missing_helper_file.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_helper_file.ctp
rename to lib/Cake/View/Errors/missing_helper_file.ctp
diff --git a/lib/Cake/View/errors/missing_layout.ctp b/lib/Cake/View/Errors/missing_layout.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_layout.ctp
rename to lib/Cake/View/Errors/missing_layout.ctp
diff --git a/lib/Cake/View/errors/missing_table.ctp b/lib/Cake/View/Errors/missing_table.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_table.ctp
rename to lib/Cake/View/Errors/missing_table.ctp
diff --git a/lib/Cake/View/errors/missing_view.ctp b/lib/Cake/View/Errors/missing_view.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_view.ctp
rename to lib/Cake/View/Errors/missing_view.ctp
diff --git a/lib/Cake/View/errors/private_action.ctp b/lib/Cake/View/Errors/private_action.ctp
similarity index 100%
rename from lib/Cake/View/errors/private_action.ctp
rename to lib/Cake/View/Errors/private_action.ctp
diff --git a/lib/Cake/View/errors/scaffold_error.ctp b/lib/Cake/View/Errors/scaffold_error.ctp
similarity index 100%
rename from lib/Cake/View/errors/scaffold_error.ctp
rename to lib/Cake/View/Errors/scaffold_error.ctp
diff --git a/lib/Cake/View/pages/home.ctp b/lib/Cake/View/Pages/home.ctp
similarity index 100%
rename from lib/Cake/View/pages/home.ctp
rename to lib/Cake/View/Pages/home.ctp
diff --git a/lib/Cake/View/scaffolds/form.ctp b/lib/Cake/View/Scaffolds/form.ctp
similarity index 100%
rename from lib/Cake/View/scaffolds/form.ctp
rename to lib/Cake/View/Scaffolds/form.ctp
diff --git a/lib/Cake/View/scaffolds/index.ctp b/lib/Cake/View/Scaffolds/index.ctp
similarity index 100%
rename from lib/Cake/View/scaffolds/index.ctp
rename to lib/Cake/View/Scaffolds/index.ctp
diff --git a/lib/Cake/View/scaffolds/view.ctp b/lib/Cake/View/Scaffolds/view.ctp
similarity index 100%
rename from lib/Cake/View/scaffolds/view.ctp
rename to lib/Cake/View/Scaffolds/view.ctp