diff --git a/js/AccountCombobox.js b/js/components/AccountCombobox.js
similarity index 93%
rename from js/AccountCombobox.js
rename to js/components/AccountCombobox.js
index 098d789..53e4077 100644
--- a/js/AccountCombobox.js
+++ b/js/components/AccountCombobox.js
@@ -2,7 +2,7 @@ var React = require('react');
 
 var Combobox = require('react-widgets').Combobox;
 
-var getAccountDisplayList = require('./utils.js').getAccountDisplayList;
+var getAccountDisplayList = require('../utils').getAccountDisplayList;
 
 module.exports = React.createClass({
 	displayName: "AccountCombobox",
diff --git a/js/AccountRegister.js b/js/components/AccountRegister.js
similarity index 99%
rename from js/AccountRegister.js
rename to js/components/AccountRegister.js
index 4887cf5..6d4cc41 100644
--- a/js/AccountRegister.js
+++ b/js/components/AccountRegister.js
@@ -32,7 +32,7 @@ var DropdownList = ReactWidgets.DropdownList;
 
 var Big = require('big.js');
 
-var models = require('./models.js');
+var models = require('../models');
 var Security = models.Security;
 var Account = models.Account;
 var Split = models.Split;
@@ -42,9 +42,9 @@ var TransactionStatusList = models.TransactionStatusList;
 var TransactionStatusMap = models.TransactionStatusMap;
 var Error = models.Error;
 
-var getAccountDisplayName = require('./utils.js').getAccountDisplayName;
+var getAccountDisplayName = require('../utils').getAccountDisplayName;
 
-var AccountCombobox = require('./AccountCombobox.js');
+var AccountCombobox = require('./AccountCombobox');
 
 const TransactionRow = React.createClass({
 	handleClick: function(e) {
diff --git a/js/AccountSettingsModal.js b/js/components/AccountSettingsModal.js
similarity index 98%
rename from js/AccountSettingsModal.js
rename to js/components/AccountSettingsModal.js
index 70963fa..64b9700 100644
--- a/js/AccountSettingsModal.js
+++ b/js/components/AccountSettingsModal.js
@@ -12,8 +12,7 @@ var FormControl = ReactBootstrap.FormControl;
 var ControlLabel = ReactBootstrap.ControlLabel;
 var Col = ReactBootstrap.Col;
 
-var models = require('./models.js');
-var User = models.User;
+var User = require('../models').User;
 
 module.exports = React.createClass({
 	displayName: "AccountSettingsModal",
diff --git a/js/AccountsTab.js b/js/components/AccountsTab.js
similarity index 99%
rename from js/AccountsTab.js
rename to js/components/AccountsTab.js
index cc22ff4..8579e18 100644
--- a/js/AccountsTab.js
+++ b/js/components/AccountsTab.js
@@ -22,13 +22,13 @@ var Collapse = ReactBootstrap.Collapse;
 
 var Combobox = require('react-widgets').Combobox;
 
-var models = require('./models.js');
+var models = require('../models');
 var Security = models.Security;
 var Account = models.Account;
 var AccountTypeList = models.AccountTypeList;
 
-var AccountCombobox = require('./AccountCombobox.js');
-var AccountRegister = require('./AccountRegister.js');
+var AccountCombobox = require('./AccountCombobox');
+var AccountRegister = require('./AccountRegister');
 
 const AddEditAccountModal = React.createClass({
 	getInitialState: function() {
diff --git a/js/MoneyGoApp.js b/js/components/MoneyGoApp.js
similarity index 90%
rename from js/MoneyGoApp.js
rename to js/components/MoneyGoApp.js
index 9e3b8e9..4f21f04 100644
--- a/js/MoneyGoApp.js
+++ b/js/components/MoneyGoApp.js
@@ -6,10 +6,10 @@ var Tabs = ReactBootstrap.Tabs;
 var Tab = ReactBootstrap.Tab;
 var Modal = ReactBootstrap.Modal;
 
-var TopBarContainer = require('./containers/TopBarContainer');
-var NewUserForm = require('./NewUserForm.js');
-var AccountSettingsModalContainer = require('./containers/AccountSettingsModalContainer');
-var AccountsTabContainer = require('./containers/AccountsTabContainer');
+var TopBarContainer = require('../containers/TopBarContainer');
+var NewUserForm = require('./NewUserForm');
+var AccountSettingsModalContainer = require('../containers/AccountSettingsModalContainer');
+var AccountsTabContainer = require('../containers/AccountsTabContainer');
 
 module.exports = React.createClass({
 	displayName: "MoneyGoApp",
diff --git a/js/NewUserForm.js b/js/components/NewUserForm.js
similarity index 99%
rename from js/NewUserForm.js
rename to js/components/NewUserForm.js
index 79e33a5..9a0145c 100644
--- a/js/NewUserForm.js
+++ b/js/components/NewUserForm.js
@@ -11,7 +11,7 @@ var Col = ReactBootstrap.Col;
 var Button = ReactBootstrap.Button;
 var ButtonGroup = ReactBootstrap.ButtonGroup;
 
-var models = require('./models.js');
+var models = require('../models');
 var User = models.User;
 var Error = models.Error;
 
diff --git a/js/TopBar.js b/js/components/TopBar.js
similarity index 98%
rename from js/TopBar.js
rename to js/components/TopBar.js
index fa9c181..21a8664 100644
--- a/js/TopBar.js
+++ b/js/components/TopBar.js
@@ -12,7 +12,7 @@ var Col = ReactBootstrap.Col;
 
 var ReactDOM = require('react-dom');
 
-var User = require('./models.js').User;
+var User = require('../models').User;
 
 const LoginBar = React.createClass({
 	getInitialState: function() {
diff --git a/js/containers/AccountSettingsModalContainer.js b/js/containers/AccountSettingsModalContainer.js
index 1dc7761..f653083 100644
--- a/js/containers/AccountSettingsModalContainer.js
+++ b/js/containers/AccountSettingsModalContainer.js
@@ -1,7 +1,7 @@
 var connect = require('react-redux').connect;
 
 var UserActions = require('../actions/UserActions');
-var AccountSettingsModal = require('../AccountSettingsModal');
+var AccountSettingsModal = require('../components/AccountSettingsModal');
 
 function mapStateToProps(state) {
 	return {
diff --git a/js/containers/AccountsTabContainer.js b/js/containers/AccountsTabContainer.js
index 5381ae4..255c718 100644
--- a/js/containers/AccountsTabContainer.js
+++ b/js/containers/AccountsTabContainer.js
@@ -1,7 +1,7 @@
 var connect = require('react-redux').connect;
 
 var AccountActions = require('../actions/AccountActions');
-var AccountsTab = require('../AccountsTab');
+var AccountsTab = require('../components/AccountsTab');
 
 function mapStateToProps(state) {
 	var security_list = [];
diff --git a/js/containers/MoneyGoAppContainer.js b/js/containers/MoneyGoAppContainer.js
index 50e192f..b348c6e 100644
--- a/js/containers/MoneyGoAppContainer.js
+++ b/js/containers/MoneyGoAppContainer.js
@@ -2,7 +2,7 @@ var connect = require('react-redux').connect;
 
 var UserActions = require('../actions/UserActions');
 
-var MoneyGoApp = require('../MoneyGoApp');
+var MoneyGoApp = require('../components/MoneyGoApp');
 
 function mapStateToProps(state) {
 	return {
diff --git a/js/containers/TopBarContainer.js b/js/containers/TopBarContainer.js
index c683152..2f0cf03 100644
--- a/js/containers/TopBarContainer.js
+++ b/js/containers/TopBarContainer.js
@@ -3,7 +3,7 @@ var connect = require('react-redux').connect;
 var UserActions = require('../actions/UserActions');
 var ErrorActions = require('../actions/ErrorActions');
 
-var TopBar = require('../TopBar');
+var TopBar = require('../components/TopBar');
 
 function mapStateToProps(state) {
 	return {