diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..93f1361
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log
diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index 3bab996..0000000
--- a/.npmignore
+++ /dev/null
@@ -1 +0,0 @@
-bench
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index db94261..af7bd5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,17 @@
+sudo: false
+os:
+  - linux
 language: node_js
 node_js:
-  - "0.10"
   - "0.12"
   - "4"
-  - "node"
+  - "6"
+env:
+  matrix:
+    - TEST_SUITE=unit
+matrix:
+  include:
+    - os: linux
+      node_js: "6"
+      env: TEST_SUITE=lint
+script: npm run $TEST_SUITE
diff --git a/LICENSE.MIT b/LICENSE
similarity index 100%
rename from LICENSE.MIT
rename to LICENSE
diff --git a/lib/b64.js b/index.js
similarity index 100%
rename from lib/b64.js
rename to index.js
diff --git a/package.json b/package.json
index ccbfab2..6b6a919 100644
--- a/package.json
+++ b/package.json
@@ -1,19 +1,32 @@
 {
-  "author": "T. Jameson Little <t.jameson.little@gmail.com>",
   "name": "base64-js",
-  "description": "Base64 encoding/decoding in pure JS",
   "version": "1.1.2",
+  "description": "Base64 encoding/decoding in pure JS",
+  "keywords": [
+    "base64"
+  ],
+  "homepage": "https://github.com/beatgammit/base64-js",
+  "bugs": {
+    "url": "https://github.com/beatgammit/base64-js/issues"
+  },
+  "license": "MIT",
+  "author": "T. Jameson Little <t.jameson.little@gmail.com>",
+  "files": [
+    "test",
+    "index.js",
+    "base64js.min.js"
+  ],
+  "main": "index.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/beatgammit/base64-js.git"
   },
-  "main": "lib/b64.js",
   "scripts": {
     "build": "browserify -s base64js -r ./ | uglifyjs -m > base64js.min.js",
-    "test": "standard && tape test/*.js"
+    "lint": "standard",
+    "test": "npm run lint && npm run unit",
+    "unit": "tape test/*.js"
   },
-  "license": "MIT",
-  "dependencies": {},
   "devDependencies": {
     "benchmark": "^2.1.0",
     "browserify": "^13.0.0",
diff --git a/test/big-data.js b/test/big-data.js
index 59ad7f1..be16ebe 100644
--- a/test/big-data.js
+++ b/test/big-data.js
@@ -1,5 +1,5 @@
 var test = require('tape')
-var b64 = require('../lib/b64')
+var b64 = require('../')
 
 test('convert big data to base64', function (t) {
   var b64str, arr, i, length
diff --git a/test/convert.js b/test/convert.js
index 19a6665..d68e105 100644
--- a/test/convert.js
+++ b/test/convert.js
@@ -1,5 +1,5 @@
 var test = require('tape')
-var b64 = require('../lib/b64')
+var b64 = require('../')
 var checks = [
   'a',
   'aa',
diff --git a/test/url-safe.js b/test/url-safe.js
index 38023d4..3203b33 100644
--- a/test/url-safe.js
+++ b/test/url-safe.js
@@ -1,5 +1,5 @@
 var test = require('tape')
-var b64 = require('../lib/b64')
+var b64 = require('../')
 
 test('decode url-safe style base64 strings', function (t) {
   var expected = [0xff, 0xff, 0xbe, 0xff, 0xef, 0xbf, 0xfb, 0xef, 0xff]