diff --git a/rhodecode/login/__init__.py b/rhodecode/apps/login/__init__.py
rename from rhodecode/login/__init__.py
rename to rhodecode/apps/login/__init__.py
diff --git a/rhodecode/login/tests/__init__.py b/rhodecode/apps/login/tests/__init__.py
rename from rhodecode/login/tests/__init__.py
rename to rhodecode/apps/login/tests/__init__.py
diff --git a/rhodecode/login/tests/test_register_captcha.py b/rhodecode/apps/login/tests/test_register_captcha.py
rename from rhodecode/login/tests/test_register_captcha.py
rename to rhodecode/apps/login/tests/test_register_captcha.py
--- a/rhodecode/login/tests/test_register_captcha.py
+++ b/rhodecode/apps/login/tests/test_register_captcha.py
@@ -22,8 +22,8 @@
 import mock
 import pytest
 
+from rhodecode.apps.login.views import LoginView, CaptchaData
 from rhodecode.config.routing import ADMIN_PREFIX
-from rhodecode.login.views import LoginView, CaptchaData
 from rhodecode.model.settings import SettingsModel
 from rhodecode.tests.utils import AssertResponse
 
@@ -92,7 +92,7 @@ class TestRegisterCaptcha(object):
             assertr.no_element_exists('#recaptcha_field')
 
     @pytest.mark.parametrize('valid', [False, True])
-    @mock.patch('rhodecode.login.views.submit')
+    @mock.patch('rhodecode.apps.login.views.submit')
     @mock.patch.object(LoginView, '_get_captcha_data')
     def test_register_with_active_captcha(
             self, m_get_captcha_data, m_submit, valid, app, csrf_token):
diff --git a/rhodecode/login/views.py b/rhodecode/apps/login/views.py
rename from rhodecode/login/views.py
rename to rhodecode/apps/login/views.py
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -281,7 +281,7 @@ def includeme(config):
     config.include('rhodecode.admin')
     config.include('rhodecode.authentication')
     config.include('rhodecode.integrations')
-    config.include('rhodecode.login')
+    config.include('rhodecode.apps.login')
     config.include('rhodecode.tweens')
     config.include('rhodecode.api')
     config.include('rhodecode.svn_support')