diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bf8447d..56a130a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -43,11 +43,11 @@ jobs:
         run: |
           perl -i -pe 'BEGIN { $v = $ENV{BUILD_VERSION} }
             s/(our \$VERSION\s*=\s*'"'"')[^'"'"']*'"'"';/${1}$v'"'"';/
-          ' src/node_info/files/Config.pm
+          ' src/modules/node_info/files/Config.pm
 
       - name: Generate dynamic debian rules
         run: |
-          bash src/gen-rules.sh >> debian/rules
+          bash build/gen-rules.sh >> debian/rules
 
       - name: Build deb package
         run: |
diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml
index 060ff3d..36b3e68 100644
--- a/.github/workflows/test-release.yml
+++ b/.github/workflows/test-release.yml
@@ -37,7 +37,7 @@ jobs:
         run: |
           BUILD_VERSION="${{ steps.version.outputs.build_version }}"
           sed -i -E "s/^our \\\$VERSION\\s*=.*/our \\\$VERSION = '${BUILD_VERSION}';/" \
-            src/node_info/files/Config.pm
+            src/modules/node_info/files/Config.pm
 
       - name: Set package version in changelog
         run: |
@@ -46,7 +46,7 @@ jobs:
 
       - name: Generate dynamic debian rules
         run: |
-          bash src/gen-rules.sh >> debian/rules
+          bash build/gen-rules.sh >> debian/rules
 
       - name: Build package
         run: dpkg-buildpackage -us -uc -b
diff --git a/.github/workflows/validate-mods.yml b/.github/workflows/validate-mods.yml
index e0e0046..a9c5b57 100644
--- a/.github/workflows/validate-mods.yml
+++ b/.github/workflows/validate-mods.yml
@@ -32,13 +32,13 @@ jobs:
           path: deb
 
       - name: Fetch upstream Proxmox files
-        run: bash src/Scripts/test/fetch-proxmox-files.sh
+        run: bash src/scripts/test/fetch-proxmox-files.sh
 
       - name: Install built package
         run: apt-get install -y ./deb/*.deb
 
       - name: Test all mods
-        run: bash src/Scripts/test/test-patches.sh all
+        run: bash src/scripts/test/test-patches.sh all
 
       - name: Validate source syntax
-        run: bash src/Scripts/test/test-syntax.sh all 
+        run: bash src/scripts/test/test-syntax.sh all 
diff --git a/.github/workflows/weekly-patch-test.yml b/.github/workflows/weekly-patch-test.yml
index 167b897..ac73ad1 100644
--- a/.github/workflows/weekly-patch-test.yml
+++ b/.github/workflows/weekly-patch-test.yml
@@ -58,19 +58,19 @@ jobs:
           export BUILD_VERSION="${VERSION}-test-${SHORT_SHA}"
           perl -i -pe 'BEGIN { $v = $ENV{BUILD_VERSION} }
             s/(our \$VERSION\s*=\s*'"'"')[^'"'"']*'"'"';/$1'"'"'$v'"'"';/
-          ' src/node_info/files/Config.pm
+          ' src/modules/node_info/files/Config.pm
 
       - name: Generate dynamic debian rules
         run: |
-          bash src/gen-rules.sh >> debian/rules
-          bash src/gen-rules.sh conffiles >> debian/pve-mod.conffiles
+          bash build/gen-rules.sh >> debian/rules
+          bash build/gen-rules.sh conffiles >> debian/pve-mod.conffiles
 
       - name: Build package
         run: dpkg-buildpackage -us -uc -b
 
       # ── Test ───────────────────────────────────────────────────────────────
       - name: Fetch upstream Proxmox files
-        run: bash src/Scripts/test/fetch-proxmox-files.sh
+        run: bash src/scripts/test/fetch-proxmox-files.sh
 
       - name: Install built package
         run: sudo apt-get install -y ../pve-mod_*.deb
@@ -78,7 +78,7 @@ jobs:
       - name: Test mod
         run: |
           set -o pipefail
-          sudo bash src/Scripts/test/test-patches.sh "${{ matrix.mod }}" 2>&1 | tee test-output.log
+          sudo bash src/scripts/test/test-patches.sh "${{ matrix.mod }}" 2>&1 | tee test-output.log
 
       - name: Report failure as issue
         if: failure()
diff --git a/src/gen-rules.sh b/build/gen-rules.sh
similarity index 90%
rename from src/gen-rules.sh
rename to build/gen-rules.sh
index cef6578..efa74ec 100644
--- a/src/gen-rules.sh
+++ b/build/gen-rules.sh
@@ -1,19 +1,19 @@
 #!/usr/bin/env bash
-# src/gen-rules.sh
+# build/gen-rules.sh
 #
 # Generates the per-module portion of the Debian build configuration from each
 # module's metadata, so adding or changing a module never requires touching
 # debian/rules by hand.
 #
-# A module is any directory under src/ that contains a files/ and/or patches/
-# subdirectory (so src/Scripts/, which has neither, is ignored). The module's
-# directory name is its canonical mod key (matches the [modules] keys in
-# pve-mod.conf and the install path usr/lib/pve-mod/patches/<mod>/).
+# A module is any directory under src/modules/ that contains a files/ and/or
+# patches/ subdirectory. The module's directory name is its canonical mod key
+# (matches the [modules] keys in pve-mod.conf and the install path
+# usr/lib/pve-mod/patches/<mod>/).
 #
 # Usage:
 #   gen-rules.sh    Emit dpkg install lines (tab-indented, no header).
 #                   Append to debian/rules' override_dh_install recipe:
-#                       bash src/gen-rules.sh >> debian/rules
+#                       bash build/gen-rules.sh >> debian/rules
 #                   Conffiles under etc/ are detected automatically by
 #                   debhelper (compat 13+); no separate conffiles step needed.
 #
@@ -37,7 +37,7 @@ set -euo pipefail
 # regardless of the caller's working directory.
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
-SRC_DIR="$REPO_ROOT/src"
+SRC_DIR="$REPO_ROOT/src/modules"
 PKG_DIR="debian/pve-mod"
 
 # Print the list of module directory names (basenames), sorted, that contain a
@@ -62,7 +62,7 @@ emit_install() {
 emit_install_rules() {
     local mod="$1"
     local mod_dir="$SRC_DIR/$mod"
-    local rel_mod="src/$mod"
+    local rel_mod="src/modules/$mod"
 
     # 1. Mapped files from files/files.list.
     local manifest="$mod_dir/files/files.list"
diff --git a/debian/rules b/debian/rules
index 4061449..e212617 100644
--- a/debian/rules
+++ b/debian/rules
@@ -6,18 +6,18 @@ override_dh_install:
 	# ── Static section ─────────────────────────────────────────────────────
 	# Generic, mod-independent files that never change when mods are added.
 	# Everything mod-specific (module files, patches, per-mod configs) is
-	# generated and appended below by src/gen-rules.sh at build time and is
+	# generated and appended below by build/gen-rules.sh at build time and is
 	# NOT committed to the repository.
 	#
 	# Patch helpers (generic, manifest-driven)
-	install -Dm755 src/Scripts/apply-patches.sh debian/pve-mod/usr/lib/pve-mod/apply-patches.sh
-	install -Dm755 src/Scripts/revert-patches.sh debian/pve-mod/usr/lib/pve-mod/revert-patches.sh
+	install -Dm755 src/scripts/apply-patches.sh debian/pve-mod/usr/lib/pve-mod/apply-patches.sh
+	install -Dm755 src/scripts/revert-patches.sh debian/pve-mod/usr/lib/pve-mod/revert-patches.sh
 	# Configure tool
-	install -Dm755 src/Scripts/pve-mod-configure debian/pve-mod/usr/sbin/pve-mod-configure
+	install -Dm755 src/scripts/pve-mod-configure debian/pve-mod/usr/sbin/pve-mod-configure
 	# Main config (conffile for user edits)
 	install -Dm644 src/pve-mod.conf debian/pve-mod/etc/pve-mod/pve-mod.conf
 	# Main config reference copy for upgrade key-diff (not a conffile)
 	install -Dm644 src/pve-mod.conf debian/pve-mod/usr/share/pve-mod/pve-mod.conf.default
 	# ── Dynamic section ────────────────────────────────────────────────────
-	# `bash src/gen-rules.sh >> debian/rules` appends per-module install lines
+	# `bash build/gen-rules.sh >> debian/rules` appends per-module install lines
 	# here during CI, just before dpkg-buildpackage. Do not commit them.
diff --git a/src/nag_screen/files/files.list b/src/modules/nag_screen/files/files.list
similarity index 85%
rename from src/nag_screen/files/files.list
rename to src/modules/nag_screen/files/files.list
index 0b4bec3..93fcb6f 100644
--- a/src/nag_screen/files/files.list
+++ b/src/modules/nag_screen/files/files.list
@@ -4,7 +4,7 @@
 #   source      - path relative to this files/ directory
 #   destination - path relative to the package root (no leading slash)
 #   permission  - octal mode, optional (defaults to 644)
-# Read by src/gen-rules.sh to generate the per-module debian install rules.
+# Read by build/gen-rules.sh to generate the per-module debian install rules.
 #
 # The nag_screen mod ships no new files - it only patches existing Proxmox
 # files - so this manifest is intentionally empty.
diff --git a/src/nag_screen/nag_screen.conf b/src/modules/nag_screen/nag_screen.conf
similarity index 100%
rename from src/nag_screen/nag_screen.conf
rename to src/modules/nag_screen/nag_screen.conf
diff --git a/src/nag_screen/nag_screen.configure.sh b/src/modules/nag_screen/nag_screen.configure.sh
similarity index 100%
rename from src/nag_screen/nag_screen.configure.sh
rename to src/modules/nag_screen/nag_screen.configure.sh
diff --git a/src/nag_screen/patches/01-proxmoxlib-js-nagscreen.patch b/src/modules/nag_screen/patches/01-proxmoxlib-js-nagscreen.patch
similarity index 100%
rename from src/nag_screen/patches/01-proxmoxlib-js-nagscreen.patch
rename to src/modules/nag_screen/patches/01-proxmoxlib-js-nagscreen.patch
diff --git a/src/nag_screen/patches/02-index-html-tpl-mobilenag.patch b/src/modules/nag_screen/patches/02-index-html-tpl-mobilenag.patch
similarity index 100%
rename from src/nag_screen/patches/02-index-html-tpl-mobilenag.patch
rename to src/modules/nag_screen/patches/02-index-html-tpl-mobilenag.patch
diff --git a/src/nag_screen/patches/patches.list b/src/modules/nag_screen/patches/patches.list
similarity index 100%
rename from src/nag_screen/patches/patches.list
rename to src/modules/nag_screen/patches/patches.list
diff --git a/src/nag_screen/patches/post-apply.sh b/src/modules/nag_screen/patches/post-apply.sh
similarity index 100%
rename from src/nag_screen/patches/post-apply.sh
rename to src/modules/nag_screen/patches/post-apply.sh
diff --git a/src/nag_screen/patches/post-revert.sh b/src/modules/nag_screen/patches/post-revert.sh
similarity index 100%
rename from src/nag_screen/patches/post-revert.sh
rename to src/modules/nag_screen/patches/post-revert.sh
diff --git a/src/nag_screen/readme.md b/src/modules/nag_screen/readme.md
similarity index 100%
rename from src/nag_screen/readme.md
rename to src/modules/nag_screen/readme.md
diff --git a/src/node_info/files/Collector/Amd.pm b/src/modules/node_info/files/Collector/Amd.pm
similarity index 100%
rename from src/node_info/files/Collector/Amd.pm
rename to src/modules/node_info/files/Collector/Amd.pm
diff --git a/src/node_info/files/Collector/Intel.pm b/src/modules/node_info/files/Collector/Intel.pm
similarity index 100%
rename from src/node_info/files/Collector/Intel.pm
rename to src/modules/node_info/files/Collector/Intel.pm
diff --git a/src/node_info/files/Collector/LmSensors.pm b/src/modules/node_info/files/Collector/LmSensors.pm
similarity index 100%
rename from src/node_info/files/Collector/LmSensors.pm
rename to src/modules/node_info/files/Collector/LmSensors.pm
diff --git a/src/node_info/files/Collector/Nvidia.pm b/src/modules/node_info/files/Collector/Nvidia.pm
similarity index 100%
rename from src/node_info/files/Collector/Nvidia.pm
rename to src/modules/node_info/files/Collector/Nvidia.pm
diff --git a/src/node_info/files/Collector/Ups.pm b/src/modules/node_info/files/Collector/Ups.pm
similarity index 100%
rename from src/node_info/files/Collector/Ups.pm
rename to src/modules/node_info/files/Collector/Ups.pm
diff --git a/src/node_info/files/Collector/systemInformation.pm b/src/modules/node_info/files/Collector/systemInformation.pm
similarity index 100%
rename from src/node_info/files/Collector/systemInformation.pm
rename to src/modules/node_info/files/Collector/systemInformation.pm
diff --git a/src/node_info/files/Config.pm b/src/modules/node_info/files/Config.pm
similarity index 100%
rename from src/node_info/files/Config.pm
rename to src/modules/node_info/files/Config.pm
diff --git a/src/node_info/files/ProcessManager.pm b/src/modules/node_info/files/ProcessManager.pm
similarity index 100%
rename from src/node_info/files/ProcessManager.pm
rename to src/modules/node_info/files/ProcessManager.pm
diff --git a/src/node_info/files/PveMod_SensorInfo.pm b/src/modules/node_info/files/PveMod_SensorInfo.pm
similarity index 100%
rename from src/node_info/files/PveMod_SensorInfo.pm
rename to src/modules/node_info/files/PveMod_SensorInfo.pm
diff --git a/src/node_info/files/PveMod_pvemanagerlib.js b/src/modules/node_info/files/PveMod_pvemanagerlib.js
similarity index 100%
rename from src/node_info/files/PveMod_pvemanagerlib.js
rename to src/modules/node_info/files/PveMod_pvemanagerlib.js
diff --git a/src/node_info/files/Store.pm b/src/modules/node_info/files/Store.pm
similarity index 100%
rename from src/node_info/files/Store.pm
rename to src/modules/node_info/files/Store.pm
diff --git a/src/node_info/files/Utils.pm b/src/modules/node_info/files/Utils.pm
similarity index 100%
rename from src/node_info/files/Utils.pm
rename to src/modules/node_info/files/Utils.pm
diff --git a/src/node_info/files/files.list b/src/modules/node_info/files/files.list
similarity index 94%
rename from src/node_info/files/files.list
rename to src/modules/node_info/files/files.list
index 9639ae7..30276dc 100644
--- a/src/node_info/files/files.list
+++ b/src/modules/node_info/files/files.list
@@ -4,7 +4,7 @@
 #   source      - path relative to this files/ directory
 #   destination - path relative to the package root (no leading slash)
 #   permission  - octal mode, optional (defaults to 644)
-# Read by src/gen-rules.sh to generate the per-module debian install rules.
+# Read by build/gen-rules.sh to generate the per-module debian install rules.
 
 # PVE API2 facade
 PveMod_SensorInfo.pm                    usr/share/perl5/PVE/API2/PVEMod_SensorInfo.pm
diff --git a/src/node_info/node_info.conf b/src/modules/node_info/node_info.conf
similarity index 100%
rename from src/node_info/node_info.conf
rename to src/modules/node_info/node_info.conf
diff --git a/src/node_info/node_info.configure.sh b/src/modules/node_info/node_info.configure.sh
similarity index 100%
rename from src/node_info/node_info.configure.sh
rename to src/modules/node_info/node_info.configure.sh
diff --git a/src/node_info/patches/01-nodes-pm-sensors.patch b/src/modules/node_info/patches/01-nodes-pm-sensors.patch
similarity index 100%
rename from src/node_info/patches/01-nodes-pm-sensors.patch
rename to src/modules/node_info/patches/01-nodes-pm-sensors.patch
diff --git a/src/node_info/patches/02-nodes-pm-GPU-RRD-history.patch b/src/modules/node_info/patches/02-nodes-pm-GPU-RRD-history.patch
similarity index 100%
rename from src/node_info/patches/02-nodes-pm-GPU-RRD-history.patch
rename to src/modules/node_info/patches/02-nodes-pm-GPU-RRD-history.patch
diff --git a/src/node_info/patches/03-pvemanager-js-sensors.patch b/src/modules/node_info/patches/03-pvemanager-js-sensors.patch
similarity index 100%
rename from src/node_info/patches/03-pvemanager-js-sensors.patch
rename to src/modules/node_info/patches/03-pvemanager-js-sensors.patch
diff --git a/src/node_info/patches/patches.list b/src/modules/node_info/patches/patches.list
similarity index 100%
rename from src/node_info/patches/patches.list
rename to src/modules/node_info/patches/patches.list
diff --git a/src/node_info/patches/post-apply.sh b/src/modules/node_info/patches/post-apply.sh
similarity index 100%
rename from src/node_info/patches/post-apply.sh
rename to src/modules/node_info/patches/post-apply.sh
diff --git a/src/node_info/readme.md b/src/modules/node_info/readme.md
similarity index 100%
rename from src/node_info/readme.md
rename to src/modules/node_info/readme.md
diff --git a/src/Scripts/apply-patches.sh b/src/scripts/apply-patches.sh
similarity index 100%
rename from src/Scripts/apply-patches.sh
rename to src/scripts/apply-patches.sh
diff --git a/src/Scripts/pve-mod-configure b/src/scripts/pve-mod-configure
similarity index 100%
rename from src/Scripts/pve-mod-configure
rename to src/scripts/pve-mod-configure
diff --git a/src/Scripts/revert-patches.sh b/src/scripts/revert-patches.sh
similarity index 100%
rename from src/Scripts/revert-patches.sh
rename to src/scripts/revert-patches.sh
diff --git a/src/Scripts/test/fetch-proxmox-files.sh b/src/scripts/test/fetch-proxmox-files.sh
similarity index 100%
rename from src/Scripts/test/fetch-proxmox-files.sh
rename to src/scripts/test/fetch-proxmox-files.sh
diff --git a/src/Scripts/test/test-patches.sh b/src/scripts/test/test-patches.sh
similarity index 99%
rename from src/Scripts/test/test-patches.sh
rename to src/scripts/test/test-patches.sh
index 71a3612..6e5f1f3 100644
--- a/src/Scripts/test/test-patches.sh
+++ b/src/scripts/test/test-patches.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# src/Scripts/test/test-mods.sh
+# src/scripts/test/test-patches.sh
 #
 # Exercises pve-mod's patch engine against the installed Proxmox files.
 #
diff --git a/src/Scripts/test/test-syntax.sh b/src/scripts/test/test-syntax.sh
similarity index 98%
rename from src/Scripts/test/test-syntax.sh
rename to src/scripts/test/test-syntax.sh
index b52e43e..a274bfe 100644
--- a/src/Scripts/test/test-syntax.sh
+++ b/src/scripts/test/test-syntax.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# src/Scripts/test/test-syntax.sh
+# src/scripts/test/test-syntax.sh
 #
 # Validates source syntax for all mod files without requiring a running system.
 #
@@ -16,7 +16,7 @@
 set -u
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SRC_DIR="${PVE_MOD_SRC_DIR:-$(cd "$SCRIPT_DIR/../../.." && pwd)/src}"
+SRC_DIR="${PVE_MOD_SRC_DIR:-$(cd "$SCRIPT_DIR/../../.." && pwd)/src/modules}"
 
 info() { echo "[syntax] $*"; }
 warn() { echo "[syntax] WARNING: $*" >&2; }