diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 719edae7b7b..ce8ef31f493 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -46,7 +46,7 @@ repos:
           )$
 
   - repo: https://github.com/s0undt3ch/python-tools-scripts
-    rev: "0.11.1"
+    rev: "0.12.0"
     hooks:
       - id: tools
         alias: check-changelog-entries
diff --git a/tools/__init__.py b/tools/__init__.py
index 3ef4b15bae2..419ec309c2f 100644
--- a/tools/__init__.py
+++ b/tools/__init__.py
@@ -6,8 +6,8 @@ ptscripts.register_tools_module("tools.changelog")
 ptscripts.register_tools_module("tools.ci")
 ptscripts.register_tools_module("tools.docs")
 ptscripts.register_tools_module("tools.pkg")
-ptscripts.register_tools_module("tools.pkgrepo")
-ptscripts.register_tools_module("tools.pkgbuild")
+ptscripts.register_tools_module("tools.pkg.repo")
+ptscripts.register_tools_module("tools.pkg.build")
 ptscripts.register_tools_module("tools.pre_commit")
 ptscripts.register_tools_module("tools.release")
 ptscripts.register_tools_module("tools.vm")
diff --git a/tools/pkg.py b/tools/pkg/__init__.py
similarity index 100%
rename from tools/pkg.py
rename to tools/pkg/__init__.py
diff --git a/tools/pkgbuild.py b/tools/pkg/build.py
similarity index 99%
rename from tools/pkgbuild.py
rename to tools/pkg/build.py
index 5ac30140e2b..fb77a183b94 100644
--- a/tools/pkgbuild.py
+++ b/tools/pkg/build.py
@@ -14,9 +14,6 @@ from typing import TYPE_CHECKING
 
 from ptscripts import Context, command_group
 
-import tools.pkg
-import tools.utils
-
 log = logging.getLogger(__name__)
 
 # Define the command group
@@ -24,7 +21,7 @@ build = command_group(
     name="build",
     help="Package build related commands.",
     description=__doc__,
-    parent=tools.pkg.pkg,
+    parent="pkg",
 )
 
 
diff --git a/tools/pkgrepo.py b/tools/pkg/repo.py
similarity index 99%
rename from tools/pkgrepo.py
rename to tools/pkg/repo.py
index d3d9bd1176d..90f3f9c491f 100644
--- a/tools/pkgrepo.py
+++ b/tools/pkg/repo.py
@@ -43,7 +43,7 @@ repo = command_group(
     name="repo",
     help="Packaging Repository Related Commands",
     description=__doc__,
-    parent=tools.pkg.pkg,
+    parent="pkg",
 )
 
 create = command_group(