diff --git a/lib/devise_facebook_open_graph.rb b/lib/devise_facebook_open_graph.rb
index dc3ba72..34f5784 100644
--- a/lib/devise_facebook_open_graph.rb
+++ b/lib/devise_facebook_open_graph.rb
@@ -1,8 +1,25 @@
 # encoding: utf-8
 require 'devise'
 
-require 'devise_facebook_open_graph/facebook/config'
-require 'devise_facebook_open_graph/rails/view_helpers'
+
+require 'devise_facebook_open_graph/rails'
+
+module DeviseFacebookOpenGraph
+  module Facebook
+    extend ActiveSupport::Autoload
+
+    autoload :Config
+  end
+
+  module Rails
+    extend ActiveSupport::Autoload
+
+    autoload :ViewHelpers
+    autoload :ControllerHelpers
+  end
+end
+
+
 
 require 'devise_facebook_open_graph/strategy'
 require 'devise_facebook_open_graph/schema'
diff --git a/lib/devise_facebook_open_graph/rails.rb b/lib/devise_facebook_open_graph/rails.rb
new file mode 100644
index 0000000..7504f58
--- /dev/null
+++ b/lib/devise_facebook_open_graph/rails.rb
@@ -0,0 +1,2 @@
+ActiveSupport.on_load(:action_view) { include DeviseFacebookOpenGraph::Rails::ViewHelpers }
+ActiveSupport.on_load(:action_controller) { include DeviseFacebookOpenGraph::Rails::ControllerHelpers }
diff --git a/lib/devise_facebook_open_graph/rails/controller_helpers.rb b/lib/devise_facebook_open_graph/rails/controller_helpers.rb
new file mode 100644
index 0000000..fa47357
--- /dev/null
+++ b/lib/devise_facebook_open_graph/rails/controller_helpers.rb
@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+module DeviseFacebookOpenGraph
+  module Rails
+    module ControllerHelpers
+    end
+  end
+end
diff --git a/lib/devise_facebook_open_graph/rails/view_helpers.rb b/lib/devise_facebook_open_graph/rails/view_helpers.rb
index 637f99e..40f2aa7 100644
--- a/lib/devise_facebook_open_graph/rails/view_helpers.rb
+++ b/lib/devise_facebook_open_graph/rails/view_helpers.rb
@@ -35,5 +35,3 @@ def facebook_init_javascript_sdk
     end
   end
 end
-
-::ActionView::Base.send :include, DeviseFacebookOpenGraph::Rails::ViewHelpers