diff --git a/tools/git-if-needed/pyproject.toml b/tools/git-if-needed/pyproject.toml
index a259e91..a0d040d 100644
--- a/tools/git-if-needed/pyproject.toml
+++ b/tools/git-if-needed/pyproject.toml
@@ -21,7 +21,7 @@
 
 [tool.setuptools]
 zip-safe = true
-package-dir = {"" = "python"}
+package-dir = {"" = "python/src"}
 packages = ["gifn_apply"]
 
 [tool.mypy]
diff --git a/tools/git-if-needed/python/config/ruff-base/pyproject.toml b/tools/git-if-needed/python/config/ruff-base/pyproject.toml
index b9e1932..d067c07 100644
--- a/tools/git-if-needed/python/config/ruff-base/pyproject.toml
+++ b/tools/git-if-needed/python/config/ruff-base/pyproject.toml
@@ -32,4 +32,4 @@
 
 [tool.ruff.per-file-ignores]
 # This is a test suite
-"*/unit_tests/*" = ["S101"]
+"python/tests/unit/*" = ["S101"]
diff --git a/tools/git-if-needed/python/gifn_apply/__init__.py b/tools/git-if-needed/python/src/gifn_apply/__init__.py
similarity index 100%
rename from tools/git-if-needed/python/gifn_apply/__init__.py
rename to tools/git-if-needed/python/src/gifn_apply/__init__.py
diff --git a/tools/git-if-needed/python/gifn_apply/__main__.py b/tools/git-if-needed/python/src/gifn_apply/__main__.py
similarity index 100%
rename from tools/git-if-needed/python/gifn_apply/__main__.py
rename to tools/git-if-needed/python/src/gifn_apply/__main__.py
diff --git a/tools/git-if-needed/python/gifn_apply/defs.py b/tools/git-if-needed/python/src/gifn_apply/defs.py
similarity index 100%
rename from tools/git-if-needed/python/gifn_apply/defs.py
rename to tools/git-if-needed/python/src/gifn_apply/defs.py
diff --git a/tools/git-if-needed/python/gifn_apply/gifn.py b/tools/git-if-needed/python/src/gifn_apply/gifn.py
similarity index 100%
rename from tools/git-if-needed/python/gifn_apply/gifn.py
rename to tools/git-if-needed/python/src/gifn_apply/gifn.py
diff --git a/tools/git-if-needed/python/gifn_apply/git.py b/tools/git-if-needed/python/src/gifn_apply/git.py
similarity index 100%
rename from tools/git-if-needed/python/gifn_apply/git.py
rename to tools/git-if-needed/python/src/gifn_apply/git.py
diff --git a/tools/git-if-needed/python/gifn_apply/quilt.py b/tools/git-if-needed/python/src/gifn_apply/quilt.py
similarity index 100%
rename from tools/git-if-needed/python/gifn_apply/quilt.py
rename to tools/git-if-needed/python/src/gifn_apply/quilt.py
diff --git a/tools/git-if-needed/python/gifn_apply/repo_url.py b/tools/git-if-needed/python/src/gifn_apply/repo_url.py
similarity index 100%
rename from tools/git-if-needed/python/gifn_apply/repo_url.py
rename to tools/git-if-needed/python/src/gifn_apply/repo_url.py
diff --git a/tools/git-if-needed/python/gifn_apply/util.py b/tools/git-if-needed/python/src/gifn_apply/util.py
similarity index 100%
rename from tools/git-if-needed/python/gifn_apply/util.py
rename to tools/git-if-needed/python/src/gifn_apply/util.py
diff --git a/tools/git-if-needed/python/unit_tests/__init__.py b/tools/git-if-needed/python/tests/unit/__init__.py
similarity index 100%
rename from tools/git-if-needed/python/unit_tests/__init__.py
rename to tools/git-if-needed/python/tests/unit/__init__.py
diff --git a/tools/git-if-needed/python/unit_tests/test_repo_urls.py b/tools/git-if-needed/python/tests/unit/test_repo_urls.py
similarity index 100%
rename from tools/git-if-needed/python/unit_tests/test_repo_urls.py
rename to tools/git-if-needed/python/tests/unit/test_repo_urls.py
diff --git a/tools/git-if-needed/python/unit_tests/test_util.py b/tools/git-if-needed/python/tests/unit/test_util.py
similarity index 100%
rename from tools/git-if-needed/python/unit_tests/test_util.py
rename to tools/git-if-needed/python/tests/unit/test_util.py
diff --git a/tools/git-if-needed/tox.ini b/tools/git-if-needed/tox.ini
index df7df5e..a93e828 100644
--- a/tools/git-if-needed/tox.ini
+++ b/tools/git-if-needed/tox.ini
@@ -14,8 +14,8 @@
 
 [defs]
 pyfiles =
-  python/gifn_apply \
-  python/unit_tests
+  python/src/gifn_apply \
+  python/tests/unit
 
 [testenv:format]
 skip_install = True
@@ -64,7 +64,7 @@
 deps =
   -r python/requirements/test.txt
 commands =
-  pytest {posargs} python/unit_tests
+  pytest {posargs} python/tests/unit
 
 [testenv:reuse]
 skip_install = True