18 files changed, 4 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index f2337056f4..5da2ccb7c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 node_modules
 dist
-docs
 build
 .DS_Store
 *.log
diff --git a/README.md b/README.md
index 0fb325d302..3daaf8b4d0 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 - **test/** - tests
 - **scripts/** - support scripts for development
 - **init.js** - entry file for electron, points to compiled **main.js**
-- **distribution.yml** - distribution configuration
+- **electron-builder.yml** - distribution configuration
 
 ## App diagram
 
diff --git a/build-assets/ca.crt b/dist-assets/ca.crt
index b795d910f3..b795d910f3 100644
--- a/build-assets/ca.crt
+++ b/dist-assets/ca.crt
diff --git a/build-assets/icon.icns b/dist-assets/icon.icns
index 77c0e0a0b4..77c0e0a0b4 100644
--- a/build-assets/icon.icns
+++ b/dist-assets/icon.icns
diff --git a/build-assets/icon.iconset/icon_128x128.png b/dist-assets/icon.iconset/icon_128x128.png
index 93f2bf550a..93f2bf550a 100644
--- a/build-assets/icon.iconset/icon_128x128.png
+++ b/dist-assets/icon.iconset/icon_128x128.png
diff --git a/build-assets/icon.iconset/icon_128x128@2x.png b/dist-assets/icon.iconset/icon_128x128@2x.png
index 3f437773a6..3f437773a6 100644
--- a/build-assets/icon.iconset/icon_128x128@2x.png
+++ b/dist-assets/icon.iconset/icon_128x128@2x.png
diff --git a/build-assets/icon.iconset/icon_16x16.png b/dist-assets/icon.iconset/icon_16x16.png
index a93d450cb9..a93d450cb9 100644
--- a/build-assets/icon.iconset/icon_16x16.png
+++ b/dist-assets/icon.iconset/icon_16x16.png
diff --git a/build-assets/icon.iconset/icon_16x16@2x.png b/dist-assets/icon.iconset/icon_16x16@2x.png
index 053963bd58..053963bd58 100644
--- a/build-assets/icon.iconset/icon_16x16@2x.png
+++ b/dist-assets/icon.iconset/icon_16x16@2x.png
diff --git a/build-assets/icon.iconset/icon_256x256.png b/dist-assets/icon.iconset/icon_256x256.png
index 3f437773a6..3f437773a6 100644
--- a/build-assets/icon.iconset/icon_256x256.png
+++ b/dist-assets/icon.iconset/icon_256x256.png
diff --git a/build-assets/icon.iconset/icon_256x256@2x.png b/dist-assets/icon.iconset/icon_256x256@2x.png
index e1fadd3a24..e1fadd3a24 100644
--- a/build-assets/icon.iconset/icon_256x256@2x.png
+++ b/dist-assets/icon.iconset/icon_256x256@2x.png
diff --git a/build-assets/icon.iconset/icon_32x32.png b/dist-assets/icon.iconset/icon_32x32.png
index 053963bd58..053963bd58 100644
--- a/build-assets/icon.iconset/icon_32x32.png
+++ b/dist-assets/icon.iconset/icon_32x32.png
diff --git a/build-assets/icon.iconset/icon_32x32@2x.png b/dist-assets/icon.iconset/icon_32x32@2x.png
index db8bf078d5..db8bf078d5 100644
--- a/build-assets/icon.iconset/icon_32x32@2x.png
+++ b/dist-assets/icon.iconset/icon_32x32@2x.png
diff --git a/build-assets/icon.iconset/icon_512x512.png b/dist-assets/icon.iconset/icon_512x512.png
index e1fadd3a24..e1fadd3a24 100644
--- a/build-assets/icon.iconset/icon_512x512.png
+++ b/dist-assets/icon.iconset/icon_512x512.png
diff --git a/build-assets/icon.iconset/icon_512x512@2x.png b/dist-assets/icon.iconset/icon_512x512@2x.png
index c4ff686d31..c4ff686d31 100644
--- a/build-assets/icon.iconset/icon_512x512@2x.png
+++ b/dist-assets/icon.iconset/icon_512x512@2x.png
diff --git a/build-assets/icon.iconset/icon_64x64.png b/dist-assets/icon.iconset/icon_64x64.png
index db8bf078d5..db8bf078d5 100644
--- a/build-assets/icon.iconset/icon_64x64.png
+++ b/dist-assets/icon.iconset/icon_64x64.png
diff --git a/build-assets/icon.iconset/icon_64x64@2x.png b/dist-assets/icon.iconset/icon_64x64@2x.png
index 93f2bf550a..93f2bf550a 100644
--- a/build-assets/icon.iconset/icon_64x64@2x.png
+++ b/dist-assets/icon.iconset/icon_64x64@2x.png
diff --git a/distribution.yml b/electron-builder.yml
index c8c8e140de..e46da6d86b 100644
--- a/distribution.yml
+++ b/electron-builder.yml
@@ -7,11 +7,11 @@ asar: true
 # assets bundled on all platforms
 extraResources:
   # master.mullvad.net certificate used by mullvadd
-  - from: build-assets/ca.crt
+  - from: dist-assets/ca.crt
     to: .
 
 directories:
-  buildResources: build-assets/
+  buildResources: dist-assets/
   output: dist/
 
 files:
diff --git a/package.json b/package.json
index 63a7092ffe..729ded0e96 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,6 @@
     "electron-builder": "^19.12.0",
     "electron-devtools-installer": "^2.1.0",
     "electron-mocha": "^3.3.0",
-    "esdoc": "^0.5.2",
     "eslint": "^4.1.1",
     "eslint-plugin-flowtype": "^2.34.1",
     "eslint-plugin-react": "^7.1.0",
@@ -71,7 +70,6 @@
     "test": "electron-mocha -R spec --compilers js:babel-core/register test/global.js test/*.spec.js test/**/*.spec.js",
     "lint": "eslint --no-ignore scripts app test *.js",
     "flow": "flow",
-    "docs": "esdoc",
     "pack": "run-s private:clean private:compile private:service-worker private:build:all",
     "pack:mac": "run-s private:clean private:compile private:service-worker private:build:mac",
     "pack:win": "run-s private:clean private:compile private:service-worker private:build:win",
@@ -80,7 +78,7 @@
     "private:build:mac": "npm run private:build -- --mac",
     "private:build:win": "npm run private:build -- --win",
     "private:build:linux": "npm run private:build -- --linux",
-    "private:build": "build --config distribution.yml",
+    "private:build": "electron-builder",
     "private:watch": "npm run private:compile -- --source-maps true --watch --skip-initial-build",
     "private:serve": "babel-node scripts/serve.js",
     "private:compile": "babel app/ --copy-files --ignore *.sw.js --out-dir build",