diff --git a/App/composer.json b/App/composer.json
new file mode 100644
index 00000000000..e2aa27a0be4
--- /dev/null
+++ b/App/composer.json
@@ -0,0 +1,15 @@
+{
+    "name": "cakephp/app",
+    "description": "CakePHP skeleton app",
+    "homepage": "http://cakephp.org",
+    "license": "MIT",
+    "require": {
+        "cakephp/framework": "dev-3.0",
+        "php": ">=5.4"
+    },
+    "autoload": {
+        "psr-0": {
+            "App\\": "."
+        }
+    }
+}
diff --git a/App/Vendor/empty b/App/vendor/empty
similarity index 100%
rename from App/Vendor/empty
rename to App/vendor/empty
diff --git a/composer.json b/lib/composer.json
similarity index 87%
rename from composer.json
rename to lib/composer.json
index 4222c3f7a16..9f8b69a0376 100644
--- a/composer.json
+++ b/lib/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "cakephp/cakephp",
+    "name": "cakephp/framework",
     "description": "The CakePHP framework",
     "type": "library",
     "keywords": ["framework"],
@@ -22,10 +22,10 @@
     },
     "autoload": {
         "psr-0": {
-            "Cake": "lib/Cake/"
+            "Cake\\": "Cake/"
         }
     },
     "bin": [
-        "lib/Cake/Console/cake"
+        "Cake/Console/cake"
     ]
 }
diff --git a/plugins/empty b/plugins/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/vendors/empty b/vendors/empty
deleted file mode 100644
index e69de29bb2d..00000000000