diff --git a/.gitignore b/.gitignore
index 37d7e73..e6367a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 .env
+dist
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000..a8d22ca
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,4 @@
+node_modules
+.env
+src
+start.sh
diff --git a/package.json b/package.json
index 7587e3a..a5bb470 100644
--- a/package.json
+++ b/package.json
@@ -3,9 +3,11 @@
   "version": "0.1.1",
   "description": "",
   "scripts": {
-    "start": "./start.sh"
+    "start": "./start.sh",
+     "dist": "babel -d dist src",
+     "prepublishOnly": "npm run dist"
   },
-  "bin": "cli.js",
+  "bin": "dist/cli.js",
   "author": "Nadav Ivgi",
   "license": "MIT",
   "keywords": [ "bitcoin", "lightning", "lightning-charge", "micropayments" ],
diff --git a/app.js b/src/app.js
similarity index 98%
rename from app.js
rename to src/app.js
index 28e6b5a..afeb199 100644
--- a/app.js
+++ b/src/app.js
@@ -25,7 +25,7 @@ Object.assign(app.locals, {
 , prettybytes: require('pretty-bytes')
 , markdown:    require('markdown-it')()
 , qruri:       require('qruri')
-, version:     require('./package').version
+, version:     require('../package').version
 , pretty:      (conf.env === 'development')
 })
 
diff --git a/cli.js b/src/cli.js
similarity index 86%
rename from cli.js
rename to src/cli.js
index e661214..1197b54 100755
--- a/cli.js
+++ b/src/cli.js
@@ -4,9 +4,8 @@ const path   = require('path')
     , fs     = require('fs')
 
 require('babel-polyfill')
-require('babel-register')
 
-const templatePath = path.join(__dirname, '_filebazaar.yaml.example')
+const templatePath = path.join(__dirname, '..', '_filebazaar.yaml.example')
 
 if (process.argv[2] === 'init') {
   const directory   = process.argv[3] || process.cwd()
diff --git a/lib/config.js b/src/lib/config.js
similarity index 96%
rename from lib/config.js
rename to src/lib/config.js
index a4c1ed9..b51667a 100644
--- a/lib/config.js
+++ b/src/lib/config.js
@@ -25,8 +25,8 @@ module.exports = basePath => {
   config.invoice_ttl   = config.invoice_ttl  || +process.env.INVOICE_TTL  || 3600   // 1 hour
   config.download_ttl  = config.download_ttl || +process.env.DOWNLOAD_TTL || 172800 // 2 days
 
-  config.views_dir     = config.views_dir    || process.env.VIEWS_DIR     || path.join(__dirname, '..', 'views')
-  config.static_dir    = config.static_dir   || process.env.STATIC_DIR    || path.join(__dirname, '..', 'static')
+  config.views_dir     = config.views_dir    || process.env.VIEWS_DIR     || path.join(__dirname, '..', '..', 'views')
+  config.static_dir    = config.static_dir   || process.env.STATIC_DIR    || path.join(__dirname, '..', '..', 'static')
   config.theme         = config.theme        || process.env.THEME         || 'yeti'
   config.css           = config.css          || process.env.CSS
 
diff --git a/lib/exif.js b/src/lib/exif.js
similarity index 100%
rename from lib/exif.js
rename to src/lib/exif.js
diff --git a/lib/files.js b/src/lib/files.js
similarity index 100%
rename from lib/files.js
rename to src/lib/files.js
diff --git a/lib/preview.js b/src/lib/preview.js
similarity index 100%
rename from lib/preview.js
rename to src/lib/preview.js
diff --git a/lib/preview/ffmpeg.js b/src/lib/preview/ffmpeg.js
similarity index 100%
rename from lib/preview/ffmpeg.js
rename to src/lib/preview/ffmpeg.js
diff --git a/lib/preview/image.js b/src/lib/preview/image.js
similarity index 100%
rename from lib/preview/image.js
rename to src/lib/preview/image.js
diff --git a/lib/preview/unoconv.js b/src/lib/preview/unoconv.js
similarity index 100%
rename from lib/preview/unoconv.js
rename to src/lib/preview/unoconv.js
diff --git a/lib/token.js b/src/lib/token.js
similarity index 100%
rename from lib/token.js
rename to src/lib/token.js
diff --git a/lib/util.js b/src/lib/util.js
similarity index 100%
rename from lib/util.js
rename to src/lib/util.js
diff --git a/start.sh b/start.sh
index be79807..1adcc25 100755
--- a/start.sh
+++ b/start.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 [ -f .env ] && source .env
-babel-node app.js
+babel-node src/app.js