diff --git a/client/app/static/admin.jsx b/client/app/components/admin.jsx
similarity index 100%
rename from client/app/static/admin.jsx
rename to client/app/components/admin.jsx
diff --git a/client/app/static/app.jsx b/client/app/components/app.jsx
similarity index 100%
rename from client/app/static/app.jsx
rename to client/app/components/app.jsx
diff --git a/client/app/static/article.jsx b/client/app/components/article.jsx
similarity index 100%
rename from client/app/static/article.jsx
rename to client/app/components/article.jsx
diff --git a/client/app/static/browse_archives.jsx b/client/app/components/browse_archives.jsx
similarity index 100%
rename from client/app/static/browse_archives.jsx
rename to client/app/components/browse_archives.jsx
diff --git a/client/app/static/browse_articles.jsx b/client/app/components/browse_articles.jsx
similarity index 100%
rename from client/app/static/browse_articles.jsx
rename to client/app/components/browse_articles.jsx
diff --git a/client/app/static/browse_topics.jsx b/client/app/components/browse_topics.jsx
similarity index 100%
rename from client/app/static/browse_topics.jsx
rename to client/app/components/browse_topics.jsx
diff --git a/client/app/static/edit.jsx b/client/app/components/edit.jsx
similarity index 100%
rename from client/app/static/edit.jsx
rename to client/app/components/edit.jsx
diff --git a/client/app/static/edit_topics.jsx b/client/app/components/edit_topics.jsx
similarity index 100%
rename from client/app/static/edit_topics.jsx
rename to client/app/components/edit_topics.jsx
diff --git a/client/app/static/edit_users.jsx b/client/app/components/edit_users.jsx
similarity index 100%
rename from client/app/static/edit_users.jsx
rename to client/app/components/edit_users.jsx
diff --git a/client/app/static/history.jsx b/client/app/components/history.jsx
similarity index 100%
rename from client/app/static/history.jsx
rename to client/app/components/history.jsx
diff --git a/client/app/static/home.jsx b/client/app/components/home.jsx
similarity index 100%
rename from client/app/static/home.jsx
rename to client/app/components/home.jsx
diff --git a/client/app/static/loader.jsx b/client/app/components/loader.jsx
similarity index 100%
rename from client/app/static/loader.jsx
rename to client/app/components/loader.jsx
diff --git a/client/app/static/login.jsx b/client/app/components/login.jsx
similarity index 100%
rename from client/app/static/login.jsx
rename to client/app/components/login.jsx
diff --git a/client/app/static/logo_upload.jsx b/client/app/components/logo_upload.jsx
similarity index 100%
rename from client/app/static/logo_upload.jsx
rename to client/app/components/logo_upload.jsx
diff --git a/client/app/static/new.jsx b/client/app/components/new.jsx
similarity index 100%
rename from client/app/static/new.jsx
rename to client/app/components/new.jsx
diff --git a/client/app/static/setup.jsx b/client/app/components/setup.jsx
similarity index 100%
rename from client/app/static/setup.jsx
rename to client/app/components/setup.jsx
diff --git a/client/app/static/simple_article.jsx b/client/app/components/simple_article.jsx
similarity index 100%
rename from client/app/static/simple_article.jsx
rename to client/app/components/simple_article.jsx
diff --git a/client/app/index.jsx b/client/app/index.jsx
index 2407892..4d9de5d 100755
--- a/client/app/index.jsx
+++ b/client/app/index.jsx
@@ -2,17 +2,17 @@ import React from 'react';
 import {render} from 'react-dom';
 import { Router, Route, IndexRoute, IndexRedirect, hashHistory } from 'react-router';
 
-import App from './static/app.jsx';
-import Home from './static/home.jsx';
-import Login from './static/login.jsx';
-import Article from './static/article.jsx';
-import NewArticle from './static/new.jsx';
-import EditArticle from './static/edit.jsx';
-import ArticleHistory from './static/history.jsx';
-import Admin from './static/admin.jsx';
-import Setup from './static/setup.jsx';
-import EditTopic from './static/edit_topics.jsx';
-import EditUser from './static/edit_users.jsx';
+import App from './components/app.jsx';
+import Home from './components/home.jsx';
+import Login from './components/login.jsx';
+import Article from './components/article.jsx';
+import NewArticle from './components/new.jsx';
+import EditArticle from './components/edit.jsx';
+import ArticleHistory from './components/history.jsx';
+import Admin from './components/admin.jsx';
+import Setup from './components/setup.jsx';
+import EditTopic from './components/edit_topics.jsx';
+import EditUser from './components/edit_users.jsx';
 
 render(
   <Router history={hashHistory}>