diff --git a/atom-extensions/atom-commons/src/index.js b/atom-extensions/atom-commons/lib/index.js
similarity index 100%
rename from atom-extensions/atom-commons/src/index.js
rename to atom-extensions/atom-commons/lib/index.js
diff --git a/atom-extensions/atom-commons/src/jar-language-client.js b/atom-extensions/atom-commons/lib/jar-language-client.js
similarity index 100%
rename from atom-extensions/atom-commons/src/jar-language-client.js
rename to atom-extensions/atom-commons/lib/jar-language-client.js
diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json
index b82c8ca37..438abd4a1 100644
--- a/atom-extensions/atom-commons/package.json
+++ b/atom-extensions/atom-commons/package.json
@@ -7,7 +7,6 @@
   "engines": {
     "atom": ">=1.17.0"
   },
-  "main": "./dist/index",
   "dependencies": {
     "atom-languageclient": "0.1.4",
     "decompress": "^4.2.0",
@@ -15,15 +14,17 @@
     "remote-file-size": "^3.0.3",
     "postinstall-build": "^3.0.0"
   },
+  "main": "./build/lib/index",
   "scripts": {
-    "clean": "rm -rf dist node_modules",
-    "compile": "babel src --out-dir dist",
+    "clean": "rm -rf build",
+    "compile": "babel lib --out-dir build/lib",
     "postinstall": "postinstall-build --only-as-dependency build \"npm run compile\"",
-    "watch": "babel src --out-dir dist -w"
+    "prepublish": "npm run clean && npm run compile",
+    "watch": "babel lib --out-dir build/lib -w"
   },
   "atomTranspilers": [
     {
-      "glob": "{src}/**/*.js",
+      "glob": "{lib}/**/*.js",
       "transpiler": "atom-babel6-transpiler",
       "options": {
         "cacheKeyFiles": [
@@ -35,7 +36,6 @@
   ],
   "devDependencies": {
     "atom-babel6-transpiler": "0.0.3",
-    "atom-mocha-test-runner": "^1.0.0",
     "babel-cli": "^6.24.0",
     "babel-core": "6.22.1",
     "babel-plugin-add-module-exports": "0.2.1",
diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh
index bbe042909..d42f6cda2 100755
--- a/concourse/tasks/build-atom-package.sh
+++ b/concourse/tasks/build-atom-package.sh
@@ -3,15 +3,17 @@ set -e
 set -v
 workdir=`pwd`
 output=$workdir/out
+atom_commons=$workdir/sts4/atom-extensions/atom-commons
+atom_package=$workdir/package_sources
 
 url=`cat fatjar/url`
 
-cd package_sources
+cd $atom_commons
+npm install
 
-npm install ../sts4/atom-extensions/atom-commons
-cd ./node_modules/pivotal-atom-languageclient-commons
-ls -la
-cd ../../
+cd $atom_package
+
+npm install ${atom_commons}
 
 cat > properties.json << EOF
 {