diff --git a/config/assets.yml b/config/assets.yml
index 58e17bbd2..284305160 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -15,13 +15,11 @@ javascripts:
     - public/javascripts/vendor/underscore.js
     - public/javascripts/vendor/backbone.js
 
-    - public/javascripts/app.js
-    - public/javascripts/models/*
-    - public/javascripts/collections/*
-    - public/javascripts/views/*
-
-    - public/javascripts/routers/*
-    - public/javascripts/routers/stream/*
+    - public/javascripts/app/app.js
+    - public/javascripts/app/router.js
+    - public/javascripts/app/models/*
+    - public/javascripts/app/collections/*
+    - public/javascripts/app/views/*
 
     - public/javascripts/rails.validations.js
     - public/javascripts/rails.js
diff --git a/public/javascripts/app.js b/public/javascripts/app/app.js
similarity index 68%
rename from public/javascripts/app.js
rename to public/javascripts/app/app.js
index 83f9efb06..38c7b96f5 100644
--- a/public/javascripts/app.js
+++ b/public/javascripts/app/app.js
@@ -1,8 +1,6 @@
 var App = {
   Collections: {},
   Models: {},
-  routers: {},
-  Routers: {},
   Views: {},
 
   user: function(user) {
@@ -12,9 +10,7 @@ var App = {
   },
 
   initialize: function() {
-    _.each(App.Routers, function(Router, name) {
-      App.routers[name] = new Router;
-    });
+    App.router = new App.Router;
 
     Backbone.history.start({pushState: true});
   }
diff --git a/public/javascripts/collections/comments.js b/public/javascripts/app/collections/comments.js
similarity index 100%
rename from public/javascripts/collections/comments.js
rename to public/javascripts/app/collections/comments.js
diff --git a/public/javascripts/collections/stream.js b/public/javascripts/app/collections/stream.js
similarity index 100%
rename from public/javascripts/collections/stream.js
rename to public/javascripts/app/collections/stream.js
diff --git a/public/javascripts/models/comment.js b/public/javascripts/app/models/comment.js
similarity index 100%
rename from public/javascripts/models/comment.js
rename to public/javascripts/app/models/comment.js
diff --git a/public/javascripts/models/post.js b/public/javascripts/app/models/post.js
similarity index 100%
rename from public/javascripts/models/post.js
rename to public/javascripts/app/models/post.js
diff --git a/public/javascripts/app/router.js b/public/javascripts/app/router.js
new file mode 100644
index 000000000..de4120990
--- /dev/null
+++ b/public/javascripts/app/router.js
@@ -0,0 +1,17 @@
+App.Router = Backbone.Router.extend({
+  routes: {
+    "stream": "stream",
+    "comment_stream": "stream",
+    "mentions": "stream",
+    "people/:id": "stream",
+    "tag_followings": "stream",
+    "tags/:name": "stream"
+  },
+
+  stream: function() {
+    App.stream = new App.Views.Stream;
+    $("#main_stream").html(App.stream.el);
+
+    App.stream.loadMore();
+  }
+});
diff --git a/public/javascripts/views/comment-stream.js b/public/javascripts/app/views/comment-stream.js
similarity index 100%
rename from public/javascripts/views/comment-stream.js
rename to public/javascripts/app/views/comment-stream.js
diff --git a/public/javascripts/views/comment.js b/public/javascripts/app/views/comment.js
similarity index 100%
rename from public/javascripts/views/comment.js
rename to public/javascripts/app/views/comment.js
diff --git a/public/javascripts/views/post.js b/public/javascripts/app/views/post.js
similarity index 100%
rename from public/javascripts/views/post.js
rename to public/javascripts/app/views/post.js
diff --git a/public/javascripts/views/stream.js b/public/javascripts/app/views/stream.js
similarity index 100%
rename from public/javascripts/views/stream.js
rename to public/javascripts/app/views/stream.js
diff --git a/public/javascripts/routers/stream.js b/public/javascripts/routers/stream.js
deleted file mode 100644
index 7b1546465..000000000
--- a/public/javascripts/routers/stream.js
+++ /dev/null
@@ -1,12 +0,0 @@
-App.Routers.Stream = Backbone.Router.extend({
-  routes: {
-    "stream": "stream"
-  },
-
-  stream: function() {
-    App.stream = new App.Views.Stream;
-    $("#main_stream").html(App.stream.el);
-
-    App.stream.loadMore();
-  }
-});
diff --git a/public/javascripts/routers/stream/comments.js b/public/javascripts/routers/stream/comments.js
deleted file mode 100644
index 5efbd26c7..000000000
--- a/public/javascripts/routers/stream/comments.js
+++ /dev/null
@@ -1,5 +0,0 @@
-App.Routers.Comments = App.Routers.Stream.extend({
-  routes: {
-    "comment_stream": "stream"
-  }
-});
diff --git a/public/javascripts/routers/stream/mentions.js b/public/javascripts/routers/stream/mentions.js
deleted file mode 100644
index 32ccf50e4..000000000
--- a/public/javascripts/routers/stream/mentions.js
+++ /dev/null
@@ -1,5 +0,0 @@
-App.Routers.Mentions = App.Routers.Stream.extend({
-  routes: {
-    "mentions": "stream"
-  }
-});
diff --git a/public/javascripts/routers/stream/people.js b/public/javascripts/routers/stream/people.js
deleted file mode 100644
index 202593c02..000000000
--- a/public/javascripts/routers/stream/people.js
+++ /dev/null
@@ -1,5 +0,0 @@
-App.Routers.People = App.Routers.Stream.extend({
-  routes: {
-    "people/:id": "stream"
-  }
-});
diff --git a/public/javascripts/routers/stream/tag_followings.js b/public/javascripts/routers/stream/tag_followings.js
deleted file mode 100644
index bd8191b60..000000000
--- a/public/javascripts/routers/stream/tag_followings.js
+++ /dev/null
@@ -1,5 +0,0 @@
-App.Routers.TagFollowings = App.Routers.Stream.extend({
-  routes: {
-    "tag_followings": "stream"
-  }
-});
diff --git a/public/javascripts/routers/stream/tags.js b/public/javascripts/routers/stream/tags.js
deleted file mode 100644
index b00ff8bf3..000000000
--- a/public/javascripts/routers/stream/tags.js
+++ /dev/null
@@ -1,5 +0,0 @@
-App.Routers.Tags = App.Routers.Stream.extend({
-  routes: {
-    "tags/:id": "stream"
-  }
-});