diff --git a/kallithea/bin/kallithea_cli_ssh.py b/kallithea/bin/kallithea_cli_ssh.py
--- a/kallithea/bin/kallithea_cli_ssh.py
+++ b/kallithea/bin/kallithea_cli_ssh.py
@@ -22,8 +22,8 @@ import click
 import kallithea
 import kallithea.bin.kallithea_cli_base as cli_base
 from kallithea.lib.utils2 import asbool
-from kallithea.lib.vcs.backends.git.ssh import GitSshHandler
-from kallithea.lib.vcs.backends.hg.ssh import MercurialSshHandler
+from kallithea.lib.vcs.ssh.git import GitSshHandler
+from kallithea.lib.vcs.ssh.hg import MercurialSshHandler
 from kallithea.model.ssh_key import SshKeyModel, SshKeyModelException
 
 
diff --git a/kallithea/lib/vcs/ssh/__init__.py b/kallithea/lib/vcs/ssh/__init__.py
new file mode 100644
diff --git a/kallithea/lib/vcs/backends/ssh.py b/kallithea/lib/vcs/ssh/base.py
rename from kallithea/lib/vcs/backends/ssh.py
rename to kallithea/lib/vcs/ssh/base.py
diff --git a/kallithea/lib/vcs/backends/git/ssh.py b/kallithea/lib/vcs/ssh/git.py
rename from kallithea/lib/vcs/backends/git/ssh.py
rename to kallithea/lib/vcs/ssh/git.py
--- a/kallithea/lib/vcs/backends/git/ssh.py
+++ b/kallithea/lib/vcs/ssh/git.py
@@ -17,13 +17,13 @@ import os
 
 from kallithea.lib.hooks import log_pull_action
 from kallithea.lib.utils import make_ui
-from kallithea.lib.vcs.backends.ssh import BaseSshHandler
+from kallithea.lib.vcs.ssh import base
 
 
 log = logging.getLogger(__name__)
 
 
-class GitSshHandler(BaseSshHandler):
+class GitSshHandler(base.BaseSshHandler):
     vcs_type = 'git'
 
     @classmethod
@@ -60,7 +60,7 @@ class GitSshHandler(BaseSshHandler):
         return None
 
     def __init__(self, repo_name, verb):
-        BaseSshHandler.__init__(self, repo_name)
+        base.BaseSshHandler.__init__(self, repo_name)
         self.verb = verb
 
     def _serve(self):
diff --git a/kallithea/lib/vcs/backends/hg/ssh.py b/kallithea/lib/vcs/ssh/hg.py
rename from kallithea/lib/vcs/backends/hg/ssh.py
rename to kallithea/lib/vcs/ssh/hg.py
--- a/kallithea/lib/vcs/backends/hg/ssh.py
+++ b/kallithea/lib/vcs/ssh/hg.py
@@ -18,14 +18,14 @@ import mercurial.hg
 import mercurial.wireprotoserver
 
 from kallithea.lib.utils import make_ui
-from kallithea.lib.vcs.backends.ssh import BaseSshHandler
+from kallithea.lib.vcs.ssh import base
 from kallithea.lib.vcs.utils import safe_bytes
 
 
 log = logging.getLogger(__name__)
 
 
-class MercurialSshHandler(BaseSshHandler):
+class MercurialSshHandler(base.BaseSshHandler):
     vcs_type = 'hg'
 
     @classmethod