diff --git a/pontos/git/__init__.py b/pontos/git/__init__.py
index a8e888953..7b8e0bf07 100644
--- a/pontos/git/__init__.py
+++ b/pontos/git/__init__.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
-from .git import (
+from ._git import (
     DEFAULT_TAG_SORT_SUFFIX,
     ConfigScope,
     Git,
diff --git a/pontos/git/git.py b/pontos/git/_git.py
similarity index 100%
rename from pontos/git/git.py
rename to pontos/git/_git.py
diff --git a/pontos/release/sign.py b/pontos/release/sign.py
index f4ab287f7..25a152f38 100644
--- a/pontos/release/sign.py
+++ b/pontos/release/sign.py
@@ -18,7 +18,7 @@
 from rich.progress import TextColumn
 
 from pontos.errors import PontosError
-from pontos.git.git import GitError
+from pontos.git import GitError
 from pontos.github.api import GitHubAsyncRESTApi
 from pontos.helper import AsyncDownloadProgressIterable
 from pontos.release.command import AsyncCommand
diff --git a/pontos/testing/__init__.py b/pontos/testing/__init__.py
index 4ebc3ea67..49cf20c29 100644
--- a/pontos/testing/__init__.py
+++ b/pontos/testing/__init__.py
@@ -13,7 +13,7 @@
 from pathlib import Path
 from typing import Any, AsyncIterator, Awaitable, Generator, Iterable, Optional
 
-from pontos.git.git import exec_git
+from pontos.git._git import exec_git
 from pontos.helper import add_sys_path, ensure_unload_module, unload_module
 
 __all__ = (
diff --git a/pontos/version/helper.py b/pontos/version/helper.py
index a596d4625..d445e0b59 100644
--- a/pontos/version/helper.py
+++ b/pontos/version/helper.py
@@ -5,8 +5,7 @@
 
 from typing import Iterator, Optional
 
-from pontos.git import Git, TagSort
-from pontos.git.git import DEFAULT_TAG_SORT_SUFFIX
+from pontos.git import DEFAULT_TAG_SORT_SUFFIX, Git, TagSort
 from pontos.version.errors import VersionError
 
 from .version import ParseVersionFuncType, Version
diff --git a/tests/git/test_git.py b/tests/git/test_git.py
index f5d4856ba..e20037e07 100644
--- a/tests/git/test_git.py
+++ b/tests/git/test_git.py
@@ -7,27 +7,27 @@
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
-from pontos.git import Git
-from pontos.git.git import (
+from pontos.git import (
     DEFAULT_TAG_SORT_SUFFIX,
     ConfigScope,
+    Git,
     GitError,
     MergeStrategy,
+    Status,
     TagSort,
 )
-from pontos.git.status import Status
 from pontos.testing import temp_directory, temp_git_repository
 
 
 class GitTestCase(unittest.TestCase):
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_exec(self, exec_git_mock):
         git = Git()
         git.exec("foo", "bar", "baz")
 
         exec_git_mock.assert_called_once_with("foo", "bar", "baz", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_clone(self, exec_git_mock):
         git = Git()
         git.clone("http://foo/foo.git", Path("/bar"))
@@ -36,7 +36,7 @@ def test_clone(self, exec_git_mock):
             "clone", "http://foo/foo.git", "/bar", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_clone_with_remote(self, exec_git_mock):
         git = Git()
         git.clone("http://foo/foo.git", Path("/bar"), remote="foo")
@@ -45,7 +45,7 @@ def test_clone_with_remote(self, exec_git_mock):
             "clone", "-o", "foo", "http://foo/foo.git", "/bar", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_clone_with_branch(self, exec_git_mock):
         git = Git()
         git.clone("http://foo/foo.git", Path("/bar"), branch="foo")
@@ -54,7 +54,7 @@ def test_clone_with_branch(self, exec_git_mock):
             "clone", "-b", "foo", "http://foo/foo.git", "/bar", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_clone_with_depth(self, exec_git_mock):
         git = Git()
         git.clone("http://foo/foo.git", Path("/bar"), depth=1)
@@ -63,14 +63,14 @@ def test_clone_with_depth(self, exec_git_mock):
             "clone", "--depth", "1", "http://foo/foo.git", "/bar", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_init(self, exec_git_mock):
         git = Git()
         git.init()
 
         exec_git_mock.assert_called_once_with("init", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_init_bare(self, exec_git_mock):
         git = Git()
         git.init(bare=True)
@@ -87,14 +87,14 @@ def test_cwd(self):
 
         self.assertEqual(git.cwd, new_cwd.absolute())
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_create_branch(self, exec_git_mock):
         git = Git()
         git.create_branch("foo")
 
         exec_git_mock.assert_called_once_with("checkout", "-b", "foo", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_create_branch_with_starting_point(self, exec_git_mock):
         git = Git()
         git.create_branch("foo", start_point="bar")
@@ -103,21 +103,21 @@ def test_create_branch_with_starting_point(self, exec_git_mock):
             "checkout", "-b", "foo", "bar", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_rebase(self, exec_git_mock):
         git = Git()
         git.rebase("foo")
 
         exec_git_mock.assert_called_once_with("rebase", "foo", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_rebase_with_head(self, exec_git_mock):
         git = Git()
         git.rebase("foo", head="bar")
 
         exec_git_mock.assert_called_once_with("rebase", "foo", "bar", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_rebase_with_head_and_onto(self, exec_git_mock):
         git = Git()
         git.rebase("foo", head="bar", onto="staging")
@@ -126,7 +126,7 @@ def test_rebase_with_head_and_onto(self, exec_git_mock):
             "rebase", "--onto", "staging", "foo", "bar", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_rebase_with_octopus_strategy(self, exec_git_mock):
         git = Git()
         git.rebase("foo", strategy=MergeStrategy.OCTOPUS)
@@ -135,7 +135,7 @@ def test_rebase_with_octopus_strategy(self, exec_git_mock):
             "rebase", "--strategy", "octopus", "foo", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_rebase_with_ort_ours_strategy(self, exec_git_mock):
         git = Git()
         git.rebase("foo", strategy=MergeStrategy.ORT_OURS)
@@ -144,70 +144,70 @@ def test_rebase_with_ort_ours_strategy(self, exec_git_mock):
             "rebase", "--strategy", "ort", "-X", "ours", "foo", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_push(self, exec_git_mock):
         git = Git()
         git.push()
 
         exec_git_mock.assert_called_once_with("push", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_push_with_remote(self, exec_git_mock):
         git = Git()
         git.push(remote="foo")
 
         exec_git_mock.assert_called_once_with("push", "foo", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_push_with_remote_and_branch(self, exec_git_mock):
         git = Git()
         git.push(remote="foo", branch="bar")
 
         exec_git_mock.assert_called_once_with("push", "foo", "bar", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_push_with_follow_tags(self, exec_git_mock):
         git = Git()
         git.push(follow_tags=True)
 
         exec_git_mock.assert_called_once_with("push", "--follow-tags", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_push_with_follow_tags_false(self, exec_git_mock):
         git = Git()
         git.push(follow_tags=False)
 
         exec_git_mock.assert_called_once_with("push", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_push_with_force(self, exec_git_mock):
         git = Git()
         git.push(force=True)
 
         exec_git_mock.assert_called_once_with("push", "--force", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_push_with_force_false(self, exec_git_mock):
         git = Git()
         git.push(force=False)
 
         exec_git_mock.assert_called_once_with("push", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_config_get(self, exec_git_mock):
         git = Git()
         git.config("foo")
 
         exec_git_mock.assert_called_once_with("config", "foo", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_config_set(self, exec_git_mock):
         git = Git()
         git.config("foo", "bar")
 
         exec_git_mock.assert_called_once_with("config", "foo", "bar", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_config_get_local_scope(self, exec_git_mock):
         git = Git()
         git.config("foo", scope=ConfigScope.LOCAL)
@@ -216,7 +216,7 @@ def test_config_get_local_scope(self, exec_git_mock):
             "config", "--local", "foo", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_config_get_system_scope(self, exec_git_mock):
         git = Git()
         git.config("foo", scope=ConfigScope.SYSTEM)
@@ -225,7 +225,7 @@ def test_config_get_system_scope(self, exec_git_mock):
             "config", "--system", "foo", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_config_get_global_scope(self, exec_git_mock):
         git = Git()
         git.config("foo", scope=ConfigScope.GLOBAL)
@@ -234,7 +234,7 @@ def test_config_get_global_scope(self, exec_git_mock):
             "config", "--global", "foo", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_config_get_worktree_scope(self, exec_git_mock):
         git = Git()
         git.config("foo", scope=ConfigScope.WORKTREE)
@@ -243,7 +243,7 @@ def test_config_get_worktree_scope(self, exec_git_mock):
             "config", "--worktree", "foo", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_cherry_pick(self, exec_git_mock):
         git = Git()
         git.cherry_pick(["foo", "bar"])
@@ -252,14 +252,14 @@ def test_cherry_pick(self, exec_git_mock):
             "cherry-pick", "foo", "bar", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_cherry_pick_single_commit(self, exec_git_mock):
         git = Git()
         git.cherry_pick("foo")
 
         exec_git_mock.assert_called_once_with("cherry-pick", "foo", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_list_tags(self, exec_git_mock):
         exec_git_mock.return_value = "v1.0\nv2.0\nv2.1\n"
         git = Git()
@@ -272,7 +272,7 @@ def test_list_tags(self, exec_git_mock):
         self.assertEqual(tags[1], "v2.0")
         self.assertEqual(tags[2], "v2.1")
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_list_tags_with_version_sort(self, exec_git_mock):
         exec_git_mock.return_value = "v1.0\nv2.0\nv2.1\n"
         git = Git()
@@ -290,7 +290,7 @@ def test_list_tags_with_version_sort(self, exec_git_mock):
         self.assertEqual(tags[1], "v2.0")
         self.assertEqual(tags[2], "v2.1")
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_list_tags_with_version_suffix_sort(self, exec_git_mock):
         exec_git_mock.return_value = "v1.0\nv2.0\nv2.1\n"
         git = Git()
@@ -322,7 +322,7 @@ def test_list_tags_with_version_suffix_sort(self, exec_git_mock):
         self.assertEqual(tags[1], "v2.0")
         self.assertEqual(tags[2], "v2.1")
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_list_tags_with_tag_name(self, exec_git_mock):
         exec_git_mock.return_value = "v2.0\nv2.1\n"
         git = Git()
@@ -334,21 +334,21 @@ def test_list_tags_with_tag_name(self, exec_git_mock):
         self.assertEqual(tags[0], "v2.0")
         self.assertEqual(tags[1], "v2.1")
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_add_single_file(self, exec_git_mock):
         git = Git()
         git.add("foo")
 
         exec_git_mock.assert_called_once_with("add", "foo", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_add(self, exec_git_mock):
         git = Git()
         git.add(["foo", "bar"])
 
         exec_git_mock.assert_called_once_with("add", "foo", "bar", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_commit(self, exec_git_mock):
         git = Git()
         git.commit("Add foo")
@@ -357,7 +357,7 @@ def test_commit(self, exec_git_mock):
             "commit", "-m", "Add foo", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_commit_with_signing_key(self, exec_git_mock):
         git = Git()
         git.commit(
@@ -373,7 +373,7 @@ def test_commit_with_signing_key(self, exec_git_mock):
             cwd=None,
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_commit_without_verify(self, exec_git_mock):
         git = Git()
         git.commit("Add foo", verify=False)
@@ -382,7 +382,7 @@ def test_commit_without_verify(self, exec_git_mock):
             "commit", "--no-verify", "-m", "Add foo", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_commit_without_gpg_sign(self, exec_git_mock):
         git = Git()
         git.commit("Add foo", gpg_sign=False)
@@ -391,14 +391,14 @@ def test_commit_without_gpg_sign(self, exec_git_mock):
             "commit", "--no-gpg-sign", "-m", "Add foo", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_tag(self, exec_git_mock):
         git = Git()
         git.tag(tag="test")
 
         exec_git_mock.assert_called_once_with("tag", "test", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_tag_with_gpg_key(self, exec_git_mock):
         git = Git()
         git.tag("test", gpg_key_id="0x123")
@@ -407,7 +407,7 @@ def test_tag_with_gpg_key(self, exec_git_mock):
             "tag", "-u", "0x123", "test", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_tag_with_message(self, exec_git_mock):
         git = Git()
         git.tag("test", message="Tag for 123 release")
@@ -416,7 +416,7 @@ def test_tag_with_message(self, exec_git_mock):
             "tag", "-m", "Tag for 123 release", "test", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_tag_with_force(self, exec_git_mock):
         git = Git()
         git.tag("test", force=True)
@@ -425,7 +425,7 @@ def test_tag_with_force(self, exec_git_mock):
             "tag", "--force", "test", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_tag_without_sign(self, exec_git_mock):
         git = Git()
         git.tag("test", sign=False)
@@ -434,21 +434,21 @@ def test_tag_without_sign(self, exec_git_mock):
             "tag", "--no-sign", "test", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_fetch(self, exec_git_mock):
         git = Git()
         git.fetch()
 
         exec_git_mock.assert_called_once_with("fetch", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_fetch_with_remote(self, exec_git_mock):
         git = Git()
         git.fetch("foo")
 
         exec_git_mock.assert_called_once_with("fetch", "foo", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_fetch_with_remote_and_refspec(self, exec_git_mock):
         git = Git()
         git.fetch("foo", "my-branch")
@@ -457,14 +457,14 @@ def test_fetch_with_remote_and_refspec(self, exec_git_mock):
             "fetch", "foo", "my-branch", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_fetch_with_verbose(self, exec_git_mock):
         git = Git()
         git.fetch(verbose=True)
 
         exec_git_mock.assert_called_once_with("fetch", "-v", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_add_remote(self, exec_git_mock):
         git = Git()
         git.add_remote("foo", "https://foo.bar/foo.git")
@@ -473,14 +473,14 @@ def test_add_remote(self, exec_git_mock):
             "remote", "add", "foo", "https://foo.bar/foo.git", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_checkout(self, exec_git_mock):
         git = Git()
         git.checkout("foo")
 
         exec_git_mock.assert_called_once_with("checkout", "foo", cwd=None)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_checkout_with_start_point(self, exec_git_mock):
         git = Git()
         git.checkout("foo", start_point="bar")
@@ -489,7 +489,7 @@ def test_checkout_with_start_point(self, exec_git_mock):
             "checkout", "-b", "foo", "bar", cwd=None
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_remote_url(self, exec_git_mock):
         url = "git@github.com:foo/foo.git"
         exec_git_mock.return_value = url
@@ -503,7 +503,7 @@ def test_remote_url(self, exec_git_mock):
 
         self.assertEqual(remote, url)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_remote_url_with_default(self, exec_git_mock):
         url = "git@github.com:foo/foo.git"
         exec_git_mock.return_value = url
@@ -517,7 +517,7 @@ def test_remote_url_with_default(self, exec_git_mock):
 
         self.assertEqual(remote, url)
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_log(self, exec_git_mock):
         # pylint: disable=line-too-long
         exec_git_mock.return_value = """commit 68c6c3785bbb049df63dc51f8b5b709eb19f8517
@@ -545,7 +545,7 @@ def test_log(self, exec_git_mock):
             logs[6], "commit 464f24d43d7293091b168c6b37ee37978a650958"
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_log_with_oneline(self, exec_git_mock):
         exec_git_mock.return_value = """50f9963 Add CircleCI config for pontos
 9a8feaa Rename to pontos only
@@ -562,7 +562,7 @@ def test_log_with_oneline(self, exec_git_mock):
         self.assertEqual(logs[0], "50f9963 Add CircleCI config for pontos")
         self.assertEqual(logs[5], "464f24d Initial commit")
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_log_with_format(self, exec_git_mock):
         exec_git_mock.return_value = """Add CircleCI config for pontos
 Rename to pontos only
@@ -581,7 +581,7 @@ def test_log_with_format(self, exec_git_mock):
         self.assertEqual(logs[0], "Add CircleCI config for pontos")
         self.assertEqual(logs[5], "Initial commit")
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_rev_list(self, exec_git_mock):
         git = Git()
         git.rev_list("foo", "bar", "baz", max_parents=123, abbrev_commit=True)
@@ -596,7 +596,7 @@ def test_rev_list(self, exec_git_mock):
             cwd=None,
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_move(self, exec_git_mock):
         git = Git()
         git.move("foo", "bar")
@@ -608,7 +608,7 @@ def test_move(self, exec_git_mock):
             cwd=None,
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_remove(self, exec_git_mock):
         git = Git()
         git.remove("foo")
@@ -619,7 +619,7 @@ def test_remove(self, exec_git_mock):
             cwd=None,
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_status(self, exec_git_mock):
         git = Git()
         git.status()
@@ -632,7 +632,7 @@ def test_status(self, exec_git_mock):
             cwd=None,
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_status_with_files(self, exec_git_mock):
         git = Git()
         git.status(["foo", "bar", "baz"])
@@ -649,7 +649,7 @@ def test_status_with_files(self, exec_git_mock):
             cwd=None,
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_version(self, exec_git_mock: MagicMock):
         exec_git_mock.return_value = "git version 1.2.3"
         git = Git()
@@ -660,7 +660,7 @@ def test_version_runs(self):
         git = Git()
         git.version
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_show_with_online_and_objects(self, exec_git_mock: MagicMock):
         exec_git_mock.return_value = """9a8feaa Rename to pontos only
 047cfae Update README for installation and development
@@ -678,7 +678,7 @@ def test_show_with_online_and_objects(self, exec_git_mock: MagicMock):
             show[1], "047cfae Update README for installation and development"
         )
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_show_with_format(self, exec_git_mock: MagicMock):
         exec_git_mock.return_value = """Rename to pontos only
 """
@@ -692,7 +692,7 @@ def test_show_with_format(self, exec_git_mock: MagicMock):
 
         self.assertEqual(show, "Rename to pontos only")
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_show_with_single_object(self, exec_git_mock: MagicMock):
         content = """commit a6956fb1398cae9426e7ced0396248a90dc1ff64
 Author: Björn Ricks <bjoern.ricks@greenbone.net>
@@ -700,10 +700,10 @@ def test_show_with_single_object(self, exec_git_mock: MagicMock):
 
     Add: Allow to get the git version string
 
-diff --git a/pontos/git/git.py b/pontos/git/git.py
+diff --git a/pontos.git._git.py b/pontos.git._git.py
 index a83eed8..09aed3d 100644
---- a/pontos/git/git.py
-+++ b/pontos/git/git.py
+--- a/pontos.git._git.py
++++ b/pontos.git._git.py
 @@ -168,6 +168,14 @@ class Git:
 ...
 """
@@ -716,7 +716,7 @@ def test_show_with_single_object(self, exec_git_mock: MagicMock):
 
         self.assertEqual(show, content.strip())
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_show_with_patch(self, exec_git_mock: MagicMock):
         content = """commit a6956fb1398cae9426e7ced0396248a90dc1ff64
 Author: Björn Ricks <bjoern.ricks@greenbone.net>
@@ -724,10 +724,10 @@ def test_show_with_patch(self, exec_git_mock: MagicMock):
 
     Add: Allow to get the git version string
 
-diff --git a/pontos/git/git.py b/pontos/git/git.py
+diff --git a/pontos.git._git.py b/pontos.git._git.py
 index a83eed8..09aed3d 100644
---- a/pontos/git/git.py
-+++ b/pontos/git/git.py
+--- a/pontos.git._git.py
++++ b/pontos.git._git.py
 @@ -168,6 +168,14 @@ class Git:
 ...
 """
@@ -740,7 +740,7 @@ def test_show_with_patch(self, exec_git_mock: MagicMock):
 
         self.assertEqual(show, content.strip())
 
-    @patch("pontos.git.git.exec_git")
+    @patch("pontos.git._git.exec_git")
     def test_show_with_no_patch(self, exec_git_mock: MagicMock):
         content = """commit a6956fb1398cae9426e7ced0396248a90dc1ff64
 Author: Björn Ricks <bjoern.ricks@greenbone.net>
diff --git a/tests/release/test_create.py b/tests/release/test_create.py
index 3857a5397..15ee59cf8 100644
--- a/tests/release/test_create.py
+++ b/tests/release/test_create.py
@@ -15,8 +15,7 @@
 
 from httpx import HTTPStatusError, Request, Response
 
-from pontos.git.git import ConfigScope, Git
-from pontos.git.status import StatusEntry
+from pontos.git import ConfigScope, Git, StatusEntry
 from pontos.github.actions.errors import GitHubActionsError
 from pontos.release.create import (
     CreateReleaseReturnValue,
diff --git a/tests/testing/test_testing.py b/tests/testing/test_testing.py
index 74641f7e0..6f618ab5d 100644
--- a/tests/testing/test_testing.py
+++ b/tests/testing/test_testing.py
@@ -6,7 +6,7 @@
 import unittest
 from pathlib import Path
 
-from pontos.git.git import Git
+from pontos.git import Git
 from pontos.helper import unload_module
 from pontos.testing import (
     temp_directory,
diff --git a/tests/version/test_helper.py b/tests/version/test_helper.py
index 5ca0acdca..bd49f9b2c 100644
--- a/tests/version/test_helper.py
+++ b/tests/version/test_helper.py
@@ -6,7 +6,7 @@
 import unittest
 from unittest.mock import patch
 
-from pontos.git.git import Git
+from pontos.git import Git
 from pontos.version.helper import (
     get_last_release_version,
     get_last_release_versions,