diff --git a/.gitignore b/.gitignore
index 7fcf2c97b8bd4..736b3124ec5da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 npm-debug.log
 Thumbs.db
 node_modules/
+.build/
 out/
 out-build/
 out-editor/
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 43712cc1ac4ca..7acd2c0fbe4c7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,6 +9,7 @@
 	"search.exclude": {
 		"**/node_modules/**": true,
 		"**/bower_components": true,
+		".build/**": true,
 		"out*/**": true,
 		"extensions/**/out/**": true
 	}
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 50eb15484d355..0274aa68427b0 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -25,6 +25,7 @@ var util = require('./lib/util');
 var buildfile = require('../src/buildfile');
 var common = require('./gulpfile.common');
 var root = path.dirname(__dirname);
+var build = path.join(root, '.build');
 var commit = util.getVersion(root);
 
 var baseModules = [
@@ -112,7 +113,7 @@ var config = {
 gulp.task('electron', function () {
 	// Force windows to use ia32
 	var arch = (process.platform === 'win32' ? 'ia32' : process.arch);
-	return electron.dest(path.join(path.dirname(root), 'Electron-Build'), _.extend({}, config, { arch: arch }));
+	return electron.dest(path.join(build, 'electron'), _.extend({}, config, { arch: arch }));
 });
 
 function mixinProduct() {
diff --git a/scripts/code.bat b/scripts/code.bat
index 82a0e57162d3b..735bf031555b4 100644
--- a/scripts/code.bat
+++ b/scripts/code.bat
@@ -8,5 +8,5 @@ set ELECTRON_ENABLE_STACK_DUMPING=1
 
 pushd %~dp0\..
 node .\node_modules\gulp\bin\gulp.js electron
-..\Electron-Build\CodeOSS.exe . %*
+.\.build\electron\CodeOSS.exe . %*
 popd
diff --git a/scripts/code.sh b/scripts/code.sh
index 44e2ff3ffb818..66cbb1290e39c 100755
--- a/scripts/code.sh
+++ b/scripts/code.sh
@@ -17,7 +17,7 @@ export ELECTRON_ENABLE_STACK_DUMPING=1
 cd $ROOT ; node node_modules/gulp/bin/gulp.js electron
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
-	cd $ROOT; ../Electron-Build/Electron.app/Contents/MacOS/Electron . $*
+	cd $ROOT; ./.build/electron/Electron.app/Contents/MacOS/Electron . $*
 else
-	cd $ROOT; ../Electron-Build/electron . $*
+	cd $ROOT; ./.build/electron/electron . $*
 fi
diff --git a/test/run.bat b/test/run.bat
index 570fa74c4abcd..9d23d422fa41e 100644
--- a/test/run.bat
+++ b/test/run.bat
@@ -3,5 +3,5 @@
 set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
 
 pushd %~dp0\..
-..\Electron-Build\Code.exe .\node_modules\mocha\bin\_mocha %*
+.\.build\electron\Code.exe .\node_modules\mocha\bin\_mocha %*
 popd
diff --git a/test/run.sh b/test/run.sh
index 80156c958a360..256febee48a30 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -10,11 +10,11 @@ fi
 # Unit Tests
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
-		../Electron-Build/Electron.app/Contents/MacOS/Electron \
+		./.build/electron/Electron.app/Contents/MacOS/Electron \
 		node_modules/mocha/bin/_mocha $*
 else
 	cd $ROOT ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
-		../Electron-Build/electron \
+		./.build/electron/electron \
 		node_modules/mocha/bin/_mocha $*
 fi