diff --git a/Rakefile b/Rakefile
index 85bb48a..198c9e9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -99,7 +99,7 @@ task :ydoc do
   require File.join(File.dirname(__FILE__), 'lib', 'mongo')
   out = File.join('ydoc', Mongo::VERSION)
   FileUtils.rm_rf('ydoc')
-  system "yardoc lib/**/*.rb lib/mongo/**/*.rb -e yard_ext.rb -p templates -o #{out} --title MongoRuby-#{Mongo::VERSION}"
+  system "yardoc lib/**/*.rb lib/mongo/**/*.rb -e docs/yard_ext.rb -p docs/templates -o #{out} --title MongoRuby-#{Mongo::VERSION}"
 end
 
 desc "Publish documentation to mongo.rubyforge.org"
diff --git a/templates/default/tags/html/core.erb b/docs/templates/default/tags/html/core.erb
similarity index 100%
rename from templates/default/tags/html/core.erb
rename to docs/templates/default/tags/html/core.erb
diff --git a/templates/default/tags/setup.rb b/docs/templates/default/tags/setup.rb
similarity index 100%
rename from templates/default/tags/setup.rb
rename to docs/templates/default/tags/setup.rb
diff --git a/templates/default/tags/html/see.erb b/templates/default/tags/html/see.erb
deleted file mode 100644
index 8187de8..0000000
--- a/templates/default/tags/html/see.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% if object.has_tag?(:see) %>
-  <h3>See Also:</h3>
-  <ul class="see">
-    <% for tag in object.tags(:see) %>
-      <% if tag.name =~ /^http/ %>
-        <li><%= linkify(tag.name, tag.text || tag.name) %></li>
-      <% else %>
-        <li><%= tag.text %></li>
-      <% end %>
-    <% end %>
-  </ul>
-<% end %>