diff --git a/images/exit.svg b/client/images/exit.svg
similarity index 100%
rename from images/exit.svg
rename to client/images/exit.svg
diff --git a/images/minus.svg b/client/images/minus.svg
similarity index 100%
rename from images/minus.svg
rename to client/images/minus.svg
diff --git a/images/p5js-logo.svg b/client/images/p5js-logo.svg
similarity index 100%
rename from images/p5js-logo.svg
rename to client/images/p5js-logo.svg
diff --git a/images/play.svg b/client/images/play.svg
similarity index 100%
rename from images/play.svg
rename to client/images/play.svg
diff --git a/images/plus.svg b/client/images/plus.svg
similarity index 100%
rename from images/plus.svg
rename to client/images/plus.svg
diff --git a/images/preferences.svg b/client/images/preferences.svg
similarity index 100%
rename from images/preferences.svg
rename to client/images/preferences.svg
diff --git a/images/stop.svg b/client/images/stop.svg
similarity index 100%
rename from images/stop.svg
rename to client/images/stop.svg
diff --git a/client/index.js b/client/index.js
index 7fa19f1b..fad1d375 100644
--- a/client/index.js
+++ b/client/index.js
@@ -5,7 +5,7 @@ import { Router, browserHistory } from 'react-router'
 import configureStore from './store'
 import routes from './routes'
 
-require('../styles/main.scss');
+require('./styles/main.scss');
 
 const history = browserHistory
 const initialState = window.__INITIAL_STATE__
diff --git a/client/modules/IDE/components/Preferences.jsx b/client/modules/IDE/components/Preferences.jsx
index 0233e6ac..9de15ebf 100644
--- a/client/modules/IDE/components/Preferences.jsx
+++ b/client/modules/IDE/components/Preferences.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
 var Isvg = require('react-inlinesvg');
-var exitUrl = require('../../../../images/exit.svg');
-var plusUrl = require('../../../../images/plus.svg');
-var minusUrl = require('../../../../images/minus.svg');
+var exitUrl = require('../../../images/exit.svg');
+var plusUrl = require('../../../images/plus.svg');
+var minusUrl = require('../../../images/minus.svg');
 var classNames = require('classnames');
 
 class Preferences extends React.Component {
diff --git a/client/modules/IDE/components/Toolbar.jsx b/client/modules/IDE/components/Toolbar.jsx
index 590f8015..7a4db35f 100644
--- a/client/modules/IDE/components/Toolbar.jsx
+++ b/client/modules/IDE/components/Toolbar.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
 
 var Isvg = require('react-inlinesvg');
-var playUrl = require('../../../../images/play.svg');
-var logoUrl = require('../../../../images/p5js-logo.svg');
-var stopUrl = require('../../../../images/stop.svg');
-var preferencesUrl = require('../../../../images/preferences.svg');
+var playUrl = require('../../../images/play.svg');
+var logoUrl = require('../../../images/p5js-logo.svg');
+var stopUrl = require('../../../images/stop.svg');
+var preferencesUrl = require('../../../images/preferences.svg');
 var classNames = require('classnames');
 
 class Toolbar extends React.Component {
diff --git a/styles/abstracts/_placeholders.scss b/client/styles/abstracts/_placeholders.scss
similarity index 100%
rename from styles/abstracts/_placeholders.scss
rename to client/styles/abstracts/_placeholders.scss
diff --git a/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss
similarity index 100%
rename from styles/abstracts/_variables.scss
rename to client/styles/abstracts/_variables.scss
diff --git a/styles/base/_base.scss b/client/styles/base/_base.scss
similarity index 100%
rename from styles/base/_base.scss
rename to client/styles/base/_base.scss
diff --git a/styles/base/_reset.scss b/client/styles/base/_reset.scss
similarity index 100%
rename from styles/base/_reset.scss
rename to client/styles/base/_reset.scss
diff --git a/styles/components/_editor.scss b/client/styles/components/_editor.scss
similarity index 100%
rename from styles/components/_editor.scss
rename to client/styles/components/_editor.scss
diff --git a/styles/components/_login.scss b/client/styles/components/_login.scss
similarity index 100%
rename from styles/components/_login.scss
rename to client/styles/components/_login.scss
diff --git a/styles/components/_nav.scss b/client/styles/components/_nav.scss
similarity index 100%
rename from styles/components/_nav.scss
rename to client/styles/components/_nav.scss
diff --git a/styles/components/_p5-widget-codemirror-theme.scss b/client/styles/components/_p5-widget-codemirror-theme.scss
similarity index 100%
rename from styles/components/_p5-widget-codemirror-theme.scss
rename to client/styles/components/_p5-widget-codemirror-theme.scss
diff --git a/styles/components/_preferences.scss b/client/styles/components/_preferences.scss
similarity index 100%
rename from styles/components/_preferences.scss
rename to client/styles/components/_preferences.scss
diff --git a/styles/components/_signup.scss b/client/styles/components/_signup.scss
similarity index 100%
rename from styles/components/_signup.scss
rename to client/styles/components/_signup.scss
diff --git a/styles/components/_toolbar.scss b/client/styles/components/_toolbar.scss
similarity index 100%
rename from styles/components/_toolbar.scss
rename to client/styles/components/_toolbar.scss
diff --git a/styles/layout/_ide.scss b/client/styles/layout/_ide.scss
similarity index 100%
rename from styles/layout/_ide.scss
rename to client/styles/layout/_ide.scss
diff --git a/styles/main.scss b/client/styles/main.scss
similarity index 100%
rename from styles/main.scss
rename to client/styles/main.scss
diff --git a/styles/vendors/_codemirror.scss b/client/styles/vendors/_codemirror.scss
similarity index 100%
rename from styles/vendors/_codemirror.scss
rename to client/styles/vendors/_codemirror.scss