diff --git a/js/__tests__/Marquee-test.js b/js/__tests__/Marquee-test.js
index c1f28f85..f67bf7f9 100644
--- a/js/__tests__/Marquee-test.js
+++ b/js/__tests__/Marquee-test.js
@@ -1,4 +1,4 @@
-jest.unmock('../Marquee.jsx');
+jest.unmock('../components/Marquee.jsx');
 jest.unmock('../utils');
 
 import {
@@ -10,7 +10,7 @@ import {
   stepOffset,
   negativePixels,
   loopText
-} from '../Marquee.jsx';
+} from '../components/Marquee.jsx';
 
 describe('getBalanceText', () => {
   it('treats negative numbers as left', () => {
diff --git a/js/actionCreators.js b/js/actionCreators.js
index 751c1f1b..f4af71e4 100644
--- a/js/actionCreators.js
+++ b/js/actionCreators.js
@@ -1,4 +1,4 @@
-import MyFile from './my-file';
+import MyFile from './myFile';
 import skinParser from './skinParser';
 
 export function play(mediaPlayer) {
diff --git a/js/Actions.jsx b/js/components/ActionButtons.jsx
similarity index 80%
rename from js/Actions.jsx
rename to js/components/ActionButtons.jsx
index 4b3b5351..cd738ec8 100644
--- a/js/Actions.jsx
+++ b/js/components/ActionButtons.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import {connect} from 'react-redux';
-import {play, pause, stop} from './actionCreators';
+import {play, pause, stop} from '../actionCreators';
 
 
-class Actions extends React.Component {
+class ActionButtons extends React.Component {
   constructor(props) {
     super(props);
     this.play = this.play.bind(this);
@@ -30,4 +30,4 @@ class Actions extends React.Component {
   }
 }
 
-module.exports = connect((state) => state.media)(Actions);
+module.exports = connect((state) => state.media)(ActionButtons);
diff --git a/js/Balance.jsx b/js/components/Balance.jsx
similarity index 100%
rename from js/Balance.jsx
rename to js/components/Balance.jsx
diff --git a/js/Character.jsx b/js/components/Character.jsx
similarity index 100%
rename from js/Character.jsx
rename to js/components/Character.jsx
diff --git a/js/CharacterString.jsx b/js/components/CharacterString.jsx
similarity index 100%
rename from js/CharacterString.jsx
rename to js/components/CharacterString.jsx
diff --git a/js/Close.jsx b/js/components/Close.jsx
similarity index 90%
rename from js/Close.jsx
rename to js/components/Close.jsx
index a1cdcc93..aff0e272 100644
--- a/js/Close.jsx
+++ b/js/components/Close.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {connect} from 'react-redux';
 
-import {close} from './actionCreators';
+import {close} from '../actionCreators';
 
 
 class Close extends React.Component {
diff --git a/js/ClutterBar.jsx b/js/components/ClutterBar.jsx
similarity index 100%
rename from js/ClutterBar.jsx
rename to js/components/ClutterBar.jsx
diff --git a/js/ContextMenu.jsx b/js/components/ContextMenu.jsx
similarity index 96%
rename from js/ContextMenu.jsx
rename to js/components/ContextMenu.jsx
index 390759a5..ef328de6 100644
--- a/js/ContextMenu.jsx
+++ b/js/components/ContextMenu.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import {connect} from 'react-redux';
 
-import {close, setSkinFromFilename} from './actionCreators';
+import {close, setSkinFromFilename} from '../actionCreators';
 
-import '../css/context-menu.css';
+import '../../css/context-menu.css';
 
 class ContextMenu extends React.Component {
   constructor(props) {
diff --git a/js/DragTarget.jsx b/js/components/DragTarget.jsx
similarity index 100%
rename from js/DragTarget.jsx
rename to js/components/DragTarget.jsx
diff --git a/js/DraggableWindow.jsx b/js/components/DraggableWindow.jsx
similarity index 100%
rename from js/DraggableWindow.jsx
rename to js/components/DraggableWindow.jsx
diff --git a/js/Eject.jsx b/js/components/Eject.jsx
similarity index 100%
rename from js/Eject.jsx
rename to js/components/Eject.jsx
diff --git a/js/Kbps.jsx b/js/components/Kbps.jsx
similarity index 100%
rename from js/Kbps.jsx
rename to js/components/Kbps.jsx
diff --git a/js/Khz.jsx b/js/components/Khz.jsx
similarity index 100%
rename from js/Khz.jsx
rename to js/components/Khz.jsx
diff --git a/js/MainWindow.jsx b/js/components/MainWindow.jsx
similarity index 95%
rename from js/MainWindow.jsx
rename to js/components/MainWindow.jsx
index 45bd60fb..0e194b6d 100644
--- a/js/MainWindow.jsx
+++ b/js/components/MainWindow.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {connect} from 'react-redux';
 import classnames from 'classnames';
 
-import Actions from './Actions.jsx';
+import ActionButtons from './ActionButtons.jsx';
 import Balance from './Balance.jsx';
 import Close from './Close.jsx';
 import ClutterBar from './ClutterBar.jsx';
@@ -23,7 +23,7 @@ import Time from './Time.jsx';
 import Visualizer from './Visualizer.jsx';
 import Volume from './Volume.jsx';
 
-import '../css/main-window.css';
+import '../../css/main-window.css';
 
 const MainWindow = (props) => {
   const {status} = props.media;
@@ -82,7 +82,7 @@ const MainWindow = (props) => {
           <div id='playlist-button' />
         </div>
         <Position mediaPlayer={props.mediaPlayer} />
-        <Actions mediaPlayer={props.mediaPlayer} />
+        <ActionButtons mediaPlayer={props.mediaPlayer} />
         <Eject />
         <div className='shuffle-repeat'>
           <Shuffle />
diff --git a/js/Marquee.jsx b/js/components/Marquee.jsx
similarity index 98%
rename from js/Marquee.jsx
rename to js/components/Marquee.jsx
index e039c123..390350e1 100644
--- a/js/Marquee.jsx
+++ b/js/components/Marquee.jsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import {connect} from 'react-redux';
 
-import {getTimeStr} from './utils';
+import {getTimeStr} from '../utils';
 
 const getBalanceText = (balance) => {
   if (balance === 0) {
diff --git a/js/MonoStereo.jsx b/js/components/MonoStereo.jsx
similarity index 100%
rename from js/MonoStereo.jsx
rename to js/components/MonoStereo.jsx
diff --git a/js/Position.jsx b/js/components/Position.jsx
similarity index 100%
rename from js/Position.jsx
rename to js/components/Position.jsx
diff --git a/js/Repeat.jsx b/js/components/Repeat.jsx
similarity index 100%
rename from js/Repeat.jsx
rename to js/components/Repeat.jsx
diff --git a/js/Shade.jsx b/js/components/Shade.jsx
similarity index 100%
rename from js/Shade.jsx
rename to js/components/Shade.jsx
diff --git a/js/ShadeTime.jsx b/js/components/ShadeTime.jsx
similarity index 96%
rename from js/ShadeTime.jsx
rename to js/components/ShadeTime.jsx
index eac38aa0..a320230c 100644
--- a/js/ShadeTime.jsx
+++ b/js/components/ShadeTime.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {connect} from 'react-redux';
 
-import {getTimeObj} from './utils';
+import {getTimeObj} from '../utils';
 import Character from './Character.jsx';
 
 
diff --git a/js/Shuffle.jsx b/js/components/Shuffle.jsx
similarity index 100%
rename from js/Shuffle.jsx
rename to js/components/Shuffle.jsx
diff --git a/js/Skin.jsx b/js/components/Skin.jsx
similarity index 100%
rename from js/Skin.jsx
rename to js/components/Skin.jsx
diff --git a/js/Time.jsx b/js/components/Time.jsx
similarity index 96%
rename from js/Time.jsx
rename to js/components/Time.jsx
index f2035d1b..4077e8b8 100644
--- a/js/Time.jsx
+++ b/js/components/Time.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {connect} from 'react-redux';
 
-import {getTimeObj} from './utils';
+import {getTimeObj} from '../utils';
 
 class Time extends React.Component {
   constructor(props) {
diff --git a/js/Visualizer.jsx b/js/components/Visualizer.jsx
similarity index 100%
rename from js/Visualizer.jsx
rename to js/components/Visualizer.jsx
diff --git a/js/Volume.jsx b/js/components/Volume.jsx
similarity index 100%
rename from js/Volume.jsx
rename to js/components/Volume.jsx
diff --git a/js/main.js b/js/index.js
similarity index 87%
rename from js/main.js
rename to js/index.js
index 97e8a07e..3edac733 100644
--- a/js/main.js
+++ b/js/index.js
@@ -7,10 +7,10 @@ import thunk from 'redux-thunk';
 import createReducer from './reducers';
 
 import Browser from './browser';
-import MainWindow from './MainWindow.jsx';
+import MainWindow from './components/MainWindow.jsx';
 import Winamp from './winamp';
 import Hotkeys from './hotkeys';
-import Skin from './Skin.jsx';
+import Skin from './components/Skin.jsx';
 
 if (new Browser(window).isCompatible) {
   const winamp = Winamp;
@@ -39,10 +39,10 @@ if (new Browser(window).isCompatible) {
     volume: 50,
     balance: 0,
     mediaFile: {
-      url: process.env.NODE_ENV === 'production' ? 'https://cdn.rawgit.com/captbaritone/llama/master/llama-2.91.mp3' : 'llama-2.91.mp3',
+      url: process.env.NODE_ENV === 'production' ? 'https://cdn.rawgit.com/captbaritone/llama/master/llama-2.91.mp3' : 'mp3/llama-2.91.mp3',
       name: "1. DJ Mike Llama - Llama Whippin' Intro"
     },
-    skinUrl: process.env.NODE_ENV === 'production' ? 'https://cdn.rawgit.com/captbaritone/winamp-skins/master/v2/base-2.91.wsz' : 'base-2.91.wsz'
+    skinUrl: process.env.NODE_ENV === 'production' ? 'https://cdn.rawgit.com/captbaritone/winamp-skins/master/v2/base-2.91.wsz' : 'skins/base-2.91.wsz'
   });
 
   new Hotkeys(winamp, store);
diff --git a/js/my-file.js b/js/myFile.js
similarity index 100%
rename from js/my-file.js
rename to js/myFile.js
diff --git a/js/skinParser.js b/js/skinParser.js
index 6d35f014..6e817847 100644
--- a/js/skinParser.js
+++ b/js/skinParser.js
@@ -1,4 +1,4 @@
-import SKIN_SPRITES from './skin-sprites';
+import SKIN_SPRITES from './skinSprites';
 import JSZip from '../node_modules/jszip/dist/jszip'; // Hack
 import {parseViscolors} from './utils';
 
diff --git a/js/skin-sprites.js b/js/skinSprites.js
similarity index 100%
rename from js/skin-sprites.js
rename to js/skinSprites.js
diff --git a/js/winamp.js b/js/winamp.js
index af737707..d88dd0d3 100755
--- a/js/winamp.js
+++ b/js/winamp.js
@@ -1,6 +1,6 @@
 // UI and App logic
 import Media from './media';
-import MyFile from './my-file';
+import MyFile from './myFile';
 import {setSkinFromUrl, setSkinFromFile} from './actionCreators';
 
 import '../css/winamp.css';
diff --git a/webpack.config.js b/webpack.config.js
index 012dd777..5eb70921 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -21,7 +21,7 @@ module.exports = {
       /jszip\.js$/
     ]
   },
-  entry: './js/main.js',
+  entry: './js/index.js',
   output: {
     filename: 'winamp.js',
     publicPath: '/built/',