diff --git a/.gitignore b/.gitignore
index 5cd7358..907c78a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,5 +26,4 @@ build/Release
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
 
-lib
 dist
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..df53c3d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,35 @@
+sudo: false
+language: node_js
+
+matrix:
+  include:
+  - node_js: 4
+    env: CXX=g++-4.8
+  - node_js: 6
+    env:
+      - SAUCE=true
+      - CXX=g++-4.8
+  - node_js: stable
+    env: CXX=g++-4.8
+
+# Make sure we have new NPM.
+before_install:
+  - npm install -g npm
+
+script:
+  - npm run lint
+
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
+after_success:
+  - npm run coverage-publish
+
+addons:
+  firefox: 'latest'
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
\ No newline at end of file
diff --git a/README.md b/README.md
index 447cee5..730bf4d 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@ interface-connection
 
 [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
 [![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
+![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
+![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square)
 
 > A test suite and interface you can use to implement a connection. A connection is understood as something that offers mechanism for writing and reading data, back pressure, half and full duplex streams. This module and test suite were heavily inspired by abstract-blob-store and interface-stream-muxer.
 
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..95f6ee4
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,15 @@
+machine:
+  node:
+    version: stable
+
+test:
+  override:
+    - npm run lint
+dependencies:
+  pre:
+    - google-chrome --version
+    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+    - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+    - sudo apt-get update
+    - sudo apt-get --only-upgrade install google-chrome-stable
+    - google-chrome --version
diff --git a/package.json b/package.json
index 1c7a242..6ee73d7 100644
--- a/package.json
+++ b/package.json
@@ -2,8 +2,7 @@
   "name": "interface-connection",
   "version": "0.2.1",
   "description": "A test suite and interface you can use to implement a connection interface.",
-  "main": "lib/index.js",
-  "jsnext:main": "src/index.js",
+  "main": "src/index.js",
   "scripts": {
     "lint": "aegir-lint",
     "build": "aegir-build",
@@ -18,7 +17,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/diasdavid/interface-connection.git"
+    "url": "https://github.com/libp2p/interface-connection.git"
   },
   "keywords": [
     "IPFS"
@@ -26,15 +25,18 @@
   "author": "David Dias <daviddias@ipfs.io>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/diasdavid/interface-connection/issues"
+    "url": "https://github.com/libp2p/interface-connection/issues"
   },
-  "homepage": "https://github.com/diasdavid/interface-connection",
+  "homepage": "https://github.com/libp2p/interface-connection",
   "dependencies": {
     "timed-tape": "^0.1.1",
     "pull-defer": "^0.2.2"
   },
   "devDependencies": {
-    "aegir": "^8.0.1"
+    "aegir": "^9.0.0"
+  },
+  "engines": {
+    "node": ">=4.0.0"
   },
   "contributors": [
     "David Dias <daviddias.p@gmail.com>",