4 files changed, 11 insertions, 23 deletions
diff --git a/packages/testnet-faucets/Dockerfile b/packages/testnet-faucets/Dockerfile
index bd1dcc4a4..198087ba6 100644
--- a/packages/testnet-faucets/Dockerfile
+++ b/packages/testnet-faucets/Dockerfile
@@ -15,4 +15,4 @@ COPY . .
 
 EXPOSE 3000
 
-CMD ["forever", "./bin/server.js"]
+CMD ["forever", "./server/server.js"]
diff --git a/packages/testnet-faucets/README.md b/packages/testnet-faucets/README.md
index 93f97e1b7..a92b93fc0 100644
--- a/packages/testnet-faucets/README.md
+++ b/packages/testnet-faucets/README.md
@@ -28,28 +28,16 @@ yarn install
 
 ### Build
 
-If this is your **first** time building this package, you must first build **all** packages within the monorepo. This is because packages that depend on other packages located inside this monorepo are symlinked when run from **within** the monorepo. This allows you to make changes across multiple packages without first publishing dependent packages to NPM. To build all packages, run the following from the monorepo root directory:
+To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-yarn lerna:rebuild
+PKG=@0xproject/testnet-faucets yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-yarn dev
-```
-
-You can also build this specific package by running the following from within its directory:
-
-```bash
-yarn build
-```
-
-or continuously rebuild on change:
-
-```bash
-yarn build:watch
+PKG=@0xproject/testnet-faucets yarn watch
 ```
 
 ### Clean
@@ -86,7 +74,7 @@ Infura API Key can be requested here: https://infura.io/signup
 Note: The above public/private keys exist when running `testrpc` with the following option `--mnemonic concert load couple harbor equip island argue ramp clarify fence smart topic`.
 
 ```bash
-yarn dev
+PKG=0x.js yarn watch
 ```
 
 ### Endpoints
diff --git a/packages/testnet-faucets/gulpfile.js b/packages/testnet-faucets/gulpfile.js
index 773faf33a..7c4e25e0f 100644
--- a/packages/testnet-faucets/gulpfile.js
+++ b/packages/testnet-faucets/gulpfile.js
@@ -9,7 +9,7 @@ const config = {
     target: 'node',
     entry: [path.join(__dirname, '/src/ts/server.ts')],
     output: {
-        path: path.join(__dirname, '/bin'),
+        path: path.join(__dirname, '/server'),
         filename: 'server.js',
     },
     devtool: 'source-map',
@@ -47,7 +47,7 @@ const config = {
         modulesDir: path.join(__dirname, '../../node_modules')
     }),
     watchOptions: {
-        ignored: /bin|node_modules|transpiled/
+        ignored: /server|node_modules|transpiled/
     },
 };
 
@@ -67,7 +67,7 @@ gulp.task('run', ['watch'], function() {
         execMap: {
             js: 'node',
         },
-        script: path.join(__dirname, 'bin/server'),
+        script: path.join(__dirname, 'server/server'),
         ignore: ['*'],
         watch: ['foo/'],
         ext: 'noop',
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index f49d17425..693e980ed 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -8,12 +8,12 @@
     "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether",
     "main": "server.js",
     "scripts": {
-        "build:watch": "tsc -w",
+        "watch": "tsc -w",
         "build": "node ../../node_modules/gulp/bin/gulp.js build",
         "dev": "node ../../node_modules/gulp/bin/gulp.js run",
-        "start": "node ./bin/server.js",
+        "start": "node ./server/server.js",
         "lint": "tslint --project .",
-        "clean": "shx rm -rf bin"
+        "clean": "shx rm -rf server"
     },
     "author": "Fabio Berger",
     "license": "Apache-2.0",