Moving modules inside respective Models module.

test/models/authenticable_test.rb

@@ -84,8 +84,8 @@ class AuthenticableTest < ActiveSupport::TestCase
   end
 
   test 'should encrypt password using a sha1 hash' do
-    Devise::Authenticable.pepper = 'pepper'
-    Devise::Authenticable.stretches = 1
+    Devise::Models::Authenticable.pepper = 'pepper'
+    Devise::Models::Authenticable.stretches = 1
     user = create_user
     expected_password = ::Digest::SHA1.hexdigest("--#{user.password_salt}--pepper--123456--pepper--")
     assert_equal expected_password, user.encrypted_password

test/rails_app/app/models/user.rb

@@ -1,6 +1,6 @@
 class User < ActiveRecord::Base
-  include Devise::Authenticable
-  include Devise::Confirmable
-  include Devise::Recoverable
-  include Devise::Validatable
+  include Devise::Models::Authenticable
+  include Devise::Models::Confirmable
+  include Devise::Models::Recoverable
+  include Devise::Models::Validatable
 end