diff --git a/lib/devise.rb b/lib/devise.rb
index c6f4805b..d59f5b62 100644
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -1,8 +1,7 @@
-require 'devise/authenticable'
-require 'devise/perishable_token'
-require 'devise/confirmable'
-require 'devise/recoverable'
-require 'devise/validatable'
-
-require 'devise/notifier'
+require 'devise/models/authenticable'
+require 'devise/models/perishable'
+require 'devise/models/confirmable'
+require 'devise/models/recoverable'
+require 'devise/models/validatable'
 
+require 'devise/mailers/notifier'
diff --git a/lib/devise/notifier.rb b/lib/devise/mailers/notifier.rb
similarity index 99%
rename from lib/devise/notifier.rb
rename to lib/devise/mailers/notifier.rb
index b9bb83e2..fab75011 100644
--- a/lib/devise/notifier.rb
+++ b/lib/devise/mailers/notifier.rb
@@ -12,4 +12,3 @@ module Devise
 end
 
 Devise::Notifier.template_root = File.join(File.dirname(__FILE__), '..', 'views')
-
diff --git a/lib/devise/authenticable.rb b/lib/devise/models/authenticable.rb
similarity index 100%
rename from lib/devise/authenticable.rb
rename to lib/devise/models/authenticable.rb
diff --git a/lib/devise/confirmable.rb b/lib/devise/models/confirmable.rb
similarity index 97%
rename from lib/devise/confirmable.rb
rename to lib/devise/models/confirmable.rb
index 5395429b..2faeb16b 100644
--- a/lib/devise/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -4,7 +4,7 @@ module Devise
     def self.included(base)
       base.class_eval do
         extend ClassMethods
-        include ::Devise::PerishableToken
+        include ::Devise::Perishable
 
         after_create  :send_confirmation_instructions
       end
@@ -62,4 +62,3 @@ module Devise
     end
   end
 end
-
diff --git a/lib/devise/perishable_token.rb b/lib/devise/models/perishable.rb
similarity index 95%
rename from lib/devise/perishable_token.rb
rename to lib/devise/models/perishable.rb
index 55eb3998..2697372a 100644
--- a/lib/devise/perishable_token.rb
+++ b/lib/devise/models/perishable.rb
@@ -1,5 +1,5 @@
 module Devise
-  module PerishableToken
+  module Perishable
 
     def self.included(base)
       base.class_eval do
@@ -22,4 +22,3 @@ module Devise
     end
   end
 end
-
diff --git a/lib/devise/recoverable.rb b/lib/devise/models/recoverable.rb
similarity index 97%
rename from lib/devise/recoverable.rb
rename to lib/devise/models/recoverable.rb
index 96b993d2..ab396fa4 100644
--- a/lib/devise/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -4,7 +4,7 @@ module Devise
     def self.included(base)
       base.class_eval do
         extend ClassMethods
-        include ::Devise::PerishableToken
+        include ::Devise::Perishable
       end
     end
 
@@ -61,4 +61,3 @@ module Devise
     end
   end
 end
-
diff --git a/lib/devise/validatable.rb b/lib/devise/models/validatable.rb
similarity index 100%
rename from lib/devise/validatable.rb
rename to lib/devise/models/validatable.rb
diff --git a/lib/views/devise/notifier/confirmation_instructions.html.erb b/lib/devise/views/devise/notifier/confirmation_instructions.html.erb
similarity index 100%
rename from lib/views/devise/notifier/confirmation_instructions.html.erb
rename to lib/devise/views/devise/notifier/confirmation_instructions.html.erb
diff --git a/lib/views/devise/notifier/reset_password_instructions.html.erb b/lib/devise/views/devise/notifier/reset_password_instructions.html.erb
similarity index 100%
rename from lib/views/devise/notifier/reset_password_instructions.html.erb
rename to lib/devise/views/devise/notifier/reset_password_instructions.html.erb
diff --git a/test/notifier_test.rb b/test/mailers/notifier_test.rb
similarity index 100%
rename from test/notifier_test.rb
rename to test/mailers/notifier_test.rb
diff --git a/test/authenticable_test.rb b/test/models/authenticable_test.rb
similarity index 100%
rename from test/authenticable_test.rb
rename to test/models/authenticable_test.rb
diff --git a/test/confirmable_test.rb b/test/models/confirmable_test.rb
similarity index 100%
rename from test/confirmable_test.rb
rename to test/models/confirmable_test.rb
diff --git a/test/perishable_token_test.rb b/test/models/perishable_test.rb
similarity index 91%
rename from test/perishable_token_test.rb
rename to test/models/perishable_test.rb
index d47cca32..992bca93 100644
--- a/test/perishable_token_test.rb
+++ b/test/models/perishable_test.rb
@@ -1,9 +1,9 @@
 require 'test_helper'
 
-class PerishableTokenTest < ActiveSupport::TestCase
+class PerishableTest < ActiveSupport::TestCase
 
   def setup
-    User.send :include, ::Devise::PerishableToken unless User.included_modules.include?(::Devise::PerishableToken)
+    User.send :include, ::Devise::Perishable unless User.included_modules.include?(::Devise::Perishable)
   end
 
   test 'should not have perishable token accessible' do
@@ -62,4 +62,3 @@ class PerishableTokenTest < ActiveSupport::TestCase
     assert_equal expected_token, user.perishable_token
   end
 end
-
diff --git a/test/recoverable_test.rb b/test/models/recoverable_test.rb
similarity index 100%
rename from test/recoverable_test.rb
rename to test/models/recoverable_test.rb
diff --git a/test/validatable_test.rb b/test/models/validatable_test.rb
similarity index 100%
rename from test/validatable_test.rb
rename to test/models/validatable_test.rb