diff --git a/package.json b/package.json
index 69a938d..0ea70d4 100644
--- a/package.json
+++ b/package.json
@@ -1,35 +1,13 @@
 {
 	"name": "frptools",
-	"version": "3.0.1",
+	"version": "3.1.0",
 	"description": "Observable Property and Computed data streams",
-	"main": "lib/index.js",
-	"jsnext:main": "src/index.js",
-	"files": ["dist", "lib", "src"],
+	"main": "src/index.js",
+	"files": ["src"],
 	"scripts": {
-		"clean": "rimraf dist lib",
-		"build:lib": "NODE_ENV=production babel src --presets=\"stage-0,es2015\" --out-dir lib",
-		"build:umd": "npm run build:lib && NODE_ENV=production rollup -c",
-		"build:umd:min":
-			"npm run build:umd && uglifyjs -m --screw-ie8 -c -o dist/frptools.min.js dist/frptools.js",
-		"build:umd:gzip":
-			"npm run build:umd:min && gzip -c9 dist/frptools.min.js > dist/frptools.min.js.gz",
-		"build": "npm run build:umd:gzip && ls -l dist/",
-		"prepublish": "npm run clean && npm run build",
-		"test": "npm run build:lib && jasmine",
-		"uglifyjs": "2.4.10"
+		"test": "node ../../bin/runTests.js ./"
 	},
 	"keywords": ["reactive"],
 	"author": "Timothy Farrell <tim@thecookiejar.me> (https://github.com/explorigin)",
-	"license": "Apache-2.0",
-	"devDependencies": {
-		"babel-cli": "6.18.0",
-		"babel-core": "6.21.0",
-		"babel-preset-es2015": "6.18.0",
-		"babel-preset-es2015-rollup": "3.0.0",
-		"babel-preset-stage-0": "6.16.0",
-		"jasmine": "^2.5.3",
-		"rimraf": "2.5.4",
-		"rollup-plugin-babel": "^2.7.1",
-		"rollup-plugin-json": "2.1.0"
-	}
+	"license": "Apache-2.0"
 }
diff --git a/rollup.config.js b/rollup.config.js
deleted file mode 100644
index 28cb38e..0000000
--- a/rollup.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import json from 'rollup-plugin-json';
-import babel from 'rollup-plugin-babel';
-
-const babelConfig = {
-	env: {
-		es6: true,
-		browser: true
-	},
-	plugins: [],
-	presets: ['es2015-rollup']
-};
-
-export default {
-	entry: 'src/index.js',
-	moduleName: 'frptools',
-	plugins: [json(), babel(babelConfig)],
-	output: {
-		format: 'umd',
-		file: 'dist/frptools.js'
-	}
-};
diff --git a/spec/computed.spec.js b/spec/computed.spec.js
index 1e28e87..3896f16 100644
--- a/spec/computed.spec.js
+++ b/spec/computed.spec.js
@@ -1,7 +1,7 @@
-const { prop, computed } = require('../lib/index.js');
-const { dirtyMock, hashSet } = require('../lib/testUtil.js');
+import { prop, computed } from '../src/index.js';
+import { dirtyMock, hashSet } from '../src/testUtil.js';
 
-describe('computed', () => {
+describe('A computed', () => {
 	const add = (a, b) => a + b;
 	const square = a => a * a;
 
diff --git a/spec/container.spec.js b/spec/container.spec.js
index c761f12..9672351 100644
--- a/spec/container.spec.js
+++ b/spec/container.spec.js
@@ -1,5 +1,5 @@
-const { container, computed } = require('../lib/index.js');
-const { dirtyMock, hashSet } = require('../lib/testUtil.js');
+import { container, computed } from '../src/index.js';
+import { dirtyMock, hashSet } from '../src/testUtil.js';
 
 describe('A container', () => {
 	it('notifies dependents of updates', () => {
diff --git a/spec/property.spec.js b/spec/property.spec.js
index 0b46a95..dc0f8ed 100644
--- a/spec/property.spec.js
+++ b/spec/property.spec.js
@@ -1,5 +1,5 @@
-const { prop } = require('../lib/index.js');
-const { dirtyMock, hashSet } = require('../lib/testUtil.js');
+import { prop } from '../src/index.js';
+import { dirtyMock, hashSet } from '../src/testUtil.js';
 
 describe('A property', () => {
 	it('returns its initialized value', () => {
diff --git a/spec/support/jasmine.json b/spec/support/jasmine.json
deleted file mode 100644
index b52c9e6..0000000
--- a/spec/support/jasmine.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"spec_dir": "spec",
-	"spec_files": ["**/*[sS]pec.js"],
-	"helpers": ["helpers/**/*.js"],
-	"stopSpecOnExpectationFailure": false,
-	"random": false
-}
diff --git a/src/index.js b/src/index.js
index c7d8ddc..db0e58b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,4 +1,4 @@
-export { prop } from './property';
-export { computed } from './computed';
-export { container } from './container';
+export { prop } from './property.js';
+export { computed } from './computed.js';
+export { container } from './container.js';
 export { call, id, pick } from './util.js';