diff --git a/app/models/notifier.rb b/app/models/notifier.rb
new file mode 100644
index 00000000..941bd642
--- /dev/null
+++ b/app/models/notifier.rb
@@ -0,0 +1,12 @@
+class Notifier < ::ActionMailer::Base
+
+  def confirmation_instructions(record)
+    # TODO: configure email
+  end
+
+  def reset_password_instructions(record)
+    # TODO
+  end
+end
+
+#Devise::Notifier.template_root = File.join(File.dirname(__FILE__), '..', 'views')
diff --git a/lib/devise/views/devise/notifier/confirmation_instructions.html.erb b/app/views/notifier/confirmation_instructions.html.erb
similarity index 100%
rename from lib/devise/views/devise/notifier/confirmation_instructions.html.erb
rename to app/views/notifier/confirmation_instructions.html.erb
diff --git a/lib/devise/views/devise/notifier/reset_password_instructions.html.erb b/app/views/notifier/reset_password_instructions.html.erb
similarity index 100%
rename from lib/devise/views/devise/notifier/reset_password_instructions.html.erb
rename to app/views/notifier/reset_password_instructions.html.erb
diff --git a/lib/devise.rb b/lib/devise.rb
index 734f8d5c..f1c4d8b9 100644
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -20,8 +20,6 @@ require 'devise/models/confirmable'
 require 'devise/models/recoverable'
 require 'devise/models/validatable'
 
-require 'devise/mailers/notifier'
-
 class ActionController::Base
   include Devise::Controllers::Authenticable
 end
diff --git a/lib/devise/mailers/notifier.rb b/lib/devise/mailers/notifier.rb
deleted file mode 100644
index fab75011..00000000
--- a/lib/devise/mailers/notifier.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module Devise
-  class Notifier < ::ActionMailer::Base
-
-    def confirmation_instructions(record)
-      # TODO: configure email
-    end
-
-    def reset_password_instructions(record)
-      # TODO
-    end
-  end
-end
-
-Devise::Notifier.template_root = File.join(File.dirname(__FILE__), '..', 'views')
diff --git a/lib/devise/models/confirmable.rb b/lib/devise/models/confirmable.rb
index aec7719a..1879c253 100644
--- a/lib/devise/models/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -33,7 +33,7 @@ module Devise
       # Send confirmation instructions by email
       #
       def send_confirmation_instructions
-        ::Devise::Notifier.deliver_confirmation_instructions(self)
+        ::Notifier.deliver_confirmation_instructions(self)
       end
 
     module ClassMethods
diff --git a/lib/devise/models/recoverable.rb b/lib/devise/models/recoverable.rb
index ab396fa4..a2439bde 100644
--- a/lib/devise/models/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -25,7 +25,7 @@ module Devise
     #
     def send_reset_password_instructions
       reset_perishable_token!
-      ::Devise::Notifier.deliver_reset_password_instructions(self)
+      ::Notifier.deliver_reset_password_instructions(self)
     end
 
     module ClassMethods