package: rename browser to client and main to server

jean-emmanuel · Oct 28, 2018 · 263eb84 · 263eb84
1 parent fd2f6b8
commit 263eb84
Show file tree

Hide file tree

Showing 123 changed files with 43 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
 node_modules
 dist
 app/LICENSE
-app/browser/*.css*
-app/browser/*.png
-app/browser/*.js*
+app/client/*.css*
+app/client/*.png
+app/client/*.js*
 app/launcher/*.js*
-app/main/*.js*
+app/server/*.js*
 package-lock.json
diff --git a/app/browser/index.html b/app/browser/index.html
diff --git a/app/browser/fonts/fa-solid-900.woff → app/client/fonts/fa-solid-900.woff b/app/browser/fonts/fa-solid-900.woff → app/client/fonts/fa-solid-900.woff
diff --git a/app/browser/fonts/fa-solid.css → app/client/fonts/fa-solid.css b/app/browser/fonts/fa-solid.css → app/client/fonts/fa-solid.css
diff --git a/app/browser/fonts/fontawesome.min.css → app/client/fonts/fontawesome.min.css b/app/browser/fonts/fontawesome.min.css → app/client/fonts/fontawesome.min.css
diff --git a/app/browser/fonts/roboto-medium.css → app/client/fonts/roboto-medium.css b/app/browser/fonts/roboto-medium.css → app/client/fonts/roboto-medium.css
diff --git a/app/browser/fonts/roboto-medium.woff → app/client/fonts/roboto-medium.woff b/app/browser/fonts/roboto-medium.woff → app/client/fonts/roboto-medium.woff
diff --git a/app/browser/fonts/roboto-mono.woff → app/client/fonts/roboto-mono.woff b/app/browser/fonts/roboto-mono.woff → app/client/fonts/roboto-mono.woff
diff --git a/app/client/index.html b/app/client/index.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width, user-scalable=no"/>
+    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <link rel="apple-touch-icon" href="browser/logo.png" />
+    <link rel="preload" href="client/fonts/fa-solid-900.woff" as="font"/>
+    <link rel="preload" href="client/fonts/roboto-medium.woff" as="font"/>
+    <link rel="stylesheet" type="text/css" href="client/open-stage-control.css" hot-reload/>
+    <link rel="stylesheet" type="text/css" href="client/theme.css" hot-reload/>
+    <link rel="stylesheet" type="text/css" href="client/fonts/fontawesome.min.css"/>
+    <link rel="stylesheet" type="text/css" href="client/fonts/fa-solid.css"/>
+    <link rel="stylesheet" type="text/css" href="client/fonts/roboto-medium.css"/>
+    <script src="client/open-stage-control-client.js"></script>
+    <link rel="shortcut icon" href="browser/favicon.png?2"/>
+</head>
+
+<body>
+    <div id="container"></div>
+    <div id="sidepanel"></div>
+</body>
+
+</html>
diff --git a/app/browser/themes/.gitignore → app/client/themes/.gitignore b/app/browser/themes/.gitignore → app/client/themes/.gitignore
diff --git a/app/index.js b/app/index.js
@@ -1 +1 @@
-require('./main/open-stage-control-server')
+require('./server/open-stage-control-server')
diff --git a/app/main/midi.py → app/server/midi.py b/app/main/midi.py → app/server/midi.py
diff --git a/package.json b/package.json
@@ -76,11 +76,12 @@
     "deb64": "electron-installer-debian --src dist/open-stage-control-linux-x64/ --arch amd64 --dest dist/open-stage-control-linux-x64/ --icon resources/images/logo.png",
     "debarm": "electron-installer-debian --src dist/open-stage-control-linux-armv7l/ --arch armv7l --dest dist/open-stage-control-linux-armv7l/ --icon resources/images/logo.png",
     "build-css": "node scripts/build-css.js",
-    "build-js": "npm run build-launcher-js && npm run build-browser-js -- --prod && npm run build-main-js",
-    "build-browser-js": "node scripts/build-browser.js",
+    "build-js": "npm run build-launcher-js && npm run build-client-js -- --prod && npm run build-main-js",
+    "build-client-js": "node scripts/build-client.js",
     "build-launcher-js": "node scripts/build-launcher.js",
     "build-main-js": "node scripts/build-main.js",
-    "watch-browser": "npm run build-browser-js -- --watch",
+    "watch-client": "npm run build-client-js -- --watch",
+    "watch-browser": "npm run build-client-js -- --watch",
     "watch-css": "nodemon --watch src/scss -e scss -x \"npm run build-css -- --reload",
     "deploy-docs": "node scripts/build-widgets-reference.js > resources/docs/widgets-reference.md && cd resources && mkdocs gh-deploy --clean && rm -rf site",
     "test": "npm run build"

diff --git a/scripts/build-browser.js → scripts/build-client.js b/scripts/build-browser.js → scripts/build-client.js
@@ -27,8 +27,8 @@ if (prod) {
 }
 
 var bundle = build({
-    input: '../src/browser/index.js',
-    output: '../app/browser/open-stage-control-client.js',
+    input: '../src/client/index.js',
+    output: '../app/client/index.js',
     options: {
         debug: true,
         insertGlobals: false,

diff --git a/scripts/build-css.js b/scripts/build-css.js
@@ -3,7 +3,7 @@ var sass = require('node-sass'),
     fs = require('fs')
 
 var indir = path.resolve(__dirname + '/../src/scss/'),
-    outdir= path.resolve(__dirname + '/../app/browser/')
+    outdir= path.resolve(__dirname + '/../app/client/')
 
 fs.readdirSync(indir + '/themes/').forEach(file => {
 

diff --git a/scripts/build-main.js → scripts/build-server.js b/scripts/build-main.js → scripts/build-server.js
diff --git a/scripts/build-widgets-reference.js b/scripts/build-widgets-reference.js
@@ -33,16 +33,16 @@ Object.assign(global, window)
 
 // Required globals
 
-DOM = require('../src/browser/app/dom')
+DOM = require('../src/client/app/dom')
 DOM.get = x=>[{addEventListener:()=>{}}]
 DOM.init()
 CANVAS_FRAMERATE = 1
 LANG = 'en'
 
 // Here we go
 
-var widgets = require('../src/browser/app/widgets'),
-    baseClass = require('../src/browser/app/widgets/common/widget'),
+var widgets = require('../src/client/app/widgets'),
+    baseClass = require('../src/client/app/widgets/common/widget'),
     base = baseClass.defaults(),
     doc = []
 

diff --git a/src/browser/app/dom.js → src/client/app/dom.js b/src/browser/app/dom.js → src/client/app/dom.js
diff --git a/src/browser/app/editor/context-menu.js → src/client/app/editor/context-menu.js b/src/browser/app/editor/context-menu.js → src/client/app/editor/context-menu.js
diff --git a/src/browser/app/editor/data-workers.js → src/client/app/editor/data-workers.js b/src/browser/app/editor/data-workers.js → src/client/app/editor/data-workers.js
diff --git a/src/browser/app/editor/diff.js → src/client/app/editor/diff.js b/src/browser/app/editor/diff.js → src/client/app/editor/diff.js
diff --git a/src/browser/app/editor/edit-field.js → src/client/app/editor/edit-field.js b/src/browser/app/editor/edit-field.js → src/client/app/editor/edit-field.js
diff --git a/src/browser/app/editor/index.js → src/client/app/editor/index.js b/src/browser/app/editor/index.js → src/client/app/editor/index.js
diff --git a/src/browser/app/editor/select-area.js → src/client/app/editor/select-area.js b/src/browser/app/editor/select-area.js → src/client/app/editor/select-area.js
diff --git a/src/browser/app/events/click.js → src/client/app/events/click.js b/src/browser/app/events/click.js → src/client/app/events/click.js
diff --git a/src/browser/app/events/drag.js → src/client/app/events/drag.js b/src/browser/app/events/drag.js → src/client/app/events/drag.js
diff --git a/src/browser/app/events/event-emitter.js → src/client/app/events/event-emitter.js b/src/browser/app/events/event-emitter.js → src/client/app/events/event-emitter.js
diff --git a/src/browser/app/events/resize.js → src/client/app/events/resize.js b/src/browser/app/events/resize.js → src/client/app/events/resize.js
diff --git a/src/browser/app/events/utils.js → src/client/app/events/utils.js b/src/browser/app/events/utils.js → src/client/app/events/utils.js
diff --git a/src/browser/app/globals.js → src/client/app/globals.js b/src/browser/app/globals.js → src/client/app/globals.js
diff --git a/src/browser/app/ipc/callbacks.js → src/client/app/ipc/callbacks.js b/src/browser/app/ipc/callbacks.js → src/client/app/ipc/callbacks.js
diff --git a/src/browser/app/ipc/index.js → src/client/app/ipc/index.js b/src/browser/app/ipc/index.js → src/client/app/ipc/index.js
diff --git a/src/browser/app/locales/en.js → src/client/app/locales/en.js b/src/browser/app/locales/en.js → src/client/app/locales/en.js
diff --git a/src/browser/app/locales/fr.js → src/client/app/locales/fr.js b/src/browser/app/locales/fr.js → src/client/app/locales/fr.js
diff --git a/src/browser/app/locales/index.js → src/client/app/locales/index.js b/src/browser/app/locales/index.js → src/client/app/locales/index.js
diff --git a/src/browser/app/locales/ru.js → src/client/app/locales/ru.js b/src/browser/app/locales/ru.js → src/client/app/locales/ru.js
diff --git a/src/browser/app/managers/session.js → src/client/app/managers/session.js b/src/browser/app/managers/session.js → src/client/app/managers/session.js
diff --git a/src/browser/app/managers/state.js → src/client/app/managers/state.js b/src/browser/app/managers/state.js → src/client/app/managers/state.js
diff --git a/src/browser/app/managers/widgets.js → src/client/app/managers/widgets.js b/src/browser/app/managers/widgets.js → src/client/app/managers/widgets.js
diff --git a/src/browser/app/osc.js → src/client/app/osc.js b/src/browser/app/osc.js → src/client/app/osc.js
diff --git a/src/browser/app/parser.js → src/client/app/parser.js b/src/browser/app/parser.js → src/client/app/parser.js
diff --git a/src/browser/app/remote-control.js → src/client/app/remote-control.js b/src/browser/app/remote-control.js → src/client/app/remote-control.js
diff --git a/src/browser/app/stacktrace.js → src/client/app/stacktrace.js b/src/browser/app/stacktrace.js → src/client/app/stacktrace.js
diff --git a/src/browser/app/ui/fullscreen.js → src/client/app/ui/fullscreen.js b/src/browser/app/ui/fullscreen.js → src/client/app/ui/fullscreen.js
diff --git a/src/browser/app/ui/init.js → src/client/app/ui/init.js b/src/browser/app/ui/init.js → src/client/app/ui/init.js
diff --git a/src/browser/app/ui/ios.js → src/client/app/ui/ios.js b/src/browser/app/ui/ios.js → src/client/app/ui/ios.js
diff --git a/src/browser/app/ui/lobby.js → src/client/app/ui/lobby.js b/src/browser/app/ui/lobby.js → src/client/app/ui/lobby.js
diff --git a/src/browser/app/ui/sidepanel.js → src/client/app/ui/sidepanel.js b/src/browser/app/ui/sidepanel.js → src/client/app/ui/sidepanel.js
diff --git a/src/browser/app/ui/utils.js → src/client/app/ui/utils.js b/src/browser/app/ui/utils.js → src/client/app/ui/utils.js
diff --git a/src/browser/app/ui/zoom.js → src/client/app/ui/zoom.js b/src/browser/app/ui/zoom.js → src/client/app/ui/zoom.js
diff --git a/src/browser/app/utils.js → src/client/app/utils.js b/src/browser/app/utils.js → src/client/app/utils.js
diff --git a/src/browser/app/widgets/buttons/dropdown.js → src/client/app/widgets/buttons/dropdown.js b/src/browser/app/widgets/buttons/dropdown.js → src/client/app/widgets/buttons/dropdown.js
diff --git a/src/browser/app/widgets/buttons/push.js → src/client/app/widgets/buttons/push.js b/src/browser/app/widgets/buttons/push.js → src/client/app/widgets/buttons/push.js
diff --git a/src/browser/app/widgets/buttons/switch.js → src/client/app/widgets/buttons/switch.js b/src/browser/app/widgets/buttons/switch.js → src/client/app/widgets/buttons/switch.js
diff --git a/src/browser/app/widgets/buttons/toggle.js → src/client/app/widgets/buttons/toggle.js b/src/browser/app/widgets/buttons/toggle.js → src/client/app/widgets/buttons/toggle.js
diff --git a/src/browser/app/widgets/common/canvas.js → src/client/app/widgets/common/canvas.js b/src/browser/app/widgets/common/canvas.js → src/client/app/widgets/common/canvas.js
diff --git a/src/browser/app/widgets/common/container.js → src/client/app/widgets/common/container.js b/src/browser/app/widgets/common/container.js → src/client/app/widgets/common/container.js
diff --git a/...rowser/app/widgets/common/osc-receiver.js → ...client/app/widgets/common/osc-receiver.js b/...rowser/app/widgets/common/osc-receiver.js → ...client/app/widgets/common/osc-receiver.js
diff --git a/src/browser/app/widgets/common/widget.js → src/client/app/widgets/common/widget.js b/src/browser/app/widgets/common/widget.js → src/client/app/widgets/common/widget.js
diff --git a/src/browser/app/widgets/containers/clone.js → src/client/app/widgets/containers/clone.js b/src/browser/app/widgets/containers/clone.js → src/client/app/widgets/containers/clone.js
diff --git a/src/browser/app/widgets/containers/modal.js → src/client/app/widgets/containers/modal.js b/src/browser/app/widgets/containers/modal.js → src/client/app/widgets/containers/modal.js
diff --git a/src/browser/app/widgets/containers/panel.js → src/client/app/widgets/containers/panel.js b/src/browser/app/widgets/containers/panel.js → src/client/app/widgets/containers/panel.js
diff --git a/src/browser/app/widgets/containers/root.js → src/client/app/widgets/containers/root.js b/src/browser/app/widgets/containers/root.js → src/client/app/widgets/containers/root.js
diff --git a/src/browser/app/widgets/containers/strip.js → src/client/app/widgets/containers/strip.js b/src/browser/app/widgets/containers/strip.js → src/client/app/widgets/containers/strip.js
diff --git a/src/browser/app/widgets/containers/tab.js → src/client/app/widgets/containers/tab.js b/src/browser/app/widgets/containers/tab.js → src/client/app/widgets/containers/tab.js
diff --git a/src/browser/app/widgets/index.js → src/client/app/widgets/index.js b/src/browser/app/widgets/index.js → src/client/app/widgets/index.js
diff --git a/src/browser/app/widgets/inputs/gyroscope.js → src/client/app/widgets/inputs/gyroscope.js b/src/browser/app/widgets/inputs/gyroscope.js → src/client/app/widgets/inputs/gyroscope.js
diff --git a/src/browser/app/widgets/inputs/input.js → src/client/app/widgets/inputs/input.js b/src/browser/app/widgets/inputs/input.js → src/client/app/widgets/inputs/input.js
diff --git a/src/browser/app/widgets/inputs/keys.js → src/client/app/widgets/inputs/keys.js b/src/browser/app/widgets/inputs/keys.js → src/client/app/widgets/inputs/keys.js
diff --git a/src/browser/app/widgets/inputs/script.js → src/client/app/widgets/inputs/script.js b/src/browser/app/widgets/inputs/script.js → src/client/app/widgets/inputs/script.js
diff --git a/src/browser/app/widgets/maths/formula.js → src/client/app/widgets/maths/formula.js b/src/browser/app/widgets/maths/formula.js → src/client/app/widgets/maths/formula.js
diff --git a/...wser/app/widgets/matrices/_matrix_base.js → ...ient/app/widgets/matrices/_matrix_base.js b/...wser/app/widgets/matrices/_matrix_base.js → ...ient/app/widgets/matrices/_matrix_base.js
diff --git a/src/browser/app/widgets/matrices/keyboard.js → src/client/app/widgets/matrices/keyboard.js b/src/browser/app/widgets/matrices/keyboard.js → src/client/app/widgets/matrices/keyboard.js
diff --git a/src/browser/app/widgets/matrices/matrix.js → src/client/app/widgets/matrices/matrix.js b/src/browser/app/widgets/matrices/matrix.js → src/client/app/widgets/matrices/matrix.js
diff --git a/...rowser/app/widgets/matrices/multifader.js → ...client/app/widgets/matrices/multifader.js b/...rowser/app/widgets/matrices/multifader.js → ...client/app/widgets/matrices/multifader.js
diff --git a/...browser/app/widgets/matrices/multipush.js → src/client/app/widgets/matrices/multipush.js b/...browser/app/widgets/matrices/multipush.js → src/client/app/widgets/matrices/multipush.js
diff --git a/...owser/app/widgets/matrices/multitoggle.js → ...lient/app/widgets/matrices/multitoggle.js b/...owser/app/widgets/matrices/multitoggle.js → ...lient/app/widgets/matrices/multitoggle.js
diff --git a/src/browser/app/widgets/mixins/double_tap.js → src/client/app/widgets/mixins/double_tap.js b/src/browser/app/widgets/mixins/double_tap.js → src/client/app/widgets/mixins/double_tap.js
diff --git a/...browser/app/widgets/mixins/touch_state.js → src/client/app/widgets/mixins/touch_state.js b/...browser/app/widgets/mixins/touch_state.js → src/client/app/widgets/mixins/touch_state.js
diff --git a/src/browser/app/widgets/pads/_fake_fader.js → src/client/app/widgets/pads/_fake_fader.js b/src/browser/app/widgets/pads/_fake_fader.js → src/client/app/widgets/pads/_fake_fader.js
diff --git a/src/browser/app/widgets/pads/multixy.js → src/client/app/widgets/pads/multixy.js b/src/browser/app/widgets/pads/multixy.js → src/client/app/widgets/pads/multixy.js
diff --git a/src/browser/app/widgets/pads/pad.js → src/client/app/widgets/pads/pad.js b/src/browser/app/widgets/pads/pad.js → src/client/app/widgets/pads/pad.js
diff --git a/src/browser/app/widgets/pads/rgb.js → src/client/app/widgets/pads/rgb.js b/src/browser/app/widgets/pads/rgb.js → src/client/app/widgets/pads/rgb.js
diff --git a/src/browser/app/widgets/pads/xy.js → src/client/app/widgets/pads/xy.js b/src/browser/app/widgets/pads/xy.js → src/client/app/widgets/pads/xy.js
diff --git a/...ser/app/widgets/plots/_biquad_response.js → ...ent/app/widgets/plots/_biquad_response.js b/...ser/app/widgets/plots/_biquad_response.js → ...ent/app/widgets/plots/_biquad_response.js
diff --git a/src/browser/app/widgets/plots/_plots_base.js → src/client/app/widgets/plots/_plots_base.js b/src/browser/app/widgets/plots/_plots_base.js → src/client/app/widgets/plots/_plots_base.js
diff --git a/src/browser/app/widgets/plots/eq.js → src/client/app/widgets/plots/eq.js b/src/browser/app/widgets/plots/eq.js → src/client/app/widgets/plots/eq.js
diff --git a/src/browser/app/widgets/plots/frame.js → src/client/app/widgets/plots/frame.js b/src/browser/app/widgets/plots/frame.js → src/client/app/widgets/plots/frame.js
diff --git a/src/browser/app/widgets/plots/image.js → src/client/app/widgets/plots/image.js b/src/browser/app/widgets/plots/image.js → src/client/app/widgets/plots/image.js
diff --git a/src/browser/app/widgets/plots/led.js → src/client/app/widgets/plots/led.js b/src/browser/app/widgets/plots/led.js → src/client/app/widgets/plots/led.js
diff --git a/src/browser/app/widgets/plots/meter.js → src/client/app/widgets/plots/meter.js b/src/browser/app/widgets/plots/meter.js → src/client/app/widgets/plots/meter.js
diff --git a/src/browser/app/widgets/plots/plot.js → src/client/app/widgets/plots/plot.js b/src/browser/app/widgets/plots/plot.js → src/client/app/widgets/plots/plot.js
diff --git a/src/browser/app/widgets/plots/rgbled.js → src/client/app/widgets/plots/rgbled.js b/src/browser/app/widgets/plots/rgbled.js → src/client/app/widgets/plots/rgbled.js
diff --git a/src/browser/app/widgets/plots/svg.js → src/client/app/widgets/plots/svg.js b/src/browser/app/widgets/plots/svg.js → src/client/app/widgets/plots/svg.js
diff --git a/src/browser/app/widgets/plots/text.js → src/client/app/widgets/plots/text.js b/src/browser/app/widgets/plots/text.js → src/client/app/widgets/plots/text.js
diff --git a/src/browser/app/widgets/plots/visualizer.js → src/client/app/widgets/plots/visualizer.js b/src/browser/app/widgets/plots/visualizer.js → src/client/app/widgets/plots/visualizer.js
diff --git a/src/browser/app/widgets/sliders/encoder.js → src/client/app/widgets/sliders/encoder.js b/src/browser/app/widgets/sliders/encoder.js → src/client/app/widgets/sliders/encoder.js
diff --git a/src/browser/app/widgets/sliders/fader.js → src/client/app/widgets/sliders/fader.js b/src/browser/app/widgets/sliders/fader.js → src/client/app/widgets/sliders/fader.js
diff --git a/src/browser/app/widgets/sliders/knob.js → src/client/app/widgets/sliders/knob.js b/src/browser/app/widgets/sliders/knob.js → src/client/app/widgets/sliders/knob.js
diff --git a/src/browser/app/widgets/sliders/range.js → src/client/app/widgets/sliders/range.js b/src/browser/app/widgets/sliders/range.js → src/client/app/widgets/sliders/range.js
diff --git a/src/browser/app/widgets/sliders/slider.js → src/client/app/widgets/sliders/slider.js b/src/browser/app/widgets/sliders/slider.js → src/client/app/widgets/sliders/slider.js
diff --git a/.../app/widgets/switchers/_switchers_base.js → .../app/widgets/switchers/_switchers_base.js b/.../app/widgets/switchers/_switchers_base.js → .../app/widgets/switchers/_switchers_base.js
diff --git a/...owser/app/widgets/switchers/crossfader.js → ...lient/app/widgets/switchers/crossfader.js b/...owser/app/widgets/switchers/crossfader.js → ...lient/app/widgets/switchers/crossfader.js
diff --git a/...browser/app/widgets/switchers/switcher.js → src/client/app/widgets/switchers/switcher.js b/...browser/app/widgets/switchers/switcher.js → src/client/app/widgets/switchers/switcher.js
diff --git a/src/browser/app/widgets/utils.js → src/client/app/widgets/utils.js b/src/browser/app/widgets/utils.js → src/client/app/widgets/utils.js
diff --git a/src/browser/index.js → src/client/index.js b/src/browser/index.js → src/client/index.js
diff --git a/src/browser/libs/jquery.touch.js → src/client/libs/jquery.touch.js b/src/browser/libs/jquery.touch.js → src/client/libs/jquery.touch.js
diff --git a/src/browser/libs/jquery.ui.js → src/client/libs/jquery.ui.js b/src/browser/libs/jquery.ui.js → src/client/libs/jquery.ui.js
diff --git a/src/main/callbacks.js → src/server/callbacks.js b/src/main/callbacks.js → src/server/callbacks.js
diff --git a/src/main/electron-app.js → src/server/electron-app.js b/src/main/electron-app.js → src/server/electron-app.js
diff --git a/src/main/electron-window.js → src/server/electron-window.js b/src/main/electron-window.js → src/server/electron-window.js
@@ -13,7 +13,7 @@ module.exports = function(options={}) {
         width: options.width || 800,
         height: options.height || 600,
         title: options.title || settings.read('appName'),
-        icon: path.resolve(__dirname + '/../browser/logo.png'),
+        icon: path.resolve(__dirname + '/../client/logo.png'),
         backgroundColor: options.color || theme.backgroundColor,
         type: options.type,
         fullscreen: options.fullscreen,

diff --git a/src/main/index.js → src/server/index.js b/src/main/index.js → src/server/index.js
diff --git a/src/main/ipc/client.js → src/server/ipc/client.js b/src/main/ipc/client.js → src/server/ipc/client.js
diff --git a/src/main/ipc/server.js → src/server/ipc/server.js b/src/main/ipc/server.js → src/server/ipc/server.js
diff --git a/src/main/midi.js → src/server/midi.js b/src/main/midi.js → src/server/midi.js
diff --git a/src/main/osc/index.js → src/server/osc/index.js b/src/main/osc/index.js → src/server/osc/index.js
diff --git a/src/main/osc/tcp.js → src/server/osc/tcp.js b/src/main/osc/tcp.js → src/server/osc/tcp.js
diff --git a/src/main/osc/udp.js → src/server/osc/udp.js b/src/main/osc/udp.js → src/server/osc/udp.js
diff --git a/src/main/server.js → src/server/server.js b/src/main/server.js → src/server/server.js
@@ -25,7 +25,7 @@ express.get('*', function(req, res){
         } else {
             res.send('')
         }
-    } else if (req.path.indexOf('browser/') != -1){
+    } else if (req.path.indexOf('client/') != -1){
         res.sendFile(path.resolve(__dirname + '/..' + req.path))
     } else {
         res.sendFile(path.resolve(req.path))

diff --git a/src/main/settings.js → src/server/settings.js b/src/main/settings.js → src/server/settings.js
diff --git a/src/main/theme.js → src/server/theme.js b/src/main/theme.js → src/server/theme.js
diff --git a/src/main/utils.js → src/server/utils.js b/src/main/utils.js → src/server/utils.js
diff --git a/src/main/zeroconf.js → src/server/zeroconf.js b/src/main/zeroconf.js → src/server/zeroconf.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		require('./main/open-stage-control-server')
		require('./server/open-stage-control-server')