diff --git a/app/components/login/login.css b/app/src/components/login/login.css
similarity index 100%
rename from app/components/login/login.css
rename to app/src/components/login/login.css
diff --git a/app/components/login/login.html b/app/src/components/login/login.html
similarity index 100%
rename from app/components/login/login.html
rename to app/src/components/login/login.html
diff --git a/app/components/login/login.js b/app/src/components/login/login.js
similarity index 100%
rename from app/components/login/login.js
rename to app/src/components/login/login.js
diff --git a/app/buildMenu.js b/app/src/components/menu/menu.js
similarity index 100%
rename from app/buildMenu.js
rename to app/src/components/menu/menu.js
diff --git a/app/main.js b/app/src/main.js
similarity index 94%
rename from app/main.js
rename to app/src/main.js
index 6b05708..915f8ac 100644
--- a/app/main.js
+++ b/app/src/main.js
@@ -4,6 +4,7 @@
 
 var fs = require('fs');
 var os = require('os');
+var path = require('path');
 var electron = require('electron');
 
 var wurl = require('wurl');
@@ -13,9 +14,9 @@ var BrowserWindow = electron.BrowserWindow;
 var shell = electron.shell;
 var ipcMain = electron.ipcMain;
 
-var buildMenu = require('./buildMenu');
+var buildMenu = require('./components/menu/menu');
 
-const APP_ARGS_FILE_PATH = __dirname + '/nativefier.json';
+const APP_ARGS_FILE_PATH = path.join(__dirname, '..', 'nativefier.json');
 
 var mainWindow = null;
 
@@ -57,7 +58,7 @@ app.on('ready', function () {
                 javascript: true,
                 plugins: true,
                 nodeIntegration: false,
-                preload: __dirname + '/assets/js/index.js'
+                preload: path.join(__dirname, 'preload.js')
             }
         }
     );
diff --git a/app/assets/js/index.js b/app/src/preload.js
similarity index 68%
rename from app/assets/js/index.js
rename to app/src/preload.js
index a31030b..154a311 100644
--- a/app/assets/js/index.js
+++ b/app/src/preload.js
@@ -1,5 +1,5 @@
 /**
- * Created by JiaHao on 5/7/15.
+ Preload file that will be executed in the renderer process
  */
 
 var ipc = require('electron').ipcRenderer;
@@ -10,4 +10,5 @@ document.addEventListener("DOMContentLoaded", function(event) {
 
 ipc.on('params', function (event, message) {
     var appArgs = JSON.parse(message);
+    console.log('nativefier.json', appArgs);
 });