diff --git a/lib/Cake/View/Emails/html/default.ctp b/app/View/Emails/html/default.ctp
similarity index 100%
rename from lib/Cake/View/Emails/html/default.ctp
rename to app/View/Emails/html/default.ctp
diff --git a/app/View/Emails/html/empty b/app/View/Emails/html/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/Cake/View/Emails/text/default.ctp b/app/View/Emails/text/default.ctp
similarity index 100%
rename from lib/Cake/View/Emails/text/default.ctp
rename to app/View/Emails/text/default.ctp
diff --git a/app/View/Emails/text/empty b/app/View/Emails/text/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/View/Errors/empty b/app/View/Errors/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/Cake/View/Errors/error400.ctp b/app/View/Errors/error400.ctp
similarity index 100%
rename from lib/Cake/View/Errors/error400.ctp
rename to app/View/Errors/error400.ctp
diff --git a/lib/Cake/View/Errors/error500.ctp b/app/View/Errors/error500.ctp
similarity index 100%
rename from lib/Cake/View/Errors/error500.ctp
rename to app/View/Errors/error500.ctp
diff --git a/lib/Cake/View/Layouts/Emails/html/default.ctp b/app/View/Layouts/Emails/html/default.ctp
similarity index 100%
rename from lib/Cake/View/Layouts/Emails/html/default.ctp
rename to app/View/Layouts/Emails/html/default.ctp
diff --git a/app/View/Layouts/Emails/html/empty b/app/View/Layouts/Emails/html/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/Cake/View/Layouts/Emails/text/default.ctp b/app/View/Layouts/Emails/text/default.ctp
similarity index 100%
rename from lib/Cake/View/Layouts/Emails/text/default.ctp
rename to app/View/Layouts/Emails/text/default.ctp
diff --git a/app/View/Layouts/Emails/text/empty b/app/View/Layouts/Emails/text/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/Cake/View/Layouts/ajax.ctp b/app/View/Layouts/ajax.ctp
similarity index 100%
rename from lib/Cake/View/Layouts/ajax.ctp
rename to app/View/Layouts/ajax.ctp
diff --git a/lib/Cake/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
similarity index 100%
rename from lib/Cake/View/Layouts/default.ctp
rename to app/View/Layouts/default.ctp
diff --git a/lib/Cake/View/Layouts/flash.ctp b/app/View/Layouts/flash.ctp
similarity index 100%
rename from lib/Cake/View/Layouts/flash.ctp
rename to app/View/Layouts/flash.ctp
diff --git a/lib/Cake/View/Layouts/js/default.ctp b/app/View/Layouts/js/default.ctp
similarity index 100%
rename from lib/Cake/View/Layouts/js/default.ctp
rename to app/View/Layouts/js/default.ctp
diff --git a/app/View/Layouts/js/empty b/app/View/Layouts/js/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/Cake/View/Layouts/rss/default.ctp b/app/View/Layouts/rss/default.ctp
similarity index 100%
rename from lib/Cake/View/Layouts/rss/default.ctp
rename to app/View/Layouts/rss/default.ctp
diff --git a/app/View/Layouts/rss/empty b/app/View/Layouts/rss/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/Cake/View/Layouts/xml/default.ctp b/app/View/Layouts/xml/default.ctp
similarity index 100%
rename from lib/Cake/View/Layouts/xml/default.ctp
rename to app/View/Layouts/xml/default.ctp
diff --git a/app/View/Layouts/xml/empty b/app/View/Layouts/xml/empty
deleted file mode 100644
index e69de29bb..000000000