diff --git a/src/components/api.js b/client/components/api.js
similarity index 100%
rename from src/components/api.js
rename to client/components/api.js
diff --git a/src/components/breadcrumb.js b/client/components/breadcrumb.js
similarity index 100%
rename from src/components/breadcrumb.js
rename to client/components/breadcrumb.js
diff --git a/src/components/connect.js b/client/components/connect.js
similarity index 100%
rename from src/components/connect.js
rename to client/components/connect.js
diff --git a/src/components/editor.js b/client/components/editor.js
similarity index 100%
rename from src/components/editor.js
rename to client/components/editor.js
diff --git a/src/components/filesystem.js b/client/components/filesystem.js
similarity index 100%
rename from src/components/filesystem.js
rename to client/components/filesystem.js
diff --git a/src/components/index.js b/client/components/index.js
similarity index 100%
rename from src/components/index.js
rename to client/components/index.js
diff --git a/src/data/api.js b/client/data/api.js
similarity index 100%
rename from src/data/api.js
rename to client/data/api.js
diff --git a/src/data/events.js b/client/data/events.js
similarity index 100%
rename from src/data/events.js
rename to client/data/events.js
diff --git a/src/data/index.js b/client/data/index.js
similarity index 100%
rename from src/data/index.js
rename to client/data/index.js
diff --git a/src/data/mimetype.js b/client/data/mimetype.js
similarity index 100%
rename from src/data/mimetype.js
rename to client/data/mimetype.js
diff --git a/src/data/password.js b/client/data/password.js
similarity index 100%
rename from src/data/password.js
rename to client/data/password.js
diff --git a/src/data/tools.js b/client/data/tools.js
similarity index 100%
rename from src/data/tools.js
rename to client/data/tools.js
diff --git a/src/index.html b/client/index.html
similarity index 100%
rename from src/index.html
rename to client/index.html
diff --git a/src/client.js b/client/index.js
similarity index 89%
rename from src/client.js
rename to client/index.js
index 8c9941aa..52f063f0 100644
--- a/src/client.js
+++ b/client/index.js
@@ -1,4 +1,3 @@
-// src/app-client.js
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Router  from './router';
diff --git a/src/pages/connectpage.js b/client/pages/connectpage.js
similarity index 100%
rename from src/pages/connectpage.js
rename to client/pages/connectpage.js
diff --git a/src/pages/filespage.js b/client/pages/filespage.js
similarity index 100%
rename from src/pages/filespage.js
rename to client/pages/filespage.js
diff --git a/src/pages/filespage/breadcrumb.js b/client/pages/filespage/breadcrumb.js
similarity index 100%
rename from src/pages/filespage/breadcrumb.js
rename to client/pages/filespage/breadcrumb.js
diff --git a/src/pages/filespage/existingthing.js b/client/pages/filespage/existingthing.js
similarity index 100%
rename from src/pages/filespage/existingthing.js
rename to client/pages/filespage/existingthing.js
diff --git a/src/pages/filespage/filezone.js b/client/pages/filespage/filezone.js
similarity index 100%
rename from src/pages/filespage/filezone.js
rename to client/pages/filespage/filezone.js
diff --git a/src/pages/filespage/index.js b/client/pages/filespage/index.js
similarity index 100%
rename from src/pages/filespage/index.js
rename to client/pages/filespage/index.js
diff --git a/src/pages/filespage/newthing.js b/client/pages/filespage/newthing.js
similarity index 100%
rename from src/pages/filespage/newthing.js
rename to client/pages/filespage/newthing.js
diff --git a/src/pages/homepage.js b/client/pages/homepage.js
similarity index 100%
rename from src/pages/homepage.js
rename to client/pages/homepage.js
diff --git a/src/pages/index.js b/client/pages/index.js
similarity index 100%
rename from src/pages/index.js
rename to client/pages/index.js
diff --git a/src/pages/logout.js b/client/pages/logout.js
similarity index 100%
rename from src/pages/logout.js
rename to client/pages/logout.js
diff --git a/src/pages/notfound.js b/client/pages/notfound.js
similarity index 100%
rename from src/pages/notfound.js
rename to client/pages/notfound.js
diff --git a/src/pages/viewerpage.js b/client/pages/viewerpage.js
similarity index 100%
rename from src/pages/viewerpage.js
rename to client/pages/viewerpage.js
diff --git a/src/pages/viewerpage/index.js b/client/pages/viewerpage/index.js
similarity index 100%
rename from src/pages/viewerpage/index.js
rename to client/pages/viewerpage/index.js
diff --git a/src/pages/viewerpage/javascript.js b/client/pages/viewerpage/javascript.js
similarity index 100%
rename from src/pages/viewerpage/javascript.js
rename to client/pages/viewerpage/javascript.js
diff --git a/src/router.js b/client/router.js
similarity index 100%
rename from src/router.js
rename to client/router.js
diff --git a/src/utilities/backpressure.js b/client/utilities/backpressure.js
similarity index 100%
rename from src/utilities/backpressure.js
rename to client/utilities/backpressure.js
diff --git a/src/utilities/button.js b/client/utilities/button.js
similarity index 100%
rename from src/utilities/button.js
rename to client/utilities/button.js
diff --git a/src/utilities/card.js b/client/utilities/card.js
similarity index 100%
rename from src/utilities/card.js
rename to client/utilities/card.js
diff --git a/src/utilities/container.js b/client/utilities/container.js
similarity index 100%
rename from src/utilities/container.js
rename to client/utilities/container.js
diff --git a/src/utilities/crypto.js b/client/utilities/crypto.js
similarity index 100%
rename from src/utilities/crypto.js
rename to client/utilities/crypto.js
diff --git a/src/utilities/error.js b/client/utilities/error.js
similarity index 100%
rename from src/utilities/error.js
rename to client/utilities/error.js
diff --git a/src/utilities/fab.js b/client/utilities/fab.js
similarity index 100%
rename from src/utilities/fab.js
rename to client/utilities/fab.js
diff --git a/src/utilities/icon.js b/client/utilities/icon.js
similarity index 100%
rename from src/utilities/icon.js
rename to client/utilities/icon.js
diff --git a/src/utilities/index.js b/client/utilities/index.js
similarity index 100%
rename from src/utilities/index.js
rename to client/utilities/index.js
diff --git a/src/utilities/input.js b/client/utilities/input.js
similarity index 100%
rename from src/utilities/input.js
rename to client/utilities/input.js
diff --git a/src/utilities/loader.js b/client/utilities/loader.js
similarity index 100%
rename from src/utilities/loader.js
rename to client/utilities/loader.js
diff --git a/src/utilities/loremipsum b/client/utilities/loremipsum
similarity index 100%
rename from src/utilities/loremipsum
rename to client/utilities/loremipsum
diff --git a/src/utilities/navigate.js b/client/utilities/navigate.js
similarity index 100%
rename from src/utilities/navigate.js
rename to client/utilities/navigate.js
diff --git a/src/utilities/ngif.js b/client/utilities/ngif.js
similarity index 100%
rename from src/utilities/ngif.js
rename to client/utilities/ngif.js
diff --git a/src/utilities/notification.js b/client/utilities/notification.js
similarity index 100%
rename from src/utilities/notification.js
rename to client/utilities/notification.js
diff --git a/src/utilities/path.js b/client/utilities/path.js
similarity index 100%
rename from src/utilities/path.js
rename to client/utilities/path.js
diff --git a/src/utilities/textarea.js b/client/utilities/textarea.js
similarity index 100%
rename from src/utilities/textarea.js
rename to client/utilities/textarea.js
diff --git a/src/utilities/theme.js b/client/utilities/theme.js
similarity index 100%
rename from src/utilities/theme.js
rename to client/utilities/theme.js
diff --git a/src/utilities/uploader.js b/client/utilities/uploader.js
similarity index 100%
rename from src/utilities/uploader.js
rename to client/utilities/uploader.js
diff --git a/webpack.config.js b/webpack.config.js
index f8b653b1..d9156ff3 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,12 +2,10 @@ const webpack = require('webpack');
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
-
-
 let config = {
     entry: [
         'babel-polyfill',
-        path.join(__dirname, 'src', 'client.js')
+        path.join(__dirname, 'client', 'index.js')
     ],
     output: {
         path: path.join(__dirname, 'server', 'public'),
@@ -17,7 +15,7 @@ let config = {
     module: {
         loaders: [
             {
-                test: path.join(__dirname, 'src'),
+                test: path.join(__dirname, 'client'),
                 loader: ['babel-loader']
             },
             {
@@ -32,7 +30,7 @@ let config = {
         }),
         new webpack.optimize.OccurrenceOrderPlugin(),
         new HtmlWebpackPlugin({
-            template: __dirname + '/src/index.html',
+            template: path.join(__dirname, 'client', 'index.html'),
             inject:true
         })
     ]
@@ -57,7 +55,7 @@ if(process.env.NODE_ENV === 'production'){
             }
         }
     };
-    config.entry.push('webpack/hot/only-dev-server');
+    //config.entry.push('webpack/hot/only-dev-server');
 }