diff --git a/kallithea/config/application.py b/kallithea/config/application.py
--- a/kallithea/config/application.py
+++ b/kallithea/config/application.py
@@ -14,11 +14,11 @@
 """WSGI middleware initialization for the Kallithea application."""
 
 from kallithea.config.app_cfg import base_config
-from kallithea.lib.middleware.https_fixup import HttpsFixup
-from kallithea.lib.middleware.permanent_repo_url import PermanentRepoUrl
-from kallithea.lib.middleware.simplegit import SimpleGit
-from kallithea.lib.middleware.simplehg import SimpleHg
-from kallithea.lib.middleware.wrapper import RequestWrapper
+from kallithea.config.middleware.https_fixup import HttpsFixup
+from kallithea.config.middleware.permanent_repo_url import PermanentRepoUrl
+from kallithea.config.middleware.simplegit import SimpleGit
+from kallithea.config.middleware.simplehg import SimpleHg
+from kallithea.config.middleware.wrapper import RequestWrapper
 from kallithea.lib.utils2 import asbool
 
 
diff --git a/kallithea/lib/middleware/__init__.py b/kallithea/config/middleware/__init__.py
rename from kallithea/lib/middleware/__init__.py
rename to kallithea/config/middleware/__init__.py
diff --git a/kallithea/lib/middleware/appenlight.py b/kallithea/config/middleware/appenlight.py
rename from kallithea/lib/middleware/appenlight.py
rename to kallithea/config/middleware/appenlight.py
diff --git a/kallithea/lib/middleware/https_fixup.py b/kallithea/config/middleware/https_fixup.py
rename from kallithea/lib/middleware/https_fixup.py
rename to kallithea/config/middleware/https_fixup.py
diff --git a/kallithea/lib/middleware/permanent_repo_url.py b/kallithea/config/middleware/permanent_repo_url.py
rename from kallithea/lib/middleware/permanent_repo_url.py
rename to kallithea/config/middleware/permanent_repo_url.py
diff --git a/kallithea/lib/middleware/pygrack.py b/kallithea/config/middleware/pygrack.py
rename from kallithea/lib/middleware/pygrack.py
rename to kallithea/config/middleware/pygrack.py
diff --git a/kallithea/lib/middleware/simplegit.py b/kallithea/config/middleware/simplegit.py
rename from kallithea/lib/middleware/simplegit.py
rename to kallithea/config/middleware/simplegit.py
--- a/kallithea/lib/middleware/simplegit.py
+++ b/kallithea/config/middleware/simplegit.py
@@ -31,9 +31,9 @@ Original author and date, and relevant c
 import logging
 import re
 
+from kallithea.config.middleware.pygrack import make_wsgi_app
 from kallithea.lib.base import BaseVCSController, get_path_info
 from kallithea.lib.hooks import log_pull_action
-from kallithea.lib.middleware.pygrack import make_wsgi_app
 from kallithea.lib.utils import make_ui
 from kallithea.model.db import Repository
 
diff --git a/kallithea/lib/middleware/simplehg.py b/kallithea/config/middleware/simplehg.py
rename from kallithea/lib/middleware/simplehg.py
rename to kallithea/config/middleware/simplehg.py
diff --git a/kallithea/lib/middleware/wrapper.py b/kallithea/config/middleware/wrapper.py
rename from kallithea/lib/middleware/wrapper.py
rename to kallithea/config/middleware/wrapper.py