diff --git a/client/src/js/actions/channel.js b/client/src/js/actions/channel.js
index e7df3738..5f179346 100644
--- a/client/src/js/actions/channel.js
+++ b/client/src/js/actions/channel.js
@@ -1,7 +1,7 @@
 var Reflux = require('reflux');
 var _ = require('lodash');
 
-var socket = require('../socket.js');
+var socket = require('../socket');
 
 var channelActions = Reflux.createActions([
 	'join',
diff --git a/client/src/js/actions/message.js b/client/src/js/actions/message.js
index 2db580a0..3070b236 100644
--- a/client/src/js/actions/message.js
+++ b/client/src/js/actions/message.js
@@ -1,6 +1,6 @@
 var Reflux = require('reflux');
 
-var socket = require('../socket.js');
+var socket = require('../socket');
 
 var messageActions = Reflux.createActions([
 	'send',
diff --git a/client/src/js/actions/server.js b/client/src/js/actions/server.js
index 9cb2b281..c3ffbb5d 100644
--- a/client/src/js/actions/server.js
+++ b/client/src/js/actions/server.js
@@ -1,6 +1,6 @@
 var Reflux = require('reflux');
 
-var socket = require('../socket.js')('/ws');
+var socket = require('../socket');
 
 var serverActions = Reflux.createActions([
 	'connect',
diff --git a/client/src/js/app.js b/client/src/js/app.js
index 959d3880..f18eabc7 100644
--- a/client/src/js/app.js
+++ b/client/src/js/app.js
@@ -3,9 +3,9 @@ var React = require('react');
 var socket = require('./socket');
 var util = require('./util');
 var App = require('./components/App.jsx');
-var tabActions = require('./actions/tab.js');
-var serverActions = require('./actions/server.js');
-var channelActions = require('./actions/channel.js');
+var tabActions = require('./actions/tab');
+var serverActions = require('./actions/server');
+var channelActions = require('./actions/channel');
 
 var uuid = localStorage.uuid || (localStorage.uuid = util.UUID());
 var nick = 'test' + Math.floor(Math.random() * 99999);
diff --git a/client/src/js/components/ChatTitle.jsx b/client/src/js/components/ChatTitle.jsx
index 03886caa..8514f475 100644
--- a/client/src/js/components/ChatTitle.jsx
+++ b/client/src/js/components/ChatTitle.jsx
@@ -1,8 +1,8 @@
 var React = require('react');
 var Reflux = require('reflux');
 
-var channelStore = require('../stores/channel.js');
-var selectedTabStore = require('../stores/selectedTab.js');
+var channelStore = require('../stores/channel');
+var selectedTabStore = require('../stores/selectedTab');
 
 var ChatTitle = React.createClass({
     mixins: [
diff --git a/client/src/js/components/MessageBox.jsx b/client/src/js/components/MessageBox.jsx
index cd4d0584..6d4f2e10 100644
--- a/client/src/js/components/MessageBox.jsx
+++ b/client/src/js/components/MessageBox.jsx
@@ -2,8 +2,8 @@ var React = require('react');
 var Reflux = require('reflux');
 var _ = require('lodash');
 
-var messageStore = require('../stores/message.js');
-var selectedTabStore = require('../stores/selectedTab.js');
+var messageStore = require('../stores/message');
+var selectedTabStore = require('../stores/selectedTab');
 
 var MessageBox = React.createClass({
 	mixins: [
diff --git a/client/src/js/components/MessageInput.jsx b/client/src/js/components/MessageInput.jsx
index 721945b0..0bb66832 100644
--- a/client/src/js/components/MessageInput.jsx
+++ b/client/src/js/components/MessageInput.jsx
@@ -1,9 +1,9 @@
 var React = require('react');
 var Reflux = require('reflux');
 
-var selectedTabStore = require('../stores/selectedTab.js');
-var messageActions = require('../actions/message.js');
-var channelActions = require('../actions/channel.js');
+var selectedTabStore = require('../stores/selectedTab');
+var messageActions = require('../actions/message');
+var channelActions = require('../actions/channel');
 
 function dispatchCommand(cmd, channel, server) {
 	var params = cmd.slice(1).split(' ');
diff --git a/client/src/js/components/TabList.jsx b/client/src/js/components/TabList.jsx
index dc54258d..e4810552 100644
--- a/client/src/js/components/TabList.jsx
+++ b/client/src/js/components/TabList.jsx
@@ -2,10 +2,10 @@ var React = require('react');
 var Reflux = require('reflux');
 var _ = require('lodash');
 
-var serverStore = require('../stores/server.js');
-var channelStore = require('../stores/channel.js');
-var selectedTabStore = require('../stores/selectedTab.js');
-var tabActions = require('../actions/tab.js');
+var serverStore = require('../stores/server');
+var channelStore = require('../stores/channel');
+var selectedTabStore = require('../stores/selectedTab');
+var tabActions = require('../actions/tab');
 
 var TabList = React.createClass({
 	mixins: [
diff --git a/client/src/js/components/UserList.jsx b/client/src/js/components/UserList.jsx
index bdf98639..4dc9ad0e 100644
--- a/client/src/js/components/UserList.jsx
+++ b/client/src/js/components/UserList.jsx
@@ -2,8 +2,8 @@ var React = require('react');
 var Reflux = require('reflux');
 var _ = require('lodash');
 
-var channelStore = require('../stores/channel.js');
-var selectedTabStore = require('../stores/selectedTab.js');
+var channelStore = require('../stores/channel');
+var selectedTabStore = require('../stores/selectedTab');
 
 var UserList = React.createClass({
 	mixins: [
diff --git a/client/src/js/stores/channel.js b/client/src/js/stores/channel.js
index 68ba0eae..4c2c1619 100644
--- a/client/src/js/stores/channel.js
+++ b/client/src/js/stores/channel.js
@@ -1,7 +1,7 @@
 var Reflux = require('reflux');
 var _ = require('lodash');
 
-var actions = require('../actions/channel.js');
+var actions = require('../actions/channel');
 
 var channels = {};
 
diff --git a/client/src/js/stores/message.js b/client/src/js/stores/message.js
index 74448a34..d0f51f99 100644
--- a/client/src/js/stores/message.js
+++ b/client/src/js/stores/message.js
@@ -1,6 +1,7 @@
 var Reflux = require('reflux');
 
-var actions = require('../actions/message.js');
+var serverStore = require('../stores/server');
+var actions = require('../actions/message');
 
 var messages = {};
 
diff --git a/client/src/js/stores/selectedTab.js b/client/src/js/stores/selectedTab.js
index 876ae4eb..3ec03c46 100644
--- a/client/src/js/stores/selectedTab.js
+++ b/client/src/js/stores/selectedTab.js
@@ -1,8 +1,8 @@
 var Reflux = require('reflux');
 var _ = require('lodash');
 
-var actions = require('../actions/tab.js');
-var channelActions = require('../actions/channel.js');
+var actions = require('../actions/tab');
+var channelActions = require('../actions/channel');
 
 var selectedTab = {};
 
diff --git a/client/src/js/stores/server.js b/client/src/js/stores/server.js
index 29410551..50cee2a5 100644
--- a/client/src/js/stores/server.js
+++ b/client/src/js/stores/server.js
@@ -1,6 +1,6 @@
 var Reflux = require('reflux');
 
-var actions = require('../actions/server.js');
+var actions = require('../actions/server');
 
 var servers = {};