diff --git a/Manifest.txt b/Manifest.txt
index 94b69bb..e8bdedf 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,41 +1,45 @@
-.gitignore
 History.txt
 MIT-LICENSE.txt
 Manifest.txt
 README.txt
 Rakefile
 TODO.txt
-coverage/index.html
-coverage/lib-webrat-field_rb.html
-coverage/lib-webrat-form_rb.html
-coverage/lib-webrat-label_rb.html
-coverage/lib-webrat-link_rb.html
-coverage/lib-webrat-logging_rb.html
-coverage/lib-webrat-page_rb.html
-coverage/lib-webrat-redirect_actions_rb.html
-coverage/lib-webrat-select_option_rb.html
-coverage/lib-webrat_rb.html
 init.rb
 install.rb
 lib/webrat.rb
-lib/webrat/field.rb
-lib/webrat/form.rb
-lib/webrat/label.rb
-lib/webrat/link.rb
-lib/webrat/logging.rb
-lib/webrat/page.rb
-lib/webrat/redirect_actions.rb
-lib/webrat/select_option.rb
-spec/attaches_file_spec.rb
-spec/checks_spec.rb
-spec/chooses_spec.rb
-spec/clicks_button_spec.rb
-spec/clicks_link_spec.rb
-spec/fills_in_spec.rb
+lib/webrat/core.rb
+lib/webrat/core/field.rb
+lib/webrat/core/flunk.rb
+lib/webrat/core/form.rb
+lib/webrat/core/label.rb
+lib/webrat/core/link.rb
+lib/webrat/core/logging.rb
+lib/webrat/core/scope.rb
+lib/webrat/core/select_option.rb
+lib/webrat/core/session.rb
+lib/webrat/mechanize.rb
+lib/webrat/mechanize/mechanize_session.rb
+lib/webrat/rails.rb
+lib/webrat/rails/rails_session.rb
+lib/webrat/rails/redirect_actions.rb
+lib/webrat/rails/session.rb
+lib/webrat/selenium.rb
+lib/webrat/selenium/selenium_session.rb
+spec/api/attaches_file_spec.rb
+spec/api/checks_spec.rb
+spec/api/chooses_spec.rb
+spec/api/clicks_button_spec.rb
+spec/api/clicks_link_spec.rb
+spec/api/fills_in_spec.rb
+spec/api/reloads_spec.rb
+spec/api/save_and_open_spec.rb
+spec/api/selects_spec.rb
+spec/api/visits_spec.rb
+spec/api/within_spec.rb
+spec/fakes/test_session.rb
+spec/integration/rails_spec.rb
 spec/rcov.opts
-spec/reloads_spec.rb
-spec/save_and_open_page_spec.rb
-spec/selects_spec.rb
-spec/spec.opts
 spec/spec_helper.rb
-spec/visits_spec.rb
+spec/webrat/core/logging_spec.rb
+spec/webrat/core/session_spec.rb
+spec/webrat/rails/rails_session_spec.rb
diff --git a/README.txt b/README.txt
index df8ec0e..8467c0c 100644
--- a/README.txt
+++ b/README.txt
@@ -1,11 +1,9 @@
-Webrat
-======
+=== Webrat
 
 - [Code on GitHub](http://github.com/brynary/webrat)
 - [Tickets on Lighthouse](http://webrat.lighthouseapp.com/)
 
-Description
------------
+=== Description
 
 Webrat (_Ruby Acceptance Testing for Web applications_)
 lets you quickly write robust and thorough acceptance tests for a Ruby
@@ -23,8 +21,7 @@ run your tests much faster and more frequently.
 
 Initial development was sponsored by [EastMedia](http://www.eastmedia.com).
 
-Synopsis
---------
+=== Synopsis
 
     def test_sign_up
       visits "/"
@@ -62,8 +59,7 @@ tests to break unnecessarily as your application evolves:
 
 A test written with Webrat can handle these changes to these without any modifications.
 
-Install
--------
+=== Install
 
 To install the latest release:
 
@@ -75,23 +71,20 @@ In your stories/helper.rb:
   
 You could also unpack the gem into vendor/plugins.
 
-Requirements
-------------
+=== Requirements
 
 - Rails >= 1.2.6
 - Hpricot >= 0.6
 - Rails integration tests in Test::Unit _or_
 - RSpec stories (using an RSpec version >= revision 2997)
 
-Authors
--------
+=== Authors
 
 - Maintained by [Bryan Helmkamp](mailto:bryan@brynary.com)
 - Original code written by [Seth Fitzsimmons](mailto:seth@mojodna.net)
 - Many other contributors. See attributions in History.txt
 
-License
--------
+=== License
 
 Copyright (c) 2007 Bryan Helmkamp, Seth Fitzsimmons.
 See MIT-LICENSE.txt in this directory.