diff --git a/client/client.js b/client/client.js
index a0059bbd..49f19d1a 100644
--- a/client/client.js
+++ b/client/client.js
@@ -29,6 +29,8 @@ function CloudCmdProto(Util, DOM, CloudFunc) {
     this.PREFIX = '';
     this.PREFIX_URL = '';
     this.DIRCLIENT = '/dist/';
+    this.DIRCLIENT_MODULES = this.DIRCLIENT + 'modules/';
+    
     this.MIN_ONE_PANEL_WIDTH    = 1155;
     this.HOST                   = location.origin ||
                                   location.protocol + '//' + location.host;
@@ -123,7 +125,7 @@ function CloudCmdProto(Util, DOM, CloudFunc) {
             if (!CloudCmd[name]) {
                 CloudCmd[name] = (...args) => {
                     const prefix = CloudCmd.PREFIX;
-                    const pathFull = prefix + CloudCmd.DIRCLIENT + path;
+                    const pathFull = prefix + CloudCmd.DIRCLIENT_MODULES + path;
                     
                     Util.exec(doBefore);
                     
@@ -175,7 +177,7 @@ function CloudCmdProto(Util, DOM, CloudFunc) {
         
         const funcBefore  = (callback) => {
             const src = prefix + '/join:' + [
-                CloudCmd.DIRCLIENT + 'polyfill.js',
+                CloudCmd.DIRCLIENT_MODULES + 'polyfill.js',
                 '/modules/domtokenlist-shim/dist/domtokenlist.min.js',
             ].join(':');
             
diff --git a/client/cloud.js b/client/modules/cloud.js
similarity index 90%
rename from client/cloud.js
rename to client/modules/cloud.js
index 40f1a0af..bc87a964 100644
--- a/client/cloud.js
+++ b/client/modules/cloud.js
@@ -6,10 +6,10 @@ CloudCmd.Cloud = CloudProto;
 
 const exec = require('execon');
 
-const load = require('./load');
-const Files = require('./files');
-const Images = require('./dom/images');
-const Util = require('../common/util');
+const load = require('../load');
+const Files = require('../files');
+const Images = require('../dom/images');
+const Util = require('../../common/util');
 
 function CloudProto(callback) {
     exec.series([
diff --git a/client/config.js b/client/modules/config.js
similarity index 97%
rename from client/config.js
rename to client/modules/config.js
index be49b052..1cb5f6cd 100644
--- a/client/config.js
+++ b/client/modules/config.js
@@ -5,11 +5,11 @@
 const rendy = require('rendy');
 const exec = require('execon');
 const currify = require('currify/legacy');
-const input = require('./input');
+const input = require('../input');
 
-const Images = require('./dom/images');
-const Events = require('./events');
-const Files = require('./files');
+const Images = require('../dom/images');
+const Events = require('../events');
+const Files = require('../files');
 const {Dialog} = DOM;
 
 const TITLE = 'Config';
diff --git a/client/contact.js b/client/modules/contact.js
similarity index 96%
rename from client/contact.js
rename to client/modules/contact.js
index 1b73e9b5..4e7bb89d 100644
--- a/client/contact.js
+++ b/client/modules/contact.js
@@ -7,7 +7,7 @@
 CloudCmd.Contact = ContactProto;
 
 const exec = require('execon');
-const Images = require('./dom/images');
+const Images = require('../dom/images');
 
 function ContactProto(callback) {
     init(callback);
diff --git a/client/edit-file.js b/client/modules/edit-file.js
similarity index 100%
rename from client/edit-file.js
rename to client/modules/edit-file.js
diff --git a/client/edit-names.js b/client/modules/edit-names.js
similarity index 100%
rename from client/edit-names.js
rename to client/modules/edit-names.js
diff --git a/client/edit.js b/client/modules/edit.js
similarity index 97%
rename from client/edit.js
rename to client/modules/edit.js
index 1e73fda8..23dc42d9 100644
--- a/client/edit.js
+++ b/client/modules/edit.js
@@ -5,8 +5,8 @@
 const exec = require('execon');
 const currify = require('currify/legacy');
 
-const load = require('./load');
-const {time, timeEnd} = require('../common/util');
+const load = require('../load');
+const {time, timeEnd} = require('../../common/util');
 
 CloudCmd.Edit = EditProto;
 
diff --git a/client/help.js b/client/modules/help.js
similarity index 91%
rename from client/help.js
rename to client/modules/help.js
index fbdd0c01..29de96fa 100644
--- a/client/help.js
+++ b/client/modules/help.js
@@ -4,7 +4,7 @@
 
 CloudCmd.Help = HelpProto;
 
-const Images = require('./dom/images');
+const Images = require('../dom/images');
 
 function HelpProto() {
     Images.show.load('top');
diff --git a/client/konsole.js b/client/modules/konsole.js
similarity index 100%
rename from client/konsole.js
rename to client/modules/konsole.js
diff --git a/client/markdown.js b/client/modules/markdown.js
similarity index 89%
rename from client/markdown.js
rename to client/modules/markdown.js
index 5a817218..b3dc12c6 100644
--- a/client/markdown.js
+++ b/client/modules/markdown.js
@@ -6,9 +6,9 @@ CloudCmd.Markdown = MarkdownProto;
 
 const exec = require('execon');
 
-const Images = require('./dom/images');
-const load = require('./load');
-const {Markdown} = require('./rest');
+const Images = require('../dom/images');
+const load = require('../load');
+const {Markdown} = require('../rest');
 
 function MarkdownProto(name, options) {
     Images.show.load('top');
diff --git a/client/menu.js b/client/modules/menu.js
similarity index 99%
rename from client/menu.js
rename to client/modules/menu.js
index 4d4f3e09..3e52363f 100644
--- a/client/menu.js
+++ b/client/modules/menu.js
@@ -7,8 +7,8 @@ CloudCmd.Menu = MenuProto;
 const exec = require('execon');
 const currify = require('currify/legacy');
 
-const load = require('./load');
-const RESTful = require('./rest');
+const load = require('../load');
+const RESTful = require('../rest');
 const bind = (f, ...a) => (...b) => f(...a, ...b);
 
 function MenuProto(position) {
diff --git a/client/operation.js b/client/modules/operation.js
similarity index 99%
rename from client/operation.js
rename to client/modules/operation.js
index 637621c4..fab9e908 100644
--- a/client/operation.js
+++ b/client/modules/operation.js
@@ -14,7 +14,7 @@ CloudCmd.Operation = OperationProto;
 const currify = require('currify/legacy');
 const exec = require('execon');
 
-const RESTful = require('./rest');
+const RESTful = require('../rest');
 
 function OperationProto(operation, data) {
     const Name = 'Operation';
diff --git a/client/polyfill.js b/client/modules/polyfill.js
similarity index 100%
rename from client/polyfill.js
rename to client/modules/polyfill.js
diff --git a/client/upload.js b/client/modules/upload.js
similarity index 95%
rename from client/upload.js
rename to client/modules/upload.js
index 6f5b87b8..97ad35de 100644
--- a/client/upload.js
+++ b/client/modules/upload.js
@@ -4,8 +4,8 @@
 
 const exec = require('execon');
 
-const load = require('./load');
-const Files = require('./files');
+const load = require('../load');
+const Files = require('../files');
 const {Images} = DOM;
 
 CloudCmd.Upload = UploadProto;
diff --git a/client/view.js b/client/modules/view.js
similarity index 97%
rename from client/view.js
rename to client/modules/view.js
index d8a9f245..811854e5 100644
--- a/client/view.js
+++ b/client/modules/view.js
@@ -6,11 +6,11 @@ const itype = require('itype/legacy');
 const rendy = require('rendy');
 const exec = require('execon');
 
-const {time} = require('../common/util');
-const Files = require('./files');
-const Events = require('./events');
-const load = require('./load');
-const Images = require('./dom/images');
+const {time} = require('../../common/util');
+const Files = require('../files');
+const Events = require('../events');
+const load = require('../load');
+const Images = require('../dom/images');
 
 CloudCmd.View = ViewProto;
 
diff --git a/webpack.config.js b/webpack.config.js
index 3ad1f68a..c9de9a5e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,6 +6,8 @@ const {optimize} = webpack;
 const {UglifyJsPlugin} = optimize;
 
 const dir = './client';
+const dirModules = './client/modules';
+const modules = './modules';
 
 const {env} = process;
 const isDev = env.NODE_ENV === 'development';
@@ -31,20 +33,20 @@ module.exports = {
     devtool,
     entry: {
         cloudcmd: `${dir}/cloudcmd.js`,
-        edit: `${dir}/edit.js`,
-        'edit-file': `${dir}/edit-file.js`,
-        'edit-names': `${dir}/edit-names.js`,
-        menu: `${dir}/menu.js`,
-        view: `${dir}/view.js`,
-        help: `${dir}/help.js`,
-        markdown: `${dir}/markdown.js`,
-        config: `${dir}/config.js`,
-        contact: `${dir}/contact.js`,
-        upload: `${dir}/upload.js`,
-        operation: `${dir}/operation.js`,
-        konsole: `${dir}/konsole.js`,
-        cloud: `${dir}/cloud.js`,
-        polyfill: `${dir}/polyfill.js`,
+        [modules + '/edit']: `${dirModules}/edit.js`,
+        [modules + '/edit-file']: `${dirModules}/edit-file.js`,
+        [modules + '/edit-names']: `${dirModules}/edit-names.js`,
+        [modules + '/menu']: `${dirModules}/menu.js`,
+        [modules + '/view']: `${dirModules}/view.js`,
+        [modules + '/help']: `${dirModules}/help.js`,
+        [modules + '/markdown']: `${dirModules}/markdown.js`,
+        [modules + '/config']: `${dirModules}/config.js`,
+        [modules + '/contact']: `${dirModules}/contact.js`,
+        [modules + '/upload']: `${dirModules}/upload.js`,
+        [modules + '/operation']: `${dirModules}/operation.js`,
+        [modules + '/konsole']: `${dirModules}/konsole.js`,
+        [modules + '/cloud']: `${dirModules}/cloud.js`,
+        [modules + '/polyfill']: `${dirModules}/polyfill.js`,
     },
     output: {
         filename: '[name].js',
@@ -58,13 +60,12 @@ module.exports = {
     module: {
         loaders: [{
             test: /\.js$/,
-            exclude: /(node_)?modules/,
+            exclude: /node_modules/,
             loader: 'babel-loader',
             query: {
                 presets: ['es2015']
             }
-        }
-        ]
+        }]
     }
 };