diff --git a/Manifest.txt b/Manifest.txt
index 08b0319..e76f6cc 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -16,16 +16,16 @@ lib/webrat/core/form.rb
 lib/webrat/core/label.rb
 lib/webrat/core/link.rb
 lib/webrat/core/logging.rb
+lib/webrat/core/param_parser.rb
 lib/webrat/core/scope.rb
 lib/webrat/core/select_option.rb
 lib/webrat/core/session.rb
+lib/webrat/core/url_encoded_pair_parser.rb
 lib/webrat/mechanize.rb
 lib/webrat/mechanize/mechanize_session.rb
 lib/webrat/merb.rb
 lib/webrat/merb/indifferent_access.rb
-lib/webrat/merb/param_parser.rb
 lib/webrat/merb/support.rb
-lib/webrat/merb/url_encoded_pair_parser.rb
 lib/webrat/rack/rack_session.rb
 lib/webrat/rails.rb
 lib/webrat/rails/rails_session.rb
diff --git a/lib/webrat/merb/param_parser.rb b/lib/webrat/core/param_parser.rb
similarity index 100%
rename from lib/webrat/merb/param_parser.rb
rename to lib/webrat/core/param_parser.rb
diff --git a/lib/webrat/merb/url_encoded_pair_parser.rb b/lib/webrat/core/url_encoded_pair_parser.rb
similarity index 100%
rename from lib/webrat/merb/url_encoded_pair_parser.rb
rename to lib/webrat/core/url_encoded_pair_parser.rb