diff --git a/App/Config/paths.php b/App/Config/paths.php
index 0d04e7dbc29..2461fbabd26 100644
--- a/App/Config/paths.php
+++ b/App/Config/paths.php
@@ -76,7 +76,7 @@
  * assume the standard lib/Cake path.
  */
 if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
-	define('CAKE_CORE_INCLUDE_PATH', dirname(__DIR__) . '/vendor/cakephp/framework');
+	define('CAKE_CORE_INCLUDE_PATH', dirname(__DIR__) . '/vendor/cakephp/cakephp');
 } else {
 	define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
 }
diff --git a/App/composer.json b/App/composer.json
index f80d14169c0..cbf2d1e11e6 100644
--- a/App/composer.json
+++ b/App/composer.json
@@ -4,7 +4,7 @@
     "homepage": "http://cakephp.org",
     "license": "MIT",
     "require": {
-        "cakephp/framework": "dev-3.0",
+        "cakephp/cakephp": "dev-3.0",
         "php": ">=5.4"
     },
     "require-dev": {
diff --git a/index.php b/index.php
deleted file mode 100644
index 0567c3b4ff0..00000000000
--- a/index.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Requests collector.
- *
- *  This file collects requests if:
- *	- no mod_rewrite is available or .htaccess files are not supported
- *  - requires App.baseUrl to be uncommented in App/Config/app.php
- *	- App/webroot is not set as a document root.
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c), Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-require 'App/webroot/index.php';
diff --git a/CONTRIBUTING.md b/lib/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to lib/CONTRIBUTING.md
diff --git a/lib/README.md b/lib/README.md
index 44687c9558f..b256f9dfad6 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -25,10 +25,31 @@ And run `php composer.phar update`
 Some Handy Links
 ----------------
 
-* [CakePHP](http://www.cakephp.org) - The rapid development PHP framework
-* [Cookbook](http://book.cakephp.org) - THE Cake user documentation; start learning here!
-* [Plugins](http://plugins.cakephp.org/) - A repository of extensions to the framework
-* [The Bakery](http://bakery.cakephp.org) - Tips, tutorials and articles
-* [API](http://api.cakephp.org) - A reference to Cake's classes
-* [CakePHP TV](http://tv.cakephp.org) - Screen casts from events and video tutorials
-* [The Cake Software Foundation](http://cakefoundation.org/) - promoting development related to CakePHP
+[CakePHP](http://www.cakephp.org) - The rapid development PHP framework
+
+[Cookbook](http://book.cakephp.org) - THE Cake user documentation; start learning here!
+
+[Plugins](http://plugins.cakephp.org/) - A repository of extensions to the framework
+
+[The Bakery](http://bakery.cakephp.org) - Tips, tutorials and articles
+
+[API](http://api.cakephp.org) - A reference to Cake's classes
+
+[CakePHP TV](http://tv.cakephp.org) - Screen casts from events and video tutorials
+
+[The Cake Software Foundation](http://cakefoundation.org/) - promoting development related to CakePHP
+
+Get Support!
+------------
+
+[Our Google Group](https://groups.google.com/group/cake-php) - community mailing list and forum
+
+[#cakephp](http://webchat.freenode.net/?channels=#cakephp) on irc.freenode.net - Come chat with us, we have cake.
+
+[Q & A](http://ask.cakephp.org/) - Ask questions here, all questions welcome
+
+[Lighthouse](https://cakephp.lighthouseapp.com/) - Got issues? Please tell us!
+
+[![Bake Status](https://secure.travis-ci.org/cakephp/cakephp.png?branch=3.0)](http://travis-ci.org/cakephp/cakephp)
+
+![Cake Power](https://raw.github.com/cakephp/cakephp/master/lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif)
diff --git a/build.properties b/lib/build.properties
similarity index 100%
rename from build.properties
rename to lib/build.properties
diff --git a/build.xml b/lib/build.xml
similarity index 100%
rename from build.xml
rename to lib/build.xml
diff --git a/lib/composer.json b/lib/composer.json
index 878d72e2e7a..e078ced5b79 100644
--- a/lib/composer.json
+++ b/lib/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "cakephp/framework",
+    "name": "cakephp/cakephp",
     "description": "The CakePHP framework",
     "type": "library",
     "keywords": ["framework"],
@@ -13,7 +13,7 @@
     ],
     "support": {
         "issues": "http://cakephp.lighthouseapp.com/",
-        "forum": "http://ask.cakephp.org/",
+        "forum": "http://stackoverflow.com/tags/cakephp",
         "irc": "irc://irc.freenode.org/cakephp",
         "source": "https://github.com/cakephp/cakephp/"
     },