diff --git a/.gitignore b/.gitignore
index c2658d7d..976c75a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 node_modules/
+release/
diff --git a/gulpfile.js b/gulpfile.js
index a902bfd1..694a5184 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,8 +2,10 @@
 
 var gulp = require('gulp');
 var prettify = require('gulp-jsbeautifier');
+var packager = require('electron-packager');
+var packageJson = require('./src/package.json');
 
-var sources = ['**/*.js', '**/*.css', '**/*.html', '!node_modules/**'];
+var sources = ['**/*.js', '**/*.css', '**/*.html', '!node_modules/**', '!release/**'];
 
 gulp.task('prettify', function() {
   gulp.src(sources)
@@ -21,3 +23,22 @@ gulp.task('prettify', function() {
     }))
     .pipe(gulp.dest('.'));
 });
+
+gulp.task('package', function() {
+  packager({
+    dir: './src',
+    name: packageJson.name,
+    platform: ['win32', 'darwin'],
+    arch: 'all',
+    version: '0.33.6',
+    out: './release',
+    overwrite: true
+  }, function(err, appPath) {
+    if (err) {
+      console.log(err);
+    }
+    else {
+      console.log('done');
+    }
+  });
+});
diff --git a/package.json b/package.json
index 8a9c594b..68d80e58 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   "author": "Yuya Ochiai",
   "license": "MIT",
   "devDependencies": {
+    "electron-packager": "^5.1.0",
     "gulp": "^3.9.0",
     "gulp-jsbeautifier": "^1.0.1"
   }
diff --git a/app-menu.js b/src/app-menu.js
similarity index 100%
rename from app-menu.js
rename to src/app-menu.js
diff --git a/badge.png b/src/badge.png
similarity index 100%
rename from badge.png
rename to src/badge.png
diff --git a/index.html b/src/index.html
similarity index 100%
rename from index.html
rename to src/index.html
diff --git a/index.js b/src/index.js
similarity index 100%
rename from index.js
rename to src/index.js
diff --git a/main.js b/src/main.js
similarity index 100%
rename from main.js
rename to src/main.js
diff --git a/src/package.json b/src/package.json
new file mode 100644
index 00000000..d7879911
--- /dev/null
+++ b/src/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "electron-mattermost",
+  "version": "0.2.0",
+  "description": "",
+  "main": "main.js",
+  "author": "Yuya Ochiai",
+  "license": "MIT"
+}
diff --git a/settings.html b/src/settings.html
similarity index 100%
rename from settings.html
rename to src/settings.html
diff --git a/webview/mattermost.js b/src/webview/mattermost.js
similarity index 100%
rename from webview/mattermost.js
rename to src/webview/mattermost.js