diff --git a/package.json b/package.json
index 9303e461a..f0db698dd 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "version": "0.14.2",
   "license": "MIT",
   "repository": "git://github.com/ianstormtaylor/slate.git",
-  "main": "./dist/index.js",
+  "main": "./lib/index.js",
   "dependencies": {
     "cheerio": "^0.22.0",
     "debug": "^2.2.0",
@@ -72,28 +72,28 @@
     "watchify": "^3.7.0"
   },
   "scripts": {
-    "clean": "rm -rf ./dist ./node_modules ./examples/build.dev.js ./examples/build.prod.js",
-    "disc": "npm-run-all dist disc:build disc:open",
-    "disc:build": "mkdir -p ./tmp && browserify ./dist/index.js --full-paths > ./tmp/build.js",
+    "clean": "rm -rf ./lib ./node_modules ./examples/build.dev.js ./examples/build.prod.js",
+    "disc": "npm-run-all lib disc:build disc:open",
+    "disc:build": "mkdir -p ./tmp && browserify ./lib/index.js --full-paths > ./tmp/build.js",
     "disc:open": "discify ./tmp/build.js --open",
-    "dist": "npm-run-all dist:npm dist:max dist:min",
-    "dist:max": "NODE_ENV=production browserify ./lib/index.js --transform babelify --transform envify --transform [ browserify-global-shim --global ] --standalone Slate > ./dist/slate.js",
-    "dist:min": "NODE_ENV=production browserify ./lib/index.js --transform babelify --transform envify --transform [ browserify-global-shim --global ] --transform uglifyify --standalone Slate | uglifyjs > ./dist/slate.min.js",
-    "dist:npm": "babel --out-dir ./dist ./lib",
+    "lib": "npm-run-all lib:npm lib:max lib:min",
+    "lib:max": "NODE_ENV=production browserify ./src/index.js --transform babelify --transform envify --transform [ browserify-global-shim --global ] --standalone Slate > ./lib/slate.js",
+    "lib:min": "NODE_ENV=production browserify ./src/index.js --transform babelify --transform envify --transform [ browserify-global-shim --global ] --transform uglifyify --standalone Slate | uglifyjs > ./lib/slate.min.js",
+    "lib:npm": "babel --out-dir ./lib ./src",
     "examples": "npm-run-all examples:dev examples:prod",
     "examples:dev": "browserify --debug --transform babelify ./examples/index.js > ./examples/build.dev.js",
     "examples:prod": "NODE_ENV=production browserify --transform babelify ./examples/index.js > ./examples/build.prod.js",
-    "gh-pages": "npm run dist && npm run examples && gh-pages --dist ./examples",
-    "lint": "eslint --ignore-pattern 'build.dev.js' --ignore-pattern 'build.prod.js' '{examples,lib}/**/*.js'",
+    "gh-pages": "npm run lib && npm run examples && gh-pages --lib ./examples",
+    "lint": "eslint --ignore-pattern 'build.dev.js' --ignore-pattern 'build.prod.js' '{examples,src}/**/*.js'",
     "open": "open http://localhost:8080/dev.html",
-    "prepublish": "npm run dist",
+    "prepublish": "npm run lib",
     "release": "np",
     "release:next": "np --tag=next",
     "start": "http-server ./examples",
-    "test": "npm-run-all lint dist:npm tests",
+    "test": "npm-run-all lint lib:npm tests",
     "tests": "mocha --compilers js:babel-core/register --reporter spec ./test/server.js",
-    "watch": "npm-run-all --parallel --print-label watch:dist watch:examples start",
-    "watch:dist": "babel --watch --out-dir ./dist ./lib",
+    "watch": "npm-run-all --parallel --print-label watch:lib watch:examples start",
+    "watch:lib": "babel --watch --out-dir ./lib ./src",
     "watch:examples": "watchify --debug --transform babelify ./examples/index.js -o ./examples/build.dev.js"
   },
   "browserify-global-shim": {
diff --git a/lib/Readme.md b/src/Readme.md
similarity index 100%
rename from lib/Readme.md
rename to src/Readme.md
diff --git a/lib/components/Readme.md b/src/components/Readme.md
similarity index 100%
rename from lib/components/Readme.md
rename to src/components/Readme.md
diff --git a/lib/components/content.js b/src/components/content.js
similarity index 100%
rename from lib/components/content.js
rename to src/components/content.js
diff --git a/lib/components/editor.js b/src/components/editor.js
similarity index 100%
rename from lib/components/editor.js
rename to src/components/editor.js
diff --git a/lib/components/leaf.js b/src/components/leaf.js
similarity index 100%
rename from lib/components/leaf.js
rename to src/components/leaf.js
diff --git a/lib/components/node.js b/src/components/node.js
similarity index 100%
rename from lib/components/node.js
rename to src/components/node.js
diff --git a/lib/components/placeholder.js b/src/components/placeholder.js
similarity index 100%
rename from lib/components/placeholder.js
rename to src/components/placeholder.js
diff --git a/lib/components/void.js b/src/components/void.js
similarity index 100%
rename from lib/components/void.js
rename to src/components/void.js
diff --git a/lib/constants/Readme.md b/src/constants/Readme.md
similarity index 100%
rename from lib/constants/Readme.md
rename to src/constants/Readme.md
diff --git a/lib/constants/environment.js b/src/constants/environment.js
similarity index 100%
rename from lib/constants/environment.js
rename to src/constants/environment.js
diff --git a/lib/constants/types.js b/src/constants/types.js
similarity index 100%
rename from lib/constants/types.js
rename to src/constants/types.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/models/Readme.md b/src/models/Readme.md
similarity index 100%
rename from lib/models/Readme.md
rename to src/models/Readme.md
diff --git a/lib/models/block.js b/src/models/block.js
similarity index 100%
rename from lib/models/block.js
rename to src/models/block.js
diff --git a/lib/models/character.js b/src/models/character.js
similarity index 100%
rename from lib/models/character.js
rename to src/models/character.js
diff --git a/lib/models/data.js b/src/models/data.js
similarity index 100%
rename from lib/models/data.js
rename to src/models/data.js
diff --git a/lib/models/document.js b/src/models/document.js
similarity index 100%
rename from lib/models/document.js
rename to src/models/document.js
diff --git a/lib/models/inline.js b/src/models/inline.js
similarity index 100%
rename from lib/models/inline.js
rename to src/models/inline.js
diff --git a/lib/models/mark.js b/src/models/mark.js
similarity index 100%
rename from lib/models/mark.js
rename to src/models/mark.js
diff --git a/lib/models/node.js b/src/models/node.js
similarity index 100%
rename from lib/models/node.js
rename to src/models/node.js
diff --git a/lib/models/schema.js b/src/models/schema.js
similarity index 100%
rename from lib/models/schema.js
rename to src/models/schema.js
diff --git a/lib/models/selection.js b/src/models/selection.js
similarity index 100%
rename from lib/models/selection.js
rename to src/models/selection.js
diff --git a/lib/models/state.js b/src/models/state.js
similarity index 100%
rename from lib/models/state.js
rename to src/models/state.js
diff --git a/lib/models/text.js b/src/models/text.js
similarity index 100%
rename from lib/models/text.js
rename to src/models/text.js
diff --git a/lib/models/transform.js b/src/models/transform.js
similarity index 100%
rename from lib/models/transform.js
rename to src/models/transform.js
diff --git a/lib/plugins/Readme.md b/src/plugins/Readme.md
similarity index 100%
rename from lib/plugins/Readme.md
rename to src/plugins/Readme.md
diff --git a/lib/plugins/core.js b/src/plugins/core.js
similarity index 100%
rename from lib/plugins/core.js
rename to src/plugins/core.js
diff --git a/lib/serializers/Readme.md b/src/serializers/Readme.md
similarity index 100%
rename from lib/serializers/Readme.md
rename to src/serializers/Readme.md
diff --git a/lib/serializers/base-64.js b/src/serializers/base-64.js
similarity index 100%
rename from lib/serializers/base-64.js
rename to src/serializers/base-64.js
diff --git a/lib/serializers/html.js b/src/serializers/html.js
similarity index 100%
rename from lib/serializers/html.js
rename to src/serializers/html.js
diff --git a/lib/serializers/plain.js b/src/serializers/plain.js
similarity index 100%
rename from lib/serializers/plain.js
rename to src/serializers/plain.js
diff --git a/lib/serializers/raw.js b/src/serializers/raw.js
similarity index 100%
rename from lib/serializers/raw.js
rename to src/serializers/raw.js
diff --git a/lib/transforms/Readme.md b/src/transforms/Readme.md
similarity index 100%
rename from lib/transforms/Readme.md
rename to src/transforms/Readme.md
diff --git a/lib/transforms/apply-operation.js b/src/transforms/apply-operation.js
similarity index 100%
rename from lib/transforms/apply-operation.js
rename to src/transforms/apply-operation.js
diff --git a/lib/transforms/at-current-range.js b/src/transforms/at-current-range.js
similarity index 100%
rename from lib/transforms/at-current-range.js
rename to src/transforms/at-current-range.js
diff --git a/lib/transforms/at-range.js b/src/transforms/at-range.js
similarity index 100%
rename from lib/transforms/at-range.js
rename to src/transforms/at-range.js
diff --git a/lib/transforms/by-key.js b/src/transforms/by-key.js
similarity index 100%
rename from lib/transforms/by-key.js
rename to src/transforms/by-key.js
diff --git a/lib/transforms/index.js b/src/transforms/index.js
similarity index 100%
rename from lib/transforms/index.js
rename to src/transforms/index.js
diff --git a/lib/transforms/normalize.js b/src/transforms/normalize.js
similarity index 100%
rename from lib/transforms/normalize.js
rename to src/transforms/normalize.js
diff --git a/lib/transforms/on-history.js b/src/transforms/on-history.js
similarity index 100%
rename from lib/transforms/on-history.js
rename to src/transforms/on-history.js
diff --git a/lib/transforms/on-selection.js b/src/transforms/on-selection.js
similarity index 100%
rename from lib/transforms/on-selection.js
rename to src/transforms/on-selection.js
diff --git a/lib/transforms/operations.js b/src/transforms/operations.js
similarity index 100%
rename from lib/transforms/operations.js
rename to src/transforms/operations.js
diff --git a/lib/utils/Readme.md b/src/utils/Readme.md
similarity index 100%
rename from lib/utils/Readme.md
rename to src/utils/Readme.md
diff --git a/lib/utils/find-dom-node.js b/src/utils/find-dom-node.js
similarity index 100%
rename from lib/utils/find-dom-node.js
rename to src/utils/find-dom-node.js
diff --git a/lib/utils/is-in-range.js b/src/utils/is-in-range.js
similarity index 100%
rename from lib/utils/is-in-range.js
rename to src/utils/is-in-range.js
diff --git a/lib/utils/is-react-component.js b/src/utils/is-react-component.js
similarity index 100%
rename from lib/utils/is-react-component.js
rename to src/utils/is-react-component.js
diff --git a/lib/utils/memoize.js b/src/utils/memoize.js
similarity index 100%
rename from lib/utils/memoize.js
rename to src/utils/memoize.js
diff --git a/lib/utils/normalize.js b/src/utils/normalize.js
similarity index 100%
rename from lib/utils/normalize.js
rename to src/utils/normalize.js
diff --git a/lib/utils/offset-key.js b/src/utils/offset-key.js
similarity index 100%
rename from lib/utils/offset-key.js
rename to src/utils/offset-key.js
diff --git a/lib/utils/scroll-to.js b/src/utils/scroll-to.js
similarity index 100%
rename from lib/utils/scroll-to.js
rename to src/utils/scroll-to.js
diff --git a/lib/utils/string.js b/src/utils/string.js
similarity index 100%
rename from lib/utils/string.js
rename to src/utils/string.js
diff --git a/lib/utils/transfer.js b/src/utils/transfer.js
similarity index 100%
rename from lib/utils/transfer.js
rename to src/utils/transfer.js
diff --git a/lib/utils/uid.js b/src/utils/uid.js
similarity index 100%
rename from lib/utils/uid.js
rename to src/utils/uid.js