diff --git a/.npm/package/.gitignore b/.npm/package/.gitignore
deleted file mode 100644
index 3c3629e..0000000
--- a/.npm/package/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/.npm/package/README b/.npm/package/README
deleted file mode 100644
index 3d49255..0000000
--- a/.npm/package/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory and the files immediately inside it are automatically generated
-when you change this package's NPM dependencies. Commit the files in this
-directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
-so that others run the same versions of sub-dependencies.
-
-You should NOT check in the node_modules directory that Meteor automatically
-creates; if you are using git, the .gitignore file tells git to ignore it.
diff --git a/.npm/package/npm-shrinkwrap.json b/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 186e421..0000000
--- a/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "dependencies": {
-    "sockjs-client": {
-      "version": "1.0.3",
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "dependencies": {
-            "ms": {
-              "version": "0.7.1"
-            }
-          }
-        },
-        "eventsource": {
-          "version": "0.1.6",
-          "dependencies": {
-            "original": {
-              "version": "1.0.0"
-            }
-          }
-        },
-        "faye-websocket": {
-          "version": "0.7.3",
-          "dependencies": {
-            "websocket-driver": {
-              "version": "0.6.2",
-              "dependencies": {
-                "websocket-extensions": {
-                  "version": "0.1.1"
-                }
-              }
-            }
-          }
-        },
-        "inherits": {
-          "version": "2.0.1"
-        },
-        "json3": {
-          "version": "3.3.2"
-        },
-        "url-parse": {
-          "version": "1.0.5",
-          "dependencies": {
-            "querystringify": {
-              "version": "0.0.3"
-            },
-            "requires-port": {
-              "version": "1.0.0"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/HISTORY.md b/HISTORY.md
index e1b9af4..0488167 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,4 @@
-3.0.0 / 2017-07-13
+3.0.0 / 2017-07-31
 ==================
   * Removed the atmosphere part of electrify -> created new meteor-electrify-client npm package
   * Updated to use current versions of Electron (1.6.11) and electron-packager
diff --git a/lib/app.js b/lib/app.js
index e268c80..f6e5343 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -1,6 +1,6 @@
 var _    = require('lodash');
 
-var fs    = require('fs');
+var fs    = require('fs-extra');
 var spawn = require('child_process').spawn;
 var join  = require('path').join;
 var shell = require('shelljs');
@@ -138,7 +138,7 @@ App.prototype.bundle_meteor = function( /* server_url, */ done) {
 
         // move bundled meteor into .electrify
         shell.rm('-rf', electrify_app_dir);
-        shell.mv(bundled_dir, electrify_app_dir);
+        fs.moveSync(bundled_dir, electrify_app_dir);
         shell.rm('-rf', tmp_dir);
 
         self.log.info('ensuring meteor dependencies');
diff --git a/lib/electron.js b/lib/electron.js
index 7019407..76d7180 100644
--- a/lib/electron.js
+++ b/lib/electron.js
@@ -1,5 +1,5 @@
 var _        = require('lodash');
-var fs       = require('fs');
+var fs       = require('fs-extra');
 var path     = require('path');
 var join     = path.join;
 var shell    = require('shelljs');
@@ -114,7 +114,7 @@ Electron.prototype.package = function(packager_options, done) {
     
      // moving packaged app to .dist folder
     shell.rm('-rf', self.$.env.app.dist);
-    shell.mv(tmp_package_dir, self.$.env.app.dist);
+    fs.moveSync(tmp_package_dir, self.$.env.app.dist);
     self.log.info('wrote new app to ', self.$.env.app.dist);
 
     if(done) done();
diff --git a/make.js b/make.js
index e8068d1..c4211d7 100644
--- a/make.js
+++ b/make.js
@@ -88,8 +88,8 @@ target['test.cover'] = function(done){
       LOGELECTRIFY: 'ALL',
       TESTELECTRIFY: true
     }, process.env)
-  }).on('exit', function(){
-    if(done) done();
+  }).on('exit', function(code){
+    if(done) done(code);
   });
 };
 
@@ -117,7 +117,7 @@ target['test.cover.send'] = function() {
     process.exit(1);
   }
 
-  target['test.cover'](function(){
+  target['test.cover'](function(code){
     var lcov_path   = path.join(__dirname, 'coverage', 'lcov.info');
     spawn(node_bin, [CODECLIMATE_TEST_REPORTER], {
       stdio: [
@@ -127,6 +127,7 @@ target['test.cover.send'] = function() {
       ]
     }).on('exit', function() {
       console.log('coverage sent to codeclimate');
+      process.exit(code);
     });
   });
 };
diff --git a/package.json b/package.json
index f101ebc..e479771 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,13 @@
   "engines": {
     "node": ">=4.0.0"
   },
+  "files": [
+    "bin",
+    "lib",
+    "LICENCE",
+    "README.md",
+    "HISTORY.md"
+  ],
   "description": "Package your Meteor apps with Electron, and butter.",
   "author": "Sebastian Große",
   "license": "MIT",
@@ -15,6 +22,7 @@
     "commander": "^2.10.0",
     "electron": "^1.6.11",
     "electron-packager": "^8.7.1",
+    "fs-extra": "^4.0.0",
     "lodash": "^3.10.1",
     "server-destroy": "^1.0.1",
     "shelljs": "^0.7.8",