diff --git a/dev/link-packages.js b/dev/link-packages.js
new file mode 100644
index 0000000000..3f98966b2f
--- /dev/null
+++ b/dev/link-packages.js
@@ -0,0 +1,23 @@
+/* eslint-disable no-console */
+
+const fse = require('fs-extra')
+const path = require('path')
+const globber = require('glob')
+const Promise = require('bluebird')
+
+const fs = Promise.promisifyAll(fse)
+const glob = Promise.promisify(globber)
+
+const pathToPackages = path.join('node_modules', '@')
+
+// glob all of the names of packages
+glob('./packages/*')
+.map((folder) => {
+  // strip off the initial './'
+  // ./packages/foo -> node_modules/@packages/foo
+  const dest = pathToPackages + folder.slice(2)
+
+  console.log('symlinking', folder, '->', dest)
+
+  return fs.ensureSymlinkAsync(folder, dest)
+})
diff --git a/package.json b/package.json
index 2d816b5346..097ddaeaab 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
     "test": "echo 'This runs just the CLI tests' && mocha",
     "test-watch": "mocha --watch",
     "test-e2e": "blah",
-    "postinstall": "npm run all install && npm run build",
+    "link": "node ./dev/link-packages.js",
+    "postinstall": "npm run link && npm run all install && npm run build",
     "clean-deps": "npm run all clean-deps"
   },
   "author": "",
diff --git a/packages/coffee/package.json b/packages/coffee/package.json
index ac65dab20a..a36741c833 100644
--- a/packages/coffee/package.json
+++ b/packages/coffee/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "coffee",
+  "name": "@packages/coffee",
   "main": "index.js",
   "dependencies": {
     "coffee-script": "1.12.5"
diff --git a/packages/desktop-gui/package.json b/packages/desktop-gui/package.json
index ba91ac40c4..ee43a57c34 100644
--- a/packages/desktop-gui/package.json
+++ b/packages/desktop-gui/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-desktop-gui",
+  "name": "@packages/desktop-gui",
   "version": "0.4.9",
   "description": "Desktop GUI for managing Cypress projects.",
   "main": "lib/gui.js",
diff --git a/packages/driver/package.json b/packages/driver/package.json
index 4ab0554a77..df004f0e64 100644
--- a/packages/driver/package.json
+++ b/packages/driver/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "driver",
+  "name": "@packages/driver",
   "version": "1.0.0",
   "description": "",
   "scripts": {
diff --git a/packages/driver/test/support/server/browser.coffee b/packages/driver/test/support/server/browser.coffee
index fa711e5e9b..ddc498e72a 100644
--- a/packages/driver/test/support/server/browser.coffee
+++ b/packages/driver/test/support/server/browser.coffee
@@ -1,7 +1,7 @@
 Promise = require("bluebird")
 fs = Promise.promisifyAll(require("fs-extra"))
 path = require("path")
-launcher = require("../../../../launcher")
+launcher = require("@packages/launcher")
 
 profileDir = path.join(__dirname, "../../../dist-test/browsers/chrome")
 themeDir = path.join(__dirname, "theme")
diff --git a/packages/driver/test/support/server/server.coffee b/packages/driver/test/support/server/server.coffee
index 49770d76f2..e60d70677e 100644
--- a/packages/driver/test/support/server/server.coffee
+++ b/packages/driver/test/support/server/server.coffee
@@ -9,7 +9,7 @@ glob      = require("glob")
 coffee    = require("../../../../coffee")
 str       = require("string-to-stream")
 Promise   = require("bluebird")
-xhrs      = require("../../../../server/lib/controllers/xhrs")
+xhrs      = require("@packages/server/lib/controllers/xhrs")
 Runner    = require("./runner")
 
 args = require("minimist")(process.argv.slice(2))
diff --git a/packages/electron/index.js b/packages/electron/index.js
index 084e07342f..df512591cb 100644
--- a/packages/electron/index.js
+++ b/packages/electron/index.js
@@ -1,3 +1,3 @@
-require("../coffee/register")
+require("@packages/coffee/register")
 
 module.exports = require("./lib/electron")
diff --git a/packages/electron/lib/install.coffee b/packages/electron/lib/install.coffee
index b975ffc1b3..4b65c33664 100644
--- a/packages/electron/lib/install.coffee
+++ b/packages/electron/lib/install.coffee
@@ -52,7 +52,7 @@ module.exports = {
 
   package: (options = {}) ->
     pkgr    = require("electron-packager")
-    icons   = require("../../icons")
+    icons   = require("@cypress/icons")
 
     pkgr    = Promise.promisify(pkgr)
 
diff --git a/packages/electron/package.json b/packages/electron/package.json
index 829ef206d0..b917cb3dd7 100644
--- a/packages/electron/package.json
+++ b/packages/electron/package.json
@@ -6,7 +6,7 @@
   "main": "index.js",
   "scripts": {
     "start": "./bin/cypress-electron",
-    "test": "mocha --compilers coffee:../coffee/register",
+    "test": "mocha --compilers coffee:@packages/coffee/register",
     "postinstall": "./bin/cypress-electron --install",
     "clean-deps": "rm -rf node_modules"
   },
diff --git a/packages/example/package.json b/packages/example/package.json
index 689cf5d4e8..eaf56ce2ce 100644
--- a/packages/example/package.json
+++ b/packages/example/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-example",
+  "name": "@packages/example",
   "version": "0.8.0",
   "description": "Interal Cypress repo for managing https://example.cypress.io",
   "main": "index.js",
diff --git a/packages/extension/gulpfile.coffee b/packages/extension/gulpfile.coffee
index 204bbea4b9..ed4bfc7e18 100644
--- a/packages/extension/gulpfile.coffee
+++ b/packages/extension/gulpfile.coffee
@@ -10,7 +10,7 @@ source     = require("vinyl-source-stream")
 Promise    = require("bluebird")
 coffeeify  = require("coffeeify")
 browserify = require("browserify")
-icons      = require("../icons")
+icons      = require("@cypress/icons")
 ext        = require("./")
 
 gulp.task "copy:socket:client", ->
diff --git a/packages/extension/index.js b/packages/extension/index.js
index b12e7e500f..1a4b057d83 100644
--- a/packages/extension/index.js
+++ b/packages/extension/index.js
@@ -1,3 +1,3 @@
-require("../coffee/register")
+require("@packages/coffee/register")
 
 module.exports = require("./lib/extension")
diff --git a/packages/extension/package.json b/packages/extension/package.json
index de53e4768d..bf160b152c 100644
--- a/packages/extension/package.json
+++ b/packages/extension/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-extension",
+  "name": "@packages/extension",
   "version": "0.4.2",
   "description": "Cypress Chrome Extension",
   "main": "index.js",
diff --git a/packages/extension/test/integration/background_spec.coffee b/packages/extension/test/integration/background_spec.coffee
index 3a37248ec2..c7f4d3c444 100644
--- a/packages/extension/test/integration/background_spec.coffee
+++ b/packages/extension/test/integration/background_spec.coffee
@@ -2,7 +2,7 @@ require("../spec_helper")
 
 _          = require("lodash")
 http       = require("http")
-socket     = require("packages/socket")
+socket     = require("@packages/socket")
 Promise    = require("bluebird")
 background = require("../../app/background")
 
diff --git a/packages/extension/test/mocha.opts b/packages/extension/test/mocha.opts
index 0ae5049e44..6cf813fc8a 100644
--- a/packages/extension/test/mocha.opts
+++ b/packages/extension/test/mocha.opts
@@ -1,5 +1,5 @@
 test/unit
 test/integration
 --reporter spec
---compilers coffee:../coffee/register
+--compilers coffee:@packages/coffee/register
 --recursive
diff --git a/packages/https-proxy/https.js b/packages/https-proxy/https.js
index c6a3d601b6..dd929d8a8b 100644
--- a/packages/https-proxy/https.js
+++ b/packages/https-proxy/https.js
@@ -1,2 +1,2 @@
-require("../coffee/register")
+require("@packages/coffee/register")
 require("./test/helpers/https_server").start(8443)
diff --git a/packages/https-proxy/index.js b/packages/https-proxy/index.js
index e2752cb763..aec18141d6 100644
--- a/packages/https-proxy/index.js
+++ b/packages/https-proxy/index.js
@@ -1,3 +1,3 @@
-require("../coffee/register")
+require("@packages/coffee/register")
 
 module.exports = require("./lib/proxy")
diff --git a/packages/https-proxy/package.json b/packages/https-proxy/package.json
index c82430d737..214949f83b 100644
--- a/packages/https-proxy/package.json
+++ b/packages/https-proxy/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-https-proxy",
+  "name": "@packages/https-proxy",
   "version": "0.1.5",
   "description": "",
   "main": "index.js",
diff --git a/packages/https-proxy/test/mocha.opts b/packages/https-proxy/test/mocha.opts
index 0ae5049e44..6cf813fc8a 100644
--- a/packages/https-proxy/test/mocha.opts
+++ b/packages/https-proxy/test/mocha.opts
@@ -1,5 +1,5 @@
 test/unit
 test/integration
 --reporter spec
---compilers coffee:../coffee/register
+--compilers coffee:@packages/coffee/register
 --recursive
diff --git a/packages/launcher/index.js b/packages/launcher/index.js
index 5d033e3a1e..5c34f904c4 100644
--- a/packages/launcher/index.js
+++ b/packages/launcher/index.js
@@ -2,7 +2,7 @@
 
 // compile TypeScript files on the fly using
 // Node require hook project
-require('../ts/register')
+require('@packages/ts/register')
 const launcher = require("./lib/launcher")
 module.exports = launcher
 
diff --git a/packages/launcher/package.json b/packages/launcher/package.json
index 4d9f5a9899..94067eef54 100644
--- a/packages/launcher/package.json
+++ b/packages/launcher/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-launcher",
+  "name": "@packages/launcher",
   "version": "0.1.1",
   "description": "Internal lib for spawning browser processes",
   "main": "index.js",
diff --git a/packages/launcher/test/mocha.opts b/packages/launcher/test/mocha.opts
index d2d238db08..a446c35634 100644
--- a/packages/launcher/test/mocha.opts
+++ b/packages/launcher/test/mocha.opts
@@ -1,3 +1,3 @@
 test/unit
---compilers coffee:../coffee/register,ts:../ts/register
+--compilers coffee:@packages/coffee/register,ts:@packages/ts/register
 --recursive
diff --git a/packages/reporter/package.json b/packages/reporter/package.json
index ff571016e5..9faab849d4 100644
--- a/packages/reporter/package.json
+++ b/packages/reporter/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "@cypress/core-reporter",
+  "name": "@packages/reporter",
   "version": "0.3.4",
   "main": "lib/reporter",
   "browser": "src/main",
   "scripts": {
-    "postinstall": "echo 'This project needs: npm run build'",
+    "postinstall": "echo '@packages/reporter needs: npm run build'",
     "build": "node ./scripts/build-dev.js",
     "build-prod": "node ./scripts/build-prod.js",
     "watch": "node ./scripts/watch.js",
diff --git a/packages/runner/package.json b/packages/runner/package.json
index 53d25691c6..5b06c1ed84 100644
--- a/packages/runner/package.json
+++ b/packages/runner/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-runner",
+  "name": "@packages/runner",
   "version": "0.3.11",
   "main": "lib/runner.js",
   "repository": {
@@ -12,7 +12,7 @@
   },
   "homepage": "https://github.com/cypress-io/cypress-core-runner#readme",
   "scripts": {
-    "postinstall": "echo 'This project needs: npm run build'",
+    "postinstall": "echo '@packages/runner needs: npm run build'",
     "build": "node ./scripts/build-dev.js",
     "build-prod": "node ./scripts/build-prod.js",
     "watch": "node ./scripts/watch.js",
diff --git a/packages/server/deploy/base.coffee b/packages/server/deploy/base.coffee
index d6def2bdf6..4de7c5c4bf 100644
--- a/packages/server/deploy/base.coffee
+++ b/packages/server/deploy/base.coffee
@@ -12,7 +12,7 @@ expect       = require("chai").expect
 Promise      = require("bluebird")
 obfuscator   = require("obfuscator")
 runSequence  = require("run-sequence")
-cypressElectron = require("../../electron")
+cypressElectron = require("@packages/electron")
 log          = require("./log")
 meta         = require("./meta")
 pkg          = require("../package.json")
diff --git a/packages/server/index.js b/packages/server/index.js
index b9c4c0671e..4860a63950 100644
--- a/packages/server/index.js
+++ b/packages/server/index.js
@@ -1,7 +1,7 @@
 process.env.UV_THREADPOOL_SIZE = 128
 require('graceful-fs').gracefulify(require('fs'))
-require("../ts/register")
-require("../coffee/register")
+require("@packages/ts/register")
+require("@packages/coffee/register")
 require && require.extensions && delete require.extensions[".litcoffee"]
 require && require.extensions && delete require.extensions[".coffee.md"]
 require("./lib/cypress").start(process.argv)
diff --git a/packages/server/lib/automation/cookies.coffee b/packages/server/lib/automation/cookies.coffee
index ab13f01e00..2d130968c4 100644
--- a/packages/server/lib/automation/cookies.coffee
+++ b/packages/server/lib/automation/cookies.coffee
@@ -1,6 +1,6 @@
 _         = require("lodash")
 Promise   = require("bluebird")
-extension = require("../../../extension")
+extension = require("@packages/extension")
 
 ## match the w3c webdriver spec on return cookies
 ## https://w3c.github.io/webdriver/webdriver-spec.html#cookies
diff --git a/packages/server/lib/browsers/chrome.coffee b/packages/server/lib/browsers/chrome.coffee
index ecac0bd8dd..019365f0ab 100644
--- a/packages/server/lib/browsers/chrome.coffee
+++ b/packages/server/lib/browsers/chrome.coffee
@@ -1,6 +1,6 @@
 fs       = require("fs-extra")
 Promise   = require("bluebird")
-extension = require("../../../extension")
+extension = require("@packages/extension")
 appData   = require("../util/app_data")
 utils     = require("./utils")
 
diff --git a/packages/server/lib/browsers/utils.coffee b/packages/server/lib/browsers/utils.coffee
index a60481d7bd..83f2416b40 100644
--- a/packages/server/lib/browsers/utils.coffee
+++ b/packages/server/lib/browsers/utils.coffee
@@ -1,7 +1,7 @@
 fs       = require("fs-extra")
 path     = require("path")
 Promise  = require("bluebird")
-launcher = require("../../../launcher")
+launcher = require("@packages/launcher")
 appData  = require("../util/app_data")
 
 fs = Promise.promisifyAll(fs)
diff --git a/packages/server/lib/controllers/client.coffee b/packages/server/lib/controllers/client.coffee
index b9380781ba..3ef0488446 100644
--- a/packages/server/lib/controllers/client.coffee
+++ b/packages/server/lib/controllers/client.coffee
@@ -1,4 +1,4 @@
-socketIo = require("../../../socket")
+socketIo = require("@packages/socket")
 
 ## hold onto the client source + version in memory
 clientSource  = socketIo.getClientSource()
diff --git a/packages/server/lib/controllers/driver.coffee b/packages/server/lib/controllers/driver.coffee
index b9ebe11e9e..11f9ec63fb 100644
--- a/packages/server/lib/controllers/driver.coffee
+++ b/packages/server/lib/controllers/driver.coffee
@@ -1,5 +1,5 @@
 send   = require("send")
-driver = require("../../../driver")
+driver = require("@packages/driver")
 
 module.exports = {
   handle: (req, res) ->
diff --git a/packages/server/lib/controllers/reporter.coffee b/packages/server/lib/controllers/reporter.coffee
index 70c1699e74..f43419aef9 100644
--- a/packages/server/lib/controllers/reporter.coffee
+++ b/packages/server/lib/controllers/reporter.coffee
@@ -1,6 +1,6 @@
 _ = require("lodash")
 send = require("send")
-reporter = require("../../../reporter")
+reporter = require("@packages/reporter")
 
 module.exports = {
   handle: (req, res) ->
diff --git a/packages/server/lib/controllers/runner.coffee b/packages/server/lib/controllers/runner.coffee
index 1fff293b29..4822054336 100644
--- a/packages/server/lib/controllers/runner.coffee
+++ b/packages/server/lib/controllers/runner.coffee
@@ -1,6 +1,6 @@
 _      = require("lodash")
 send   = require("send")
-runner = require("../../../runner")
+runner = require("@packages/runner")
 pkg    = require("../../package.json")
 
 module.exports = {
diff --git a/packages/server/lib/controllers/static.coffee b/packages/server/lib/controllers/static.coffee
index 0ba0ad3d33..9e988595f1 100644
--- a/packages/server/lib/controllers/static.coffee
+++ b/packages/server/lib/controllers/static.coffee
@@ -1,5 +1,5 @@
 send      = require("send")
-staticPkg = require("../../../static")
+staticPkg = require("@packages/static")
 
 module.exports = {
   handle: (req, res) ->
diff --git a/packages/server/lib/cypress.coffee b/packages/server/lib/cypress.coffee
index 18752d79f8..92c42b15b5 100644
--- a/packages/server/lib/cypress.coffee
+++ b/packages/server/lib/cypress.coffee
@@ -57,7 +57,7 @@ module.exports = {
 
         ## open the cypress electron wrapper shell app
         new Promise (resolve) ->
-          cypressElectron = require("../../electron")
+          cypressElectron = require("@packages/electron")
           fn = (code) ->
             ## juggle up the failures since our outer
             ## promise is expecting this object structure
diff --git a/packages/server/lib/gui/windows.coffee b/packages/server/lib/gui/windows.coffee
index 669362ebea..fa1a0167f8 100644
--- a/packages/server/lib/gui/windows.coffee
+++ b/packages/server/lib/gui/windows.coffee
@@ -1,8 +1,8 @@
 _             = require("lodash")
 uri           = require("url")
 Promise       = require("bluebird")
-cyDesktop     = require("../../../desktop-gui")
-extension     = require("../../../extension")
+cyDesktop     = require("@packages/desktop-gui")
+extension     = require("@packages/extension")
 contextMenu   = require("electron-context-menu")
 BrowserWindow = require("electron").BrowserWindow
 cwd           = require("../cwd")
diff --git a/packages/server/lib/modes/headed.coffee b/packages/server/lib/modes/headed.coffee
index 649e7c22cf..0b4fcc093f 100644
--- a/packages/server/lib/modes/headed.coffee
+++ b/packages/server/lib/modes/headed.coffee
@@ -5,7 +5,7 @@ app        = require("electron").app
 image      = require("electron").nativeImage
 Promise    = require("bluebird")
 Position   = require("electron-positioner")
-cyIcons    = require("../../../icons")
+cyIcons    = require("@cypress/icons")
 user       = require("../user")
 errors     = require("../errors")
 savedState = require("../saved_state")
diff --git a/packages/server/lib/scaffold.coffee b/packages/server/lib/scaffold.coffee
index abeff09d12..8dee62117f 100644
--- a/packages/server/lib/scaffold.coffee
+++ b/packages/server/lib/scaffold.coffee
@@ -2,7 +2,7 @@ _         = require("lodash")
 fs        = require("fs-extra")
 Promise   = require("bluebird")
 path      = require("path")
-cypressEx = require("../../example")
+cypressEx = require("@packages/example")
 glob      = require("glob")
 hbs       = require("hbs")
 cwd       = require("./cwd")
diff --git a/packages/server/lib/server.coffee b/packages/server/lib/server.coffee
index 1d5250b033..1be30057a5 100644
--- a/packages/server/lib/server.coffee
+++ b/packages/server/lib/server.coffee
@@ -8,7 +8,7 @@ express      = require("express")
 Promise      = require("bluebird")
 evilDns      = require("evil-dns")
 httpProxy    = require("http-proxy")
-httpsProxy   = require("../../https-proxy")
+httpsProxy   = require("@packages/https-proxy")
 cors         = require("./util/cors")
 origin       = require("./util/origin")
 connect      = require("./util/connect")
diff --git a/packages/server/lib/socket.coffee b/packages/server/lib/socket.coffee
index ce52f2337d..bd76eb35df 100644
--- a/packages/server/lib/socket.coffee
+++ b/packages/server/lib/socket.coffee
@@ -3,7 +3,7 @@ fs            = require("fs-extra")
 path          = require("path")
 uuid          = require("node-uuid")
 Promise       = require("bluebird")
-socketIo      = require("../../socket")
+socketIo      = require("@packages/socket")
 open          = require("./util/open")
 pathHelpers   = require("./util/path_helpers")
 cwd           = require("./cwd")
diff --git a/packages/server/package.json b/packages/server/package.json
index 67f4790326..2977a6ec13 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "cypress",
+  "name": "@packages/server",
   "productName": "Cypress",
   "version": "0.19.2",
   "description": "Javascript Test Engine",
diff --git a/packages/server/repl.js b/packages/server/repl.js
index 4ba8761014..4c4d3b51e5 100644
--- a/packages/server/repl.js
+++ b/packages/server/repl.js
@@ -1,3 +1,3 @@
-require("../ts/register")
-require("../coffee/register")
+require("@packages/ts/register")
+require("@packages/coffee/register")
 require("./lib/repl")
diff --git a/packages/server/test/integration/cli_spec.coffee b/packages/server/test/integration/cli_spec.coffee
index 959e92f033..5195fd7cc2 100644
--- a/packages/server/test/integration/cli_spec.coffee
+++ b/packages/server/test/integration/cli_spec.coffee
@@ -40,7 +40,7 @@ describe "CLI Interface", ->
       done(err) if err
 
       pkg = JSON.parse(parse(stdout))
-      expect(pkg.name).to.eq("cypress")
+      expect(pkg.name).to.eq("@packages/server")
       expect(pkg.productName).to.eq("Cypress")
       done()
 
diff --git a/packages/server/test/integration/cypress_spec.coffee b/packages/server/test/integration/cypress_spec.coffee
index 0972021d3a..63e93ca8de 100644
--- a/packages/server/test/integration/cypress_spec.coffee
+++ b/packages/server/test/integration/cypress_spec.coffee
@@ -9,7 +9,7 @@ Promise    = require("bluebird")
 electron   = require("electron")
 inquirer   = require("inquirer")
 Fixtures   = require("../support/helpers/fixtures")
-extension  = require("#{root}../../packages/extension")
+extension  = require("@packages/extension")
 pkg        = require("#{root}package.json")
 git        = require("#{root}lib/util/git")
 bundle     = require("#{root}lib/util/bundle")
@@ -905,7 +905,7 @@ describe "lib/cypress", ->
     it "logs package.json and exits", ->
       cypress.start(["--return-pkg"])
       .then =>
-        expect(console.log).to.be.calledWithMatch('{"name":"cypress"')
+        expect(console.log).to.be.calledWithMatch('{"name":"@packages/server"')
         @expectExitWith(0)
 
   context "--version", ->
diff --git a/packages/server/test/integration/http_requests_spec.coffee b/packages/server/test/integration/http_requests_spec.coffee
index cbcfe2146c..123275495e 100644
--- a/packages/server/test/integration/http_requests_spec.coffee
+++ b/packages/server/test/integration/http_requests_spec.coffee
@@ -16,7 +16,7 @@ cjsxify       = require("cjsxify")
 streamToPromise = require("stream-to-promise")
 evilDns       = require("evil-dns")
 Promise       = require("bluebird")
-httpsServer   = require("#{root}../../packages/https-proxy/test/helpers/https_server")
+httpsServer   = require("@packages/https-proxy/test/helpers/https_server")
 pkg           = require("#{root}package.json")
 config        = require("#{root}lib/config")
 Server        = require("#{root}lib/server")
diff --git a/packages/server/test/integration/server_spec.coffee b/packages/server/test/integration/server_spec.coffee
index 1d71c11363..0ba95edd60 100644
--- a/packages/server/test/integration/server_spec.coffee
+++ b/packages/server/test/integration/server_spec.coffee
@@ -4,7 +4,7 @@ _             = require("lodash")
 rp            = require("request-promise")
 Promise       = require("bluebird")
 evilDns       = require("evil-dns")
-httpsServer   = require("#{root}../../packages/https-proxy/test/helpers/https_server")
+httpsServer   = require("@packages/https-proxy/test/helpers/https_server")
 buffers       = require("#{root}lib/util/buffers")
 config        = require("#{root}lib/config")
 Server        = require("#{root}lib/server")
diff --git a/packages/server/test/integration/websockets_spec.coffee b/packages/server/test/integration/websockets_spec.coffee
index 2acccbef11..0d3580b589 100644
--- a/packages/server/test/integration/websockets_spec.coffee
+++ b/packages/server/test/integration/websockets_spec.coffee
@@ -6,8 +6,8 @@ ws          = require("ws")
 httpsAgent  = require("https-proxy-agent")
 evilDns     = require("evil-dns")
 Promise     = require("bluebird")
-socketIo    = require("#{root}../../packages/socket")
-httpsServer = require("#{root}../../packages/https-proxy/test/helpers/https_server")
+socketIo    = require("@packages/socket")
+httpsServer = require("@packages/https-proxy/test/helpers/https_server")
 config      = require("#{root}lib/config")
 Server      = require("#{root}lib/server")
 Automation  = require("#{root}lib/automation")
diff --git a/packages/server/test/support/helpers/run b/packages/server/test/support/helpers/run
index 0b16adae0b..ed7188cd9f 100755
--- a/packages/server/test/support/helpers/run
+++ b/packages/server/test/support/helpers/run
@@ -25,4 +25,4 @@ DEBUG=nock.*,-nock.common,-nock.scope,socket.io:*,xvfb-maybe \
 BROWSER=$BROWSER \
 xvfb-maybe --xvfb-run-args "-s \"-screen 0 1280x1024x8\"" mocha $SPEC \
 --recursive \
---compilers ts:../ts/register,coffee:../coffee/register
+--compilers ts:@packages/ts/register,coffee:@packages/coffee/register
diff --git a/packages/server/test/unit/gui/events_spec.coffee b/packages/server/test/unit/gui/events_spec.coffee
index b73a22b6ea..a7dffe96e6 100644
--- a/packages/server/test/unit/gui/events_spec.coffee
+++ b/packages/server/test/unit/gui/events_spec.coffee
@@ -1,7 +1,7 @@
 require("../../spec_helper")
 
 _        = require("lodash")
-extension = require("#{root}../../../packages/extension")
+extension = require("@packages/extension")
 electron = require("electron")
 cache    = require("#{root}../lib/cache")
 logger   = require("#{root}../lib/logger")
diff --git a/packages/server/test/unit/gui/project_spec.coffee b/packages/server/test/unit/gui/project_spec.coffee
index 4fb6a4e710..daf1efc9b4 100644
--- a/packages/server/test/unit/gui/project_spec.coffee
+++ b/packages/server/test/unit/gui/project_spec.coffee
@@ -1,6 +1,6 @@
 # require("../../spec_helper")
 #
-# extension = require("#{root}../../../packages/extension")
+# extension = require("@packages/extension")
 # Fixtures = require("../../support/helpers/fixtures")
 # project  = require("#{root}../lib/open_project")
 # Project  = require("#{root}../lib/project")
diff --git a/packages/server/test/unit/scaffold_spec.coffee b/packages/server/test/unit/scaffold_spec.coffee
index acf982ddba..dc4019bcc7 100644
--- a/packages/server/test/unit/scaffold_spec.coffee
+++ b/packages/server/test/unit/scaffold_spec.coffee
@@ -3,7 +3,7 @@ require("../spec_helper")
 path       = require("path")
 glob       = require("glob")
 Promise    = require("bluebird")
-cypressEx  = require("#{root}../../packages/example")
+cypressEx  = require("@packages/example")
 config     = require("#{root}lib/config")
 scaffold   = require("#{root}lib/scaffold")
 Fixtures   = require("#{root}/test/support/helpers/fixtures")
diff --git a/packages/server/test/unit/socket_spec.coffee b/packages/server/test/unit/socket_spec.coffee
index dae8a44a05..4561e9cadc 100644
--- a/packages/server/test/unit/socket_spec.coffee
+++ b/packages/server/test/unit/socket_spec.coffee
@@ -5,8 +5,8 @@
 # path         = require("path")
 # uuid         = require("node-uuid")
 # Promise      = require("bluebird")
-# socketIo     = require("#{root}../../packages/socket")
-# extension    = require("#{root}../../packages/extension")
+# socketIo     = require("@packages/socket")
+# extension    = require("@packages/extension")
 # httpsAgent   = require("https-proxy-agent")
 # open         = require("#{root}lib/util/open")
 # errors       = require("#{root}lib/errors")
diff --git a/packages/socket/package.json b/packages/socket/package.json
index 74cb5ad9f4..833b359976 100644
--- a/packages/socket/package.json
+++ b/packages/socket/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-socket",
+  "name": "@packages/socket",
   "version": "0.2.1",
   "description": "Cypress Shared Socket Libs",
   "main": "index.js",
diff --git a/packages/static/package.json b/packages/static/package.json
index e5e5dc4d96..8a3118283f 100644
--- a/packages/static/package.json
+++ b/packages/static/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "static",
+  "name": "@packages/static",
   "main": "index.js",
   "scripts": {
     "postinstall": "echo 'This project needs: npm run build'",
diff --git a/packages/ts/package.json b/packages/ts/package.json
index 8c249ab5c6..4c41df9465 100644
--- a/packages/ts/package.json
+++ b/packages/ts/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ts",
+  "name": "@packages/ts",
   "version": "1.0.0",
   "description": "TypeScript runtime Node hook",
   "main": "index.js",
diff --git a/packages/ts/register.js b/packages/ts/register.js
index a6c139f25d..8e2f4cf7d6 100644
--- a/packages/ts/register.js
+++ b/packages/ts/register.js
@@ -15,4 +15,4 @@ require('ts-node').register({
 })
 
 // do we need to prevent any other TypeScript hooks?
-// like ../coffee/register.js does?
+// like @packages/coffee/register.js does?
diff --git a/start.js b/start.js
index 4cde8ed24a..d76e54e89e 100644
--- a/start.js
+++ b/start.js
@@ -1 +1 @@
-require('./packages/server')
+require('@packages/server')