Rename and move files for better clarity

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', () => {

js/actionCreators.js

@@ -1,4 +1,4 @@
-import MyFile from './my-file';
+import MyFile from './myFile';
 import skinParser from './skinParser';
 
 export function play(mediaPlayer) {

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);

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 {

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) {

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 />

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) {

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';
 
 

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) {

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);

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';
 

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';

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/',