diff --git a/spec/javascripts/app-spec.js b/spec/javascripts/app/app-spec.js
similarity index 100%
rename from spec/javascripts/app-spec.js
rename to spec/javascripts/app/app-spec.js
diff --git a/spec/javascripts/collections/stream-spec.js b/spec/javascripts/app/collections/stream-spec.js
similarity index 75%
rename from spec/javascripts/collections/stream-spec.js
rename to spec/javascripts/app/collections/stream-spec.js
index 53e1c5734..f633b4f68 100644
--- a/spec/javascripts/collections/stream-spec.js
+++ b/spec/javascripts/app/collections/stream-spec.js
@@ -1,17 +1,17 @@
-describe("Stream", function() {
+describe("App.Models.Stream", function() {
   describe("url", function() {
-    var stream = new BackboneStream(),
+    var stream = new App.Collections.Stream(),
       expectedPath = document.location.pathname + ".json";
     it("returns the json path", function() {
       expect(stream.url()).toEqual(expectedPath);
-    });    
+    });
 
     it("returns the json path with max_time if the collection has models", function() {
-      var post = new Post();
+      var post = new App.Models.Post();
       spyOn(post, "createdAt").andReturn(1234);
 
       stream.add(post);
-      
+
       expect(stream.url()).toEqual(expectedPath + "?max_time=1234");
     });
   });
diff --git a/spec/javascripts/models/post-spec.js b/spec/javascripts/app/models/post-spec.js
similarity index 100%
rename from spec/javascripts/models/post-spec.js
rename to spec/javascripts/app/models/post-spec.js
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index 3062f72a9..3c9a97b5c 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -35,11 +35,12 @@ src_files:
   - public/javascripts/pages/*
   - public/javascripts/helpers/*
   - public/javascripts/widgets/*
- 
-  - public/javascripts/app.js
-  - public/javascripts/models/*
-  - public/javascripts/collections/*
-  - public/javascripts/views/*
+
+  - public/javascripts/app/app.js
+  - public/javascripts/app/router.js
+  - public/javascripts/app/models/*
+  - public/javascripts/app/collections/*
+  - public/javascripts/app/views/*
 
   - public/javascripts/mobile.js
   - public/javascripts/contact-list.js