diff --git a/lib/devise.rb b/lib/devise.rb
index e4c2ec64..0ab351e6 100644
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -1,4 +1,8 @@
 module Devise
+  autoload :Schema, 'devise/schema'
+  autoload :Mapping, 'devise/mapping'
+  autoload :FailureApp, 'devise/failure_app'
+
   ALL = [:authenticatable, :confirmable, :recoverable, :rememberable,
          :timeoutable, :trackable, :validatable].freeze
 
@@ -144,6 +148,8 @@ end
 # Set the default_scope to nil, so it's overwritten when the first route is declared.
 Warden::Manager.default_scope = nil
 
+require 'devise/controllers'
+require 'devise/encryptors'
 require 'devise/strategies/base'
 require 'devise/serializers/base'
 require 'devise/rails'
diff --git a/lib/devise/controllers.rb b/lib/devise/controllers.rb
new file mode 100644
index 00000000..fe80220e
--- /dev/null
+++ b/lib/devise/controllers.rb
@@ -0,0 +1,7 @@
+module Devise
+  module Controllers
+    autoload :Filters, 'devise/controllers/filters' 
+    autoload :Helpers, 'devise/controllers/helpers' 
+    autoload :UrlHelpers, 'devise/controllers/url_helpers'     
+  end
+end
\ No newline at end of file
diff --git a/lib/devise/encryptors.rb b/lib/devise/encryptors.rb
new file mode 100644
index 00000000..737817bf
--- /dev/null
+++ b/lib/devise/encryptors.rb
@@ -0,0 +1,9 @@
+module Devise
+  module Encryptors
+    autoload :AuthlogicSha512, 'devise/encryptors/authlogic_sha512' 
+    autoload :AuthlogicSha1, 'devise/encryptors/authlogic_sha1' 
+    autoload :RestfulAuthenticationSha1, 'devise/encryptors/restful_authentication_sha1' 
+    autoload :Sha512, 'devise/encryptors/sha512' 
+    autoload :Sha1, 'devise/encryptors/sha1' 
+  end
+end
\ No newline at end of file