diff --git a/.babelrc b/.babelrc
index c13c5f6..5686105 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["es2015"]
+  "presets": ["latest"]
 }
diff --git a/.gitignore b/.gitignore
index 0080897..cb82ca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ coverage
 
 # Dependency directories
 /node_modules/
-
+/lib
 # Build directory
 /dist/
 
diff --git a/.npmignore b/.npmignore
index eca3864..ad33afa 100644
--- a/.npmignore
+++ b/.npmignore
@@ -3,3 +3,4 @@
 example
 node_modules
 tests
+src
diff --git a/.travis.yml b/.travis.yml
index af09133..d74f2f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ cache:
 
 install:
   - npm install --ignore-scripts
+  - npm run build
 
 script:
   - npm test
diff --git a/package.json b/package.json
index 1c9eed0..4db1723 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "description": "Javascript client library for Core API",
   "main": "lib/index.js",
   "scripts": {
-    "build": "mkdir -p dist && browserify --standalone coreapi -d -t babelify lib/index.js -o dist/coreapi.js",
-    "watch": "watchify --standalone coreapi -t babelify lib/index.js -o dist/coreapi.js -v",
+    "build": "mkdir -p dist && babel src --out-dir lib &&  browserify --standalone coreapi -d -t babelify lib/index.js -o dist/coreapi.js",
+    "watch": "watchify --standalone coreapi -t babelify src/index.js -o dist/coreapi.js -v",
     "prepublish": "npm run build",
     "jest": "jest",
     "test": "standard && jest --coverage"
@@ -46,8 +46,11 @@
     "url-template": "^2.0.8"
   },
   "devDependencies": {
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.3",
     "babel-jest": "^18.0.0",
     "babel-preset-es2015": "^6.18.0",
+    "babel-preset-latest": "^6.24.1",
     "babelify": "^7.3.0",
     "browserify": "^13.3.0",
     "jest": "^18.1.0",
diff --git a/lib/auth/basic.js b/src/auth/basic.js
similarity index 100%
rename from lib/auth/basic.js
rename to src/auth/basic.js
diff --git a/lib/auth/index.js b/src/auth/index.js
similarity index 100%
rename from lib/auth/index.js
rename to src/auth/index.js
diff --git a/lib/auth/session.js b/src/auth/session.js
similarity index 100%
rename from lib/auth/session.js
rename to src/auth/session.js
diff --git a/lib/auth/token.js b/src/auth/token.js
similarity index 100%
rename from lib/auth/token.js
rename to src/auth/token.js
diff --git a/lib/client.js b/src/client.js
similarity index 100%
rename from lib/client.js
rename to src/client.js
diff --git a/lib/codecs/corejson.js b/src/codecs/corejson.js
similarity index 100%
rename from lib/codecs/corejson.js
rename to src/codecs/corejson.js
diff --git a/lib/codecs/index.js b/src/codecs/index.js
similarity index 100%
rename from lib/codecs/index.js
rename to src/codecs/index.js
diff --git a/lib/codecs/json.js b/src/codecs/json.js
similarity index 100%
rename from lib/codecs/json.js
rename to src/codecs/json.js
diff --git a/lib/codecs/text.js b/src/codecs/text.js
similarity index 100%
rename from lib/codecs/text.js
rename to src/codecs/text.js
diff --git a/lib/document.js b/src/document.js
similarity index 100%
rename from lib/document.js
rename to src/document.js
diff --git a/lib/errors.js b/src/errors.js
similarity index 100%
rename from lib/errors.js
rename to src/errors.js
diff --git a/lib/index.js b/src/index.js
similarity index 100%
rename from lib/index.js
rename to src/index.js
diff --git a/lib/transports/http.js b/src/transports/http.js
similarity index 100%
rename from lib/transports/http.js
rename to src/transports/http.js
diff --git a/lib/transports/index.js b/src/transports/index.js
similarity index 100%
rename from lib/transports/index.js
rename to src/transports/index.js
diff --git a/lib/utils.js b/src/utils.js
similarity index 100%
rename from lib/utils.js
rename to src/utils.js