diff --git a/rhodecode/apps/admin/views/svn_config.py b/rhodecode/apps/admin/views/svn_config.py
--- a/rhodecode/apps/admin/views/svn_config.py
+++ b/rhodecode/apps/admin/views/svn_config.py
@@ -23,7 +23,7 @@ import logging
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
-from rhodecode.svn_support.utils import generate_mod_dav_svn_config
+from rhodecode.apps.svn_support.utils import generate_mod_dav_svn_config
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)
 
diff --git a/rhodecode/svn_support/__init__.py b/rhodecode/apps/svn_support/__init__.py
rename from rhodecode/svn_support/__init__.py
rename to rhodecode/apps/svn_support/__init__.py
diff --git a/rhodecode/svn_support/config_keys.py b/rhodecode/apps/svn_support/config_keys.py
rename from rhodecode/svn_support/config_keys.py
rename to rhodecode/apps/svn_support/config_keys.py
diff --git a/rhodecode/svn_support/events.py b/rhodecode/apps/svn_support/events.py
rename from rhodecode/svn_support/events.py
rename to rhodecode/apps/svn_support/events.py
diff --git a/rhodecode/svn_support/subscribers.py b/rhodecode/apps/svn_support/subscribers.py
rename from rhodecode/svn_support/subscribers.py
rename to rhodecode/apps/svn_support/subscribers.py
diff --git a/rhodecode/svn_support/templates/mod-dav-svn.conf.mako b/rhodecode/apps/svn_support/templates/mod-dav-svn.conf.mako
rename from rhodecode/svn_support/templates/mod-dav-svn.conf.mako
rename to rhodecode/apps/svn_support/templates/mod-dav-svn.conf.mako
diff --git a/rhodecode/svn_support/tests/test_mod_dav_svn_config.py b/rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py
rename from rhodecode/svn_support/tests/test_mod_dav_svn_config.py
rename to rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py
--- a/rhodecode/svn_support/tests/test_mod_dav_svn_config.py
+++ b/rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py
@@ -25,7 +25,7 @@ import re
 
 from pyramid import testing
 
-from rhodecode.svn_support import utils
+from rhodecode.apps.svn_support import utils
 
 
 class TestModDavSvnConfig(object):
diff --git a/rhodecode/svn_support/utils.py b/rhodecode/apps/svn_support/utils.py
rename from rhodecode/svn_support/utils.py
rename to rhodecode/apps/svn_support/utils.py
--- a/rhodecode/svn_support/utils.py
+++ b/rhodecode/apps/svn_support/utils.py
@@ -81,7 +81,7 @@ def _render_mod_dav_svn_config(
     }
 
     # Render the configuration template to string.
-    template = 'rhodecode:svn_support/templates/mod-dav-svn.conf.mako'
+    template = 'rhodecode:apps/svn_support/templates/mod-dav-svn.conf.mako'
     return render(template, context)
 
 
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -287,10 +287,10 @@ def includeme(config):
     config.include('rhodecode.apps.login')
     config.include('rhodecode.apps.user_profile')
     config.include('rhodecode.apps.my_account')
+    config.include('rhodecode.apps.svn_support')
 
     config.include('rhodecode.tweens')
     config.include('rhodecode.api')
-    config.include('rhodecode.svn_support')
 
     config.add_route(
         'rhodecode_support', 'https://rhodecode.com/help/', static=True)
diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py
--- a/rhodecode/controllers/admin/settings.py
+++ b/rhodecode/controllers/admin/settings.py
@@ -37,6 +37,7 @@ from webob.exc import HTTPBadRequest
 
 import rhodecode
 from rhodecode.apps.admin.navigation import navigation_list
+from rhodecode.apps.svn_support.config_keys import generate_config
 from rhodecode.lib import auth
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
@@ -62,7 +63,6 @@ from rhodecode.model.settings import (
     SettingsModel)
 
 from rhodecode.model.supervisor import SupervisorModel, SUPERVISOR_MASTER
-from rhodecode.svn_support.config_keys import generate_config
 
 
 log = logging.getLogger(__name__)