diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index b19671e2a442615b19c0cced72d39df969e3abf6..5133a8ff5a07d76ac6db9333b5461e863a70c27c 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -2,7 +2,7 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require File.join(Rails.root, "lib", "aspect_stream")
+require File.join(Rails.root, "lib", 'streams', "aspect_stream")
 
 class AspectsController < ApplicationController
   before_filter :authenticate_user!
diff --git a/app/controllers/mentions_controller.rb b/app/controllers/mentions_controller.rb
index 862b901743390ae9770676a81cce7d6b0891cca3..ad09bb58807cb874675ca8d504ef4a276e40af1d 100644
--- a/app/controllers/mentions_controller.rb
+++ b/app/controllers/mentions_controller.rb
@@ -1,4 +1,9 @@
-require File.join(Rails.root, '/lib/mention_stream')
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+require File.join(Rails.root, 'lib','streams', 'mention_stream')
+
 class MentionsController < ApplicationController
   before_filter :authenticate_user!
   before_filter :save_sort_order, :only => :index
diff --git a/app/controllers/tag_followings_controller.rb b/app/controllers/tag_followings_controller.rb
index 7a0865312cbe151e9b8b07560135385e01ea7630..eb530f3495b98b237fa41dfba52eccf6f30995a7 100644
--- a/app/controllers/tag_followings_controller.rb
+++ b/app/controllers/tag_followings_controller.rb
@@ -1,4 +1,9 @@
-require File.join(Rails.root, '/lib/tag_stream')
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+#
+require File.join(Rails.root, 'lib', 'streams', 'tag_stream')
+
 class TagFollowingsController < ApplicationController
   before_filter :authenticate_user!
   before_filter :save_sort_order, :only => :index
diff --git a/lib/aspect_stream.rb b/lib/streams/aspect_stream.rb
similarity index 100%
rename from lib/aspect_stream.rb
rename to lib/streams/aspect_stream.rb
diff --git a/lib/base_stream.rb b/lib/streams/base_stream.rb
similarity index 100%
rename from lib/base_stream.rb
rename to lib/streams/base_stream.rb
diff --git a/lib/mention_stream.rb b/lib/streams/mention_stream.rb
similarity index 98%
rename from lib/mention_stream.rb
rename to lib/streams/mention_stream.rb
index c182d85490194ad41a672505355b97c3a9171218..3eaf00fb138799d44c2c673ad49bde4657fcf3a6 100644
--- a/lib/mention_stream.rb
+++ b/lib/streams/mention_stream.rb
@@ -1,7 +1,7 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-
+require 'base_stream'
 class MentionStream< BaseStream
 
 
diff --git a/lib/tag_stream.rb b/lib/streams/tag_stream.rb
similarity index 98%
rename from lib/tag_stream.rb
rename to lib/streams/tag_stream.rb
index bf185515701500323b098d7c858b0b24e128699a..3e108b43dd349f6fa97cdb266c7ea9913aff09bf 100644
--- a/lib/tag_stream.rb
+++ b/lib/streams/tag_stream.rb
@@ -2,6 +2,7 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+require 'base_stream'
 class TagStream < BaseStream
 
   def link(opts={})
diff --git a/spec/lib/aspect_stream_spec.rb b/spec/lib/streams/aspect_stream_spec.rb
similarity index 100%
rename from spec/lib/aspect_stream_spec.rb
rename to spec/lib/streams/aspect_stream_spec.rb
diff --git a/spec/lib/base_stream_spec.rb b/spec/lib/streams/base_stream_spec.rb
similarity index 100%
rename from spec/lib/base_stream_spec.rb
rename to spec/lib/streams/base_stream_spec.rb
diff --git a/spec/lib/mention_stream_spec.rb b/spec/lib/streams/mention_stream_spec.rb
similarity index 100%
rename from spec/lib/mention_stream_spec.rb
rename to spec/lib/streams/mention_stream_spec.rb
diff --git a/spec/lib/tag_stream_spec.rb b/spec/lib/streams/tag_stream_spec.rb
similarity index 100%
rename from spec/lib/tag_stream_spec.rb
rename to spec/lib/streams/tag_stream_spec.rb