diff --git a/packages/react-scripts/config/paths.js b/packages/react-scripts/config/paths.js
index 7645917fbc9..f3c310fc008 100644
--- a/packages/react-scripts/config/paths.js
+++ b/packages/react-scripts/config/paths.js
@@ -24,6 +24,7 @@ var isInCreateReactAppSource = (
 );
 
 function resolveOwn(relativePath) {
+  console.log(path.resolve(__dirname, relativePath));
   return path.resolve(__dirname, relativePath);
 }
 
@@ -34,11 +35,11 @@ function resolveApp(relativePath) {
 if (isInCreateReactAppSource) {
   // create-react-app development: we're in ./config/
   module.exports = {
-    appBuild: resolveOwn('../build'),
-    appHtml: resolveOwn('../template/index.html'),
-    appFavicon: resolveOwn('../template/favicon.ico'),
+    appBuild: resolveOwn('../scripts/build'),
+    appHtml: resolveOwn('../../../template/index.html'),
+    appFavicon: resolveOwn('../../../template/favicon.ico'),
     appPackageJson: resolveOwn('../package.json'),
-    appSrc: resolveOwn('../template/src'),
+    appSrc: resolveOwn('../../../template/src'),
     appNodeModules: resolveOwn('../node_modules'),
     ownNodeModules: resolveOwn('../node_modules')
   };
diff --git a/package.json b/packages/react-scripts/package.json
similarity index 85%
rename from package.json
rename to packages/react-scripts/package.json
index 441d773d864..6ee817afcac 100644
--- a/package.json
+++ b/packages/react-scripts/package.json
@@ -11,11 +11,11 @@
     "url": "https://github.com/facebookincubator/create-react-app/issues"
   },
   "scripts": {
-    "build": "node packages/react-scripts/scripts/build.js --debug-template",
-    "create-react-app": "node packages/create-react-app/index.js --scripts-version \"$PWD/`npm pack`\"",
+    "build": "node scripts/build.js --debug-template",
+    "create-react-app": "node ../create-react-app/index.js --scripts-version \"$PWD/`npm pack`\"",
     "e2e": "tasks/e2e.sh",
-    "start": "node packages/react-scripts/scripts/start.js --debug-template",
-    "test": "node packages/react-scripts/scripts/test.js --debug-template"
+    "start": "node scripts/start.js --debug-template",
+    "test": "node scripts/test.js --debug-template"
   },
   "files": [
     "PATENTS",
@@ -25,7 +25,7 @@
     "template"
   ],
   "bin": {
-    "react-scripts": "./packages/react-scripts/bin/react-scripts.js"
+    "react-scripts": "./bin/react-scripts.js"
   },
   "dependencies": {
     "autoprefixer": "6.4.0",