diff --git a/client/package.json b/client/package.json
index 4ce1f4ab..fde8f251 100644
--- a/client/package.json
+++ b/client/package.json
@@ -2,7 +2,7 @@
   "name": "bdclient",
   "description": "BetterDiscord client package",
   "author": "Jiiks",
-  "version": "0.4.0",
+  "version": "2.0.0.b",
   "homepage": "https://betterdiscord.net",
   "license": "MIT",
   "main": "index.js",
diff --git a/core/package.json b/core/package.json
index a607036b..498906a5 100644
--- a/core/package.json
+++ b/core/package.json
@@ -2,7 +2,7 @@
   "name": "bdcore",
   "description": "BetterDiscord core package",
   "author": "Jiiks",
-  "version": "0.4.0",
+  "version": "2.0.0b",
   "homepage": "https://betterdiscord.net",
   "license": "MIT",
   "main": "index.js",
diff --git a/gulpfile.js b/gulpfile.js
index ee328ad7..1eadf46d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,31 +1,44 @@
 const
+    fs = require('fs'),
     gulp = require('gulp'),
+    del = require('del'),
     pump = require('pump'),
     merge = require('gulp-merge'),
     copy = require('gulp-copy'),
+    rename = require('gulp-rename'),
     copydeps = require('gulp-npm-copy-deps');
 
+const corepkg = require('./core/package.json');
+const clientpkg = require('./client/package.json');
+const editorpkg = require('./csseditor/package.json');
+
 const client = function() {
     return pump([
         gulp.src('./client/dist/*.client.js'),
-        copy('release/', { prefix: 2 })
+        rename(`client.${clientpkg.version}.js`),
+        gulp.dest('./release')
     ]);
 }
 
 const core = function() {
     return pump([
-        gulp.src('./core/dist/**/*'),
+        gulp.src('./core/dist/modules/**/*'),
         copy('release/', { prefix: 2 })
     ]);
 }
 
 const core2 = function() {
     return pump([
-        gulp.src('./core/index.js'),
-        copy('release/', { prefix: 1 })
+        gulp.src('./core/dist/main.js'),
+        rename(`core.${corepkg.version}.js`),
+        gulp.dest('./release')
     ]);
 }
 
+const core3 = function() {
+    return fs.writeFileSync('./release/index.js', `module.exports = require('./core.${corepkg.version}.js');`);
+}
+
 const cssEditor = function() {
     return pump([
         gulp.src('./csseditor/dist/**/*'),
@@ -44,4 +57,6 @@ const bindings = function() {
     ]);
 }
 
-gulp.task('release', function () { return merge(client(), core(), core2(), cssEditor(), deps(), bindings())});
+gulp.task('release', function () {
+    del(['./release/**/*']).then(() => merge(client(), core(), core2(), core3(), cssEditor(), deps()));
+});
diff --git a/package.json b/package.json
index e20083e7..1ccfb0f5 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "node-sass": "^4.7.2",
     "nedb": "^1.8.0"
-  }, 
+  },
   "devDependencies": {
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
@@ -28,6 +28,7 @@
     "codemirror": "^5.23.0",
     "combokeys": "^3.0.0",
     "css-loader": "^0.28.9",
+    "del": "^3.0.0",
     "electron": "^1.6.15",
     "electron-rebuild": "^1.7.3",
     "eslint": "^4.16.0",
@@ -40,6 +41,7 @@
     "gulp-merge": "^0.1.1",
     "gulp-npm-copy-deps": "^1.0.2",
     "gulp-plumber": "^1.2.0",
+    "gulp-rename": "^1.2.2",
     "gulp-watch": "^5.0.0",
     "html-webpack-plugin": "^3.0.6",
     "jquery": "^3.2.1",
@@ -71,6 +73,6 @@
     "lint": "eslint -f unix client/src core/src csseditor/src",
     "test": "npm run build && npm run lint",
     "build_node-sass": "node scripts/build-node-sass.js",
-    "release": "npm run build && gulp release"
+    "release": "build && gulp release"
   }
 }