diff --git a/.gitignore b/.gitignore
index 17d108bf..6d24928e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 
 # misc
 .DS_Store
-/index.dist*
+/dist/
 
 # debug
 npm-debug.log*
diff --git a/.prettierignore b/.prettierignore
index 76beb0d7..dcacf9e6 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,5 +1,4 @@
-/.history/
 /.yarn/
 /.vscode/
-/index.dist*
+/dist/
 /coverage/
diff --git a/index.js b/lib/index.js
similarity index 100%
rename from index.js
rename to lib/index.js
diff --git a/index.test.js b/lib/index.test.js
similarity index 100%
rename from index.test.js
rename to lib/index.test.js
diff --git a/package.json b/package.json
index 3362abe4..84886343 100644
--- a/package.json
+++ b/package.json
@@ -10,17 +10,18 @@
   "license": "MIT",
   "author": "Vincent Voyer <vincent@codeagain.com>",
   "files": [
-    "index.dist.js",
-    "index.dist.js.map",
+    "dist/",
+    "lib/",
     "LICENSE",
     "README.md"
   ],
-  "main": "index.dist.js",
+  "main": "dist/",
   "scripts": {
-    "build": "babel index.js -o index.dist.js --source-maps",
+    "build": "babel lib/ -d dist/ --source-maps --ignore '**/*.test.js' --delete-dir-on-start",
+    "check-formatting": "prettier --check './**/*.?(json|js|md|css)' && eslint .",
     "prepublishOnly": "yarn build",
     "semantic-release": "semantic-release",
-    "test": "jest --coverage && prettier --check './**/*.?(json|js|md|css)' && eslint ."
+    "test": "jest --coverage && yarn check-formatting"
   },
   "babel": {
     "presets": [