diff --git a/lib/rb/lib/thrift/deprecation.rb b/lib/rb/lib/thrift/deprecation.rb
index 49324c8..2f7d898 100644
--- a/lib/rb/lib/thrift/deprecation.rb
+++ b/lib/rb/lib/thrift/deprecation.rb
@@ -1,7 +1,9 @@
 # provide a backwards-compatible wrapper API and deprecate it
 
-unless Thrift.const_defined?(:DEPRECATION)
-  Thrift::DEPRECATION = true
+module Thrift
+  unless const_defined?(:DEPRECATION)
+    DEPRECATION = true
+  end
 end
 
 class Module
diff --git a/lib/rb/lib/thrift/thrift.rb b/lib/rb/lib/thrift/thrift.rb
index 4cf5fc0..dfad650 100644
--- a/lib/rb/lib/thrift/thrift.rb
+++ b/lib/rb/lib/thrift/thrift.rb
@@ -1,2 +1,8 @@
 # This file kept for backwards compatability
-require File.join(File.dirname(__FILE__), '../thrift')
+# require File.join(File.dirname(__FILE__), '../thrift')
+require File.join(File.dirname(__FILE__), 'deprecation')
+require File.join(File.dirname(__FILE__), 'types')
+require File.join(File.dirname(__FILE__), 'processor')
+require File.join(File.dirname(__FILE__), 'exceptions')
+require File.join(File.dirname(__FILE__), 'client')
+require File.join(File.dirname(__FILE__), 'struct')
diff --git a/test/rb/test_helper.rb b/test/rb/test_helper.rb
index 9294c8f..125f52f 100644
--- a/test/rb/test_helper.rb
+++ b/test/rb/test_helper.rb
@@ -1,4 +1,4 @@
-$:.push File.dirname(__FILE__) + '/gen-rb'
-$:.push File.join(File.dirname(__FILE__), '../../lib/rb/lib')
+$:.unshift File.dirname(__FILE__) + '/gen-rb'
+$:.unshift File.join(File.dirname(__FILE__), '../../lib/rb/lib')
 
 require 'test/unit'