diff --git a/app/View/elements/empty b/app/View/Elements/empty
similarity index 100%
rename from app/View/elements/empty
rename to app/View/Elements/empty
diff --git a/app/View/layouts/emails/html/empty b/app/View/Layouts/emails/html/empty
similarity index 100%
rename from app/View/layouts/emails/html/empty
rename to app/View/Layouts/emails/html/empty
diff --git a/app/View/layouts/emails/text/empty b/app/View/Layouts/emails/text/empty
similarity index 100%
rename from app/View/layouts/emails/text/empty
rename to app/View/Layouts/emails/text/empty
diff --git a/app/View/layouts/js/empty b/app/View/Layouts/js/empty
similarity index 100%
rename from app/View/layouts/js/empty
rename to app/View/Layouts/js/empty
diff --git a/app/View/layouts/rss/empty b/app/View/Layouts/rss/empty
similarity index 100%
rename from app/View/layouts/rss/empty
rename to app/View/Layouts/rss/empty
diff --git a/app/View/layouts/xml/empty b/app/View/Layouts/xml/empty
similarity index 100%
rename from app/View/layouts/xml/empty
rename to app/View/Layouts/xml/empty
diff --git a/lib/Cake/Console/templates/skel/View/elements/empty b/lib/Cake/Console/templates/skel/View/Elements/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/elements/empty
rename to lib/Cake/Console/templates/skel/View/Elements/empty
diff --git a/lib/Cake/Console/templates/skel/View/layouts/ajax.ctp b/lib/Cake/Console/templates/skel/View/Layouts/ajax.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/ajax.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/ajax.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/emails/html/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/emails/html/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/emails/html/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/emails/html/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/emails/text/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/emails/text/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/emails/text/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/emails/text/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/flash.ctp b/lib/Cake/Console/templates/skel/View/Layouts/flash.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/flash.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/flash.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/js/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/js/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/js/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/js/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/rss/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/rss/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/rss/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/rss/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/xml/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/xml/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/xml/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/xml/default.ctp
diff --git a/lib/Cake/Test/test_app/Plugin/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/Plugin/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/Plugin/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/Plugin/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/Plugin/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/Plugin/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/View/elements/empty b/lib/Cake/Test/test_app/View/Elements/empty
similarity index 100%
rename from lib/Cake/Test/test_app/View/elements/empty
rename to lib/Cake/Test/test_app/View/Elements/empty
diff --git a/lib/Cake/Test/test_app/View/elements/html_call.ctp b/lib/Cake/Test/test_app/View/Elements/html_call.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/elements/html_call.ctp
rename to lib/Cake/Test/test_app/View/Elements/html_call.ctp
diff --git a/lib/Cake/Test/test_app/View/elements/nocache/contains_nocache.ctp b/lib/Cake/Test/test_app/View/Elements/nocache/contains_nocache.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/elements/nocache/contains_nocache.ctp
rename to lib/Cake/Test/test_app/View/Elements/nocache/contains_nocache.ctp
diff --git a/lib/Cake/Test/test_app/View/elements/nocache/plain.ctp b/lib/Cake/Test/test_app/View/Elements/nocache/plain.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/elements/nocache/plain.ctp
rename to lib/Cake/Test/test_app/View/Elements/nocache/plain.ctp
diff --git a/lib/Cake/Test/test_app/View/elements/nocache/sub1.ctp b/lib/Cake/Test/test_app/View/Elements/nocache/sub1.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/elements/nocache/sub1.ctp
rename to lib/Cake/Test/test_app/View/Elements/nocache/sub1.ctp
diff --git a/lib/Cake/Test/test_app/View/elements/nocache/sub2.ctp b/lib/Cake/Test/test_app/View/Elements/nocache/sub2.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/elements/nocache/sub2.ctp
rename to lib/Cake/Test/test_app/View/Elements/nocache/sub2.ctp
diff --git a/lib/Cake/Test/test_app/View/elements/session_helper.ctp b/lib/Cake/Test/test_app/View/Elements/session_helper.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/elements/session_helper.ctp
rename to lib/Cake/Test/test_app/View/Elements/session_helper.ctp
diff --git a/lib/Cake/Test/test_app/View/elements/test_element.ctp b/lib/Cake/Test/test_app/View/Elements/test_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/elements/test_element.ctp
rename to lib/Cake/Test/test_app/View/Elements/test_element.ctp
diff --git a/lib/Cake/Test/test_app/View/elements/type_check.ctp b/lib/Cake/Test/test_app/View/Elements/type_check.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/elements/type_check.ctp
rename to lib/Cake/Test/test_app/View/Elements/type_check.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/ajax.ctp b/lib/Cake/Test/test_app/View/Layouts/ajax.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/ajax.ctp
rename to lib/Cake/Test/test_app/View/Layouts/ajax.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/ajax2.ctp b/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/ajax2.ctp
rename to lib/Cake/Test/test_app/View/Layouts/ajax2.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/cache_empty_sections.ctp b/lib/Cake/Test/test_app/View/Layouts/cache_empty_sections.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/cache_empty_sections.ctp
rename to lib/Cake/Test/test_app/View/Layouts/cache_empty_sections.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/cache_layout.ctp b/lib/Cake/Test/test_app/View/Layouts/cache_layout.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/cache_layout.ctp
rename to lib/Cake/Test/test_app/View/Layouts/cache_layout.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/default.ctp b/lib/Cake/Test/test_app/View/Layouts/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/default.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/emails/html/default.ctp b/lib/Cake/Test/test_app/View/Layouts/emails/html/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/emails/html/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/emails/html/default.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/emails/html/thin.ctp b/lib/Cake/Test/test_app/View/Layouts/emails/html/thin.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/emails/html/thin.ctp
rename to lib/Cake/Test/test_app/View/Layouts/emails/html/thin.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/emails/text/default.ctp b/lib/Cake/Test/test_app/View/Layouts/emails/text/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/emails/text/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/emails/text/default.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/flash.ctp b/lib/Cake/Test/test_app/View/Layouts/flash.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/flash.ctp
rename to lib/Cake/Test/test_app/View/Layouts/flash.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/js/default.ctp b/lib/Cake/Test/test_app/View/Layouts/js/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/js/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/js/default.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/json/default.ctp b/lib/Cake/Test/test_app/View/Layouts/json/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/json/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/json/default.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/multi_cache.ctp b/lib/Cake/Test/test_app/View/Layouts/multi_cache.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/multi_cache.ctp
rename to lib/Cake/Test/test_app/View/Layouts/multi_cache.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/rss/default.ctp b/lib/Cake/Test/test_app/View/Layouts/rss/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/rss/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/rss/default.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/xml/default.ctp b/lib/Cake/Test/test_app/View/Layouts/xml/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/xml/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/xml/default.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/View/elements/exception_stack_trace.ctp b/lib/Cake/View/Elements/exception_stack_trace.ctp
similarity index 100%
rename from lib/Cake/View/elements/exception_stack_trace.ctp
rename to lib/Cake/View/Elements/exception_stack_trace.ctp
diff --git a/lib/Cake/View/elements/sql_dump.ctp b/lib/Cake/View/Elements/sql_dump.ctp
similarity index 100%
rename from lib/Cake/View/elements/sql_dump.ctp
rename to lib/Cake/View/Elements/sql_dump.ctp
diff --git a/lib/Cake/View/layouts/ajax.ctp b/lib/Cake/View/Layouts/ajax.ctp
similarity index 100%
rename from lib/Cake/View/layouts/ajax.ctp
rename to lib/Cake/View/Layouts/ajax.ctp
diff --git a/lib/Cake/View/layouts/default.ctp b/lib/Cake/View/Layouts/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/default.ctp
rename to lib/Cake/View/Layouts/default.ctp
diff --git a/lib/Cake/View/layouts/emails/html/default.ctp b/lib/Cake/View/Layouts/emails/html/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/emails/html/default.ctp
rename to lib/Cake/View/Layouts/emails/html/default.ctp
diff --git a/lib/Cake/View/layouts/emails/text/default.ctp b/lib/Cake/View/Layouts/emails/text/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/emails/text/default.ctp
rename to lib/Cake/View/Layouts/emails/text/default.ctp
diff --git a/lib/Cake/View/layouts/flash.ctp b/lib/Cake/View/Layouts/flash.ctp
similarity index 100%
rename from lib/Cake/View/layouts/flash.ctp
rename to lib/Cake/View/Layouts/flash.ctp
diff --git a/lib/Cake/View/layouts/js/default.ctp b/lib/Cake/View/Layouts/js/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/js/default.ctp
rename to lib/Cake/View/Layouts/js/default.ctp
diff --git a/lib/Cake/View/layouts/rss/default.ctp b/lib/Cake/View/Layouts/rss/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/rss/default.ctp
rename to lib/Cake/View/Layouts/rss/default.ctp
diff --git a/lib/Cake/View/layouts/xml/default.ctp b/lib/Cake/View/Layouts/xml/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/xml/default.ctp
rename to lib/Cake/View/Layouts/xml/default.ctp