diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 2ba346fc9..96dd3b3e0 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -1,6 +1,6 @@
 class PublicsController < ApplicationController
-  require 'lib/diaspora/diaspora_parser'
-  include Diaspora::DiasporaParser
+  require 'lib/diaspora/parser'
+  include Diaspora::Parser
   include Diaspora::OStatusParser
   
   def hcard
diff --git a/gpg/diaspora-test/pubring.gpg b/gpg/diaspora-test/pubring.gpg
index edac5d95b..cabfdca74 100644
Binary files a/gpg/diaspora-test/pubring.gpg and b/gpg/diaspora-test/pubring.gpg differ
diff --git a/gpg/diaspora-test/trustdb.gpg b/gpg/diaspora-test/trustdb.gpg
index 87e4dbb8a..2e20fb97c 100644
Binary files a/gpg/diaspora-test/trustdb.gpg and b/gpg/diaspora-test/trustdb.gpg differ
diff --git a/lib/diaspora.rb b/lib/diaspora.rb
new file mode 100644
index 000000000..265d0689a
--- /dev/null
+++ b/lib/diaspora.rb
@@ -0,0 +1,9 @@
+module Diaspora
+
+  autoload :Parser
+  autoload :Webhooks
+
+  autoload :OStatusParser
+  autoload :OStatusGenerator
+
+end
diff --git a/lib/diaspora/common.rb b/lib/diaspora/common.rb
deleted file mode 100644
index cda67cacb..000000000
--- a/lib/diaspora/common.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module Diaspora
-  
-end
diff --git a/lib/diaspora/ostatus_generator.rb b/lib/diaspora/ostatus_generator.rb
index 92a2bfa7a..de0cb244f 100644
--- a/lib/diaspora/ostatus_generator.rb
+++ b/lib/diaspora/ostatus_generator.rb
@@ -1,5 +1,5 @@
 module Diaspora
-  module OStatus
+  module OStatusGenerator
     def self.generate(opts= {})
       xml = Generate::headers(opts[:current_url])
       xml << Generate::author
@@ -67,4 +67,4 @@ module Diaspora
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/diaspora/diaspora_parser.rb b/lib/diaspora/parser.rb
similarity index 98%
rename from lib/diaspora/diaspora_parser.rb
rename to lib/diaspora/parser.rb
index f40dc6cc5..07439dbb9 100644
--- a/lib/diaspora/diaspora_parser.rb
+++ b/lib/diaspora/parser.rb
@@ -1,5 +1,5 @@
 module Diaspora
-  module DiasporaParser
+  module Parser
     def parse_owner_from_xml(xml)
       doc = Nokogiri::XML(xml) { |cfg| cfg.noblanks }
       email = doc.xpath("//person/email").text.to_s
diff --git a/spec/lib/diaspora_ostatus_generator_spec.rb b/spec/lib/diaspora_ostatus_generator_spec.rb
index 768b46c9f..c1fadc2e1 100644
--- a/spec/lib/diaspora_ostatus_generator_spec.rb
+++ b/spec/lib/diaspora_ostatus_generator_spec.rb
@@ -2,17 +2,17 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 require 'lib/diaspora/ostatus_generator'
 
-describe Diaspora::OStatus do
+describe Diaspora::OStatusGenerator do
   before do
     @user = Factory.create(:user) 
-    Diaspora::OStatus::OWNER = @user
+    Diaspora::OStatusGenerator::OWNER = @user
   end
 
-  describe Diaspora::OStatus::Generate do
+  describe Diaspora::OStatusGenerator::Generate do
 
     describe "header" do
       it 'should generate an OStatus compliant header' do
-        Diaspora::OStatus::Generate::headers(:current_url => @user.url).should include @user.url
+        Diaspora::OStatusGenerator::Generate::headers(:current_url => @user.url).should include @user.url
       end
     end
 
@@ -22,7 +22,7 @@ describe Diaspora::OStatus do
       end
 
       it "should encode to activity stream xml" do
-        sm_entry = Diaspora::OStatus::generate(:objects => @status_message, :current_url => "http://diaspora.com/")
+        sm_entry = Diaspora::OStatusGenerator::generate(:objects => @status_message, :current_url => "http://diaspora.com/")
         sm_entry.should include(@status_message.message)
         sm_entry.should include('title')
       end
diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb
index d7075fd77..10f02f6ef 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/spec/lib/diaspora_parser_spec.rb
@@ -1,9 +1,9 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 include ApplicationHelper 
-include Diaspora::DiasporaParser
+include Diaspora::Parser
 
-describe Diaspora::DiasporaParser do
+describe Diaspora::Parser do
   before do
     @user = Factory.create(:user, :email => "bob@aol.com")
     @person = Factory.create(:person, :email => "bill@gates.com")
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index 6b2cc8c0e..1502565f0 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 include ApplicationHelper
-include Diaspora::DiasporaParser
+include Diaspora::Parser
 
 describe 'user encryption' do
   before :all do