diff --git a/phpstan.neon b/phpstan.neon
index 31dae52a..7c0251eb 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -4,7 +4,7 @@ parameters:
     - php
     - page
   paths:
-    - source/compose.manager/php
+    - source/compose.manager/include
   excludePaths:
     - */vendor/*
   ignoreErrors:
diff --git a/phpunit.xml b/phpunit.xml
index ef68b9eb..bf6745f1 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,7 +13,7 @@
     </testsuites>
     <source>
         <include>
-            <directory>source/compose.manager/php</directory>
+            <directory>source/compose.manager/include</directory>
         </include>
     </source>
     <coverage>
diff --git a/source/compose.manager/Compose.page b/source/compose.manager/Compose.page
index 8f81e0e4..a9443603 100644
--- a/source/compose.manager/Compose.page
+++ b/source/compose.manager/Compose.page
@@ -9,14 +9,14 @@ Cond="$var['fsState'] == 'Started' && exec('/etc/rc.d/rc.docker status | grep -v
 ---
 <link type="text/css" rel="stylesheet" href="<?php autov('/webGui/styles/jquery.switchbutton.css'); ?>">
 <link type="text/css" rel="stylesheet" href="<?php autov('/webGui/styles/jquery.filetree.css'); ?>">
-<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/styles/comboButton.css'); ?>">
-<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/styles/editorModal.css'); ?>">
+<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/sheets/ComboButton.css'); ?>">
+<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/sheets/EditorModal.css'); ?>">
 <script src="<?php autov('/webGui/javascript/jquery.switchbutton.js'); ?>"></script>
 <script src="<?php autov('/webGui/javascript/jquery.filetree.js'); ?>" charset="utf-8"></script>
 <script src="<?php autov('/plugins/dynamix.docker.manager/javascript/docker.js'); ?>"></script>
 <style>
 table tbody td {
-    line-height:normal
+	line-height:normal
 }
 </style>
-<?php include '/usr/local/emhttp/plugins/compose.manager/php/compose_manager_main.php';?>
+<?php include '/usr/local/emhttp/plugins/compose.manager/include/ComposeManager.php';?>
diff --git a/source/compose.manager/compose.manager.dashboard.page b/source/compose.manager/compose.manager.dashboard.page
index a04d7b50..07a090f1 100644
--- a/source/compose.manager/compose.manager.dashboard.page
+++ b/source/compose.manager/compose.manager.dashboard.page
@@ -164,7 +164,7 @@ EOT;
 $script = <<<'EOT'
 <script>
 (function() {
-    var caURL = '/plugins/compose.manager/php/exec.php';
+    var caURL = '/plugins/compose.manager/include/Exec.php';
     var expandedStacks = {};
     var stackContainerCache = {};
 
@@ -294,7 +294,7 @@ $script .= <<<'EOT'
     }
 
     function stackAction(stackName, action) {
-        // Map dashboard action names to compose_util.php action names
+        // Map dashboard action names to ComposeUtil.php action names
         var actionMap = {
             'start': 'composeUp',
             'stop': 'composeStop',
@@ -305,7 +305,7 @@ $script .= <<<'EOT'
         var $status = $('#compose_stacks_status');
         $status.text(actionTitle + 'ing ' + stackName + '...');
 
-        $.post('/plugins/compose.manager/php/compose_util.php', {
+        $.post('/plugins/compose.manager/include/ComposeUtil.php', {
             action: apiAction,
             path: '/boot/config/plugins/compose.manager/projects/' + stackName
         }, function(data) {
@@ -324,7 +324,7 @@ $script .= <<<'EOT'
     function openStackLogs(stackName) {
         // Open combined logs for the stack in a new window
         var projectPath = '/boot/config/plugins/compose.manager/projects/' + stackName;
-        $.post('/plugins/compose.manager/php/compose_util.php', {
+        $.post('/plugins/compose.manager/include/ComposeUtil.php', {
             action: 'composeLogs',
             path: projectPath
         }, function(data) {
@@ -412,7 +412,7 @@ $script .= <<<'EOT'
     function openDockerTerminal(name, isLogs, shell) {
         if (isLogs) {
             // Logs — start ttyd via plugin, open in new window (same as stack logs)
-            $.post('/plugins/compose.manager/php/compose_util.php', {
+            $.post('/plugins/compose.manager/include/ComposeUtil.php', {
                 action: 'containerLogs',
                 container: name
             }, function(data) {
@@ -425,7 +425,7 @@ $script .= <<<'EOT'
             });
         } else {
             // Console — start writable ttyd via plugin, open directly
-            $.post('/plugins/compose.manager/php/compose_util.php', {
+            $.post('/plugins/compose.manager/include/ComposeUtil.php', {
                 action: 'containerConsole',
                 container: name,
                 shell: shell || '/bin/bash'
@@ -542,7 +542,7 @@ $script .= <<<'EOT'
     }
 
     function loadComposeStacks() {
-        $.post('/plugins/compose.manager/php/dashboard_stacks.php', function(data) {
+        $.post('/plugins/compose.manager/include/DashboardStacks.php', function(data) {
             var statusText = 'Stacks -- Started: ' + data.started + ', Stopped: ' + data.stopped;
             if (data.partial > 0) statusText += ', Partial: ' + data.partial;
             $('#compose_stacks_status').text(statusText);
diff --git a/source/compose.manager/compose.manager.page b/source/compose.manager/compose.manager.page
index fa481015..cf0ef965 100644
--- a/source/compose.manager/compose.manager.page
+++ b/source/compose.manager/compose.manager.page
@@ -25,10 +25,10 @@ if (!empty($_SERVER['REQUEST_URI'])) {
 	}
 }
 ?>
-<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/styles/comboButton.css'); ?>">
-<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/styles/editorModal.css'); ?>">
+<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/sheets/ComboButton.css'); ?>">
+<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/sheets/EditorModal.css'); ?>">
 <link type="text/css" rel="stylesheet" href="<?php autov('/webGui/styles/jquery.filetree.css'); ?>">
 <link type="text/css" rel="stylesheet" href="<?php autov('/webGui/styles/jquery.switchbutton.css'); ?>">
 <script src="<?php autov('/webGui/javascript/jquery.filetree.js'); ?>" charset="utf-8"></script>
 <script src="<?php autov('/webGui/javascript/jquery.switchbutton.js'); ?>"></script>
-<?php include '/usr/local/emhttp/plugins/compose.manager/php/compose_manager_main.php';?>
+<?php include '/usr/local/emhttp/plugins/compose.manager/include/ComposeManager.php';?>
diff --git a/source/compose.manager/compose.manager.settings.page b/source/compose.manager/compose.manager.settings.page
index 8ce82e05..1c3d5e50 100755
--- a/source/compose.manager/compose.manager.settings.page
+++ b/source/compose.manager/compose.manager.settings.page
@@ -7,7 +7,7 @@ Lock="true"
 ---
 <?php
 include "/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php";
-require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
 $cfg = parse_plugin_cfg($sName);
 $ui_patch_button_type = (!$option_patch_ui && strcmp($cfg['PATCH_UI'], "true") == 0 && !isset($composemanDockerClientPatch)) ? "Button" : "Hidden";
 $ui_unpatch_button_type = (!$option_patch_ui && strcmp($cfg['PATCH_UI'], "false") == 0 && isset($composemanDockerClientPatch)) ? "Button" : "Hidden";
@@ -618,7 +618,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
 </style>
 <script src="<?php autov('/plugins/compose.manager/javascript/common.js'); ?>"></script>
 <script>
-    var caURL = "/plugins/compose.manager/php/exec.php";
+    var caURL = "/plugins/compose.manager/include/Exec.php";
     var skipPatchUI = <?php echo json_encode($option_patch_ui); ?>; // true when Unraid >= 6.12
     var logRefreshInterval = null;
     var autoScroll = true;
@@ -1585,10 +1585,10 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
 
     function loadUpdatesUI() {
         $('#updates-tbody').html('<tr><td colspan="5" class="compose-text-muted" style="text-align:center;padding:12px;">_(Loading stacks...)_</td></tr>');
-        $.post('/plugins/compose.manager/php/exec.php', {
+        $.post('/plugins/compose.manager/include/Exec.php', {
             action: 'listProjects'
         }, function(projects) {
-            $.post('/plugins/compose.manager/php/autoupdate.php', {
+            $.post('/plugins/compose.manager/include/AutoUpdate.php', {
                 action: 'getConfig'
             }, function(cfg) {
                 // Response is already parsed as JSON by jQuery due to Content-Type header
@@ -1650,7 +1650,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
     }
 
     function refreshCronStatus() {
-        $.post('/plugins/compose.manager/php/autoupdate.php', {
+        $.post('/plugins/compose.manager/include/AutoUpdate.php', {
             action: 'getCronStatus'
         }, function(r) {
             // Response is already parsed as JSON by jQuery due to Content-Type header
@@ -1783,7 +1783,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
             var schedulerEnabled = $('#AUTOUPDATE_ENABLED').is(':checked');
 
             // Save config first
-            $.post('/plugins/compose.manager/php/autoupdate.php', {
+            $.post('/plugins/compose.manager/include/AutoUpdate.php', {
                 action: 'saveConfig',
                 data: JSON.stringify(cfg)
             }, function(resp) {
@@ -1795,7 +1795,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
 
                 // Then update scheduler
                 var schedulerAction = schedulerEnabled ? 'installCron' : 'removeCron';
-                $.post('/plugins/compose.manager/php/autoupdate.php', {
+                $.post('/plugins/compose.manager/include/AutoUpdate.php', {
                     action: schedulerAction
                 }, function(d) {
                     setUpdatesSpinner(false);
@@ -1837,7 +1837,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
                     return;
                 }
                 var p = paths[idx++];
-                $.post('/plugins/compose.manager/php/autoupdate.php', {
+                $.post('/plugins/compose.manager/include/AutoUpdate.php', {
                     action: 'runNow',
                     path: p
                 }, function(data) {
diff --git a/source/compose.manager/php/autoupdate.php b/source/compose.manager/include/AutoUpdate.php
similarity index 96%
rename from source/compose.manager/php/autoupdate.php
rename to source/compose.manager/include/AutoUpdate.php
index 270a7ae6..eaa27cc7 100644
--- a/source/compose.manager/php/autoupdate.php
+++ b/source/compose.manager/include/AutoUpdate.php
@@ -1,6 +1,6 @@
 <?php
-require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
-require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
 
 $action = isset($_POST['action']) ? $_POST['action'] : '';
 $autofile = getAutoUpdateConfigFilePath();
@@ -72,7 +72,7 @@
         if ($cronDirEnv !== false && $cronDirEnv !== '') {
             $cronDir = $cronDirEnv;
             $cronFile = rtrim($cronDir, '/') . '/compose_manager_autoupdate';
-            $runner = escapeshellarg($plugin_root . "php/autoupdate_runner.php");
+            $runner = escapeshellarg($plugin_root . "include/AutoUpdateRunner.php");
             $line = "*/15 * * * * root " . escapeshellarg($phpBinary) . " " . $runner . " >/dev/null 2>&1\n";
             // ensure cron directory exists for test environments
             $cdir = dirname($cronFile);
@@ -86,7 +86,7 @@
         } else {
             // Default behavior: use plugin-owned cron file and let update_cron sync it to the system
             $pluginCron = '/boot/config/plugins/compose.manager/compose.manager.cron';
-            $runner = escapeshellarg($plugin_root . "php/autoupdate_runner.php");
+            $runner = escapeshellarg($plugin_root . "include/AutoUpdateRunner.php");
             $line = "*/15 * * * * root " . escapeshellarg($phpBinary) . " " . $runner . " >/dev/null 2>&1\n";
 
             if (!is_dir(dirname($pluginCron))) {
diff --git a/source/compose.manager/php/autoupdate_runner.php b/source/compose.manager/include/AutoUpdateRunner.php
similarity index 96%
rename from source/compose.manager/php/autoupdate_runner.php
rename to source/compose.manager/include/AutoUpdateRunner.php
index acf344d9..68e8bb8a 100644
--- a/source/compose.manager/php/autoupdate_runner.php
+++ b/source/compose.manager/include/AutoUpdateRunner.php
@@ -2,8 +2,8 @@
 /**
  * Runner invoked by cron to check autoupdate.json and run updates when scheduled
  */
-require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
-require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
 
 $autofile = getAutoUpdateConfigFilePath();
 if (!is_file($autofile)) exit(0);
diff --git a/source/compose.manager/php/backup_functions.php b/source/compose.manager/include/BackupFunctions.php
similarity index 98%
rename from source/compose.manager/php/backup_functions.php
rename to source/compose.manager/include/BackupFunctions.php
index 60b39223..bcc9fe8e 100644
--- a/source/compose.manager/php/backup_functions.php
+++ b/source/compose.manager/include/BackupFunctions.php
@@ -7,8 +7,8 @@
  * Archives are .tar.gz files containing stack directories.
  */
 
-require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
-require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
 
 /**
  * Get the backup destination path from config, falling back to default.
@@ -338,7 +338,7 @@ function formatBytes($bytes)
 
 /**
  * Log a message to syslog with compose.manager tag.
- * Guarded to avoid redeclaration when compose_util_functions.php is also loaded.
+ * Guarded to avoid redeclaration when Helpers.php is also loaded.
  */
 if (!function_exists('logger')) {
     function logger($message)
diff --git a/source/compose.manager/php/compose_list.php b/source/compose.manager/include/ComposeList.php
similarity index 98%
rename from source/compose.manager/php/compose_list.php
rename to source/compose.manager/include/ComposeList.php
index 1b537d50..a176f5ac 100755
--- a/source/compose.manager/php/compose_list.php
+++ b/source/compose.manager/include/ComposeList.php
@@ -5,8 +5,8 @@
  * This file is called via AJAX to load the stack list without blocking page load
  */
 
-require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
-require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
 
 $cfg = parse_plugin_cfg($sName);
 
diff --git a/source/compose.manager/php/compose_manager_main.php b/source/compose.manager/include/ComposeManager.php
similarity index 99%
rename from source/compose.manager/php/compose_manager_main.php
rename to source/compose.manager/include/ComposeManager.php
index 9b4f4ccf..11d3c9b0 100755
--- a/source/compose.manager/php/compose_manager_main.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -5,8 +5,8 @@
  * The stack list is loaded asynchronously via AJAX for better UX
  */
 
-require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
-require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
 
 // Load plugin config
 $cfg = parse_plugin_cfg($sName);
@@ -58,7 +58,7 @@ function compose_manager_cpu_spec_count($cpuSpec)
     $cpuCount = 1;
 }
 
-// Note: Stack list is now loaded asynchronously via compose_list.php
+// Note: Stack list is now loaded asynchronously via ComposeList.php
 // This improves page load time by deferring expensive docker commands
 ?>
 
@@ -277,8 +277,8 @@ function compose_manager_cpu_spec_count($cpuSpec)
 <script src="<?php autov('/plugins/compose.manager/javascript/composeSortable.js'); ?>" type="text/javascript"></script>
 <script>
     var compose_root = <?php echo json_encode($compose_root); ?>;
-    var caURL = "/plugins/compose.manager/php/exec.php";
-    var compURL = "/plugins/compose.manager/php/compose_util.php";
+    var caURL = "/plugins/compose.manager/include/Exec.php";
+    var compURL = "/plugins/compose.manager/include/ComposeUtil.php";
     var aceTheme = <?php echo (in_array($theme, ['black', 'gray']) ? json_encode('ace/theme/tomorrow_night') : json_encode('ace/theme/tomorrow')); ?>;
     var aceBasePath = <?php echo json_encode($acePath); ?>;
     const icon_label = <?php echo json_encode($docker_label_icon); ?>;
@@ -494,7 +494,7 @@ function composeLoadlist() {
                 showComposeSpinner('Loading stack list...');
             }, 500);
 
-            $.get('/plugins/compose.manager/php/compose_list.php')
+            $.get('/plugins/compose.manager/include/ComposeList.php')
             .done(function(data) {
                 clearTimeout(composeTimers.load);
 
@@ -675,8 +675,8 @@ function initStackListUI() {
 
     // Load external stylesheets (non-critical styles — critical ones are inline above)
     (function() {
-        var base = '<?php autov("/plugins/compose.manager/styles/comboButton.css"); ?>';
-        var editor = '<?php autov("/plugins/compose.manager/styles/editorModal.css"); ?>';
+        var base = '<?php autov("/plugins/compose.manager/sheets/ComboButton.css"); ?>';
+        var editor = '<?php autov("/plugins/compose.manager/sheets/EditorModal.css"); ?>';
         if (!$('link[href="' + base + '"]').length)
             $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', base));
         if (!$('link[href="' + editor + '"]').length)
@@ -1896,7 +1896,7 @@ function renderStackAggregates() {
                 }
 
                 composeStackIndex.forEach(function(entry) {
-                    // Primary: short IDs baked into the row by compose_list.php
+                    // Primary: short IDs baked into the row by ComposeList.php
                     var idList = entry.containerIds.slice();
 
                     // Fallback: if the detail panel was expanded, stackContainersCache
diff --git a/source/compose.manager/php/compose_util.php b/source/compose.manager/include/ComposeUtil.php
similarity index 94%
rename from source/compose.manager/php/compose_util.php
rename to source/compose.manager/include/ComposeUtil.php
index 4396ad18..c6d9861e 100644
--- a/source/compose.manager/php/compose_util.php
+++ b/source/compose.manager/include/ComposeUtil.php
@@ -4,10 +4,10 @@
  * Compose Util - AJAX Action Handler for Compose Manager
  *
  * Handles compose actions like up, down, pull, etc.
- * Functions are defined in compose_util_functions.php for testability.
+ * Functions are defined in Helpers.php for testability.
  */
 
-require_once("/usr/local/emhttp/plugins/compose.manager/php/compose_util_functions.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Helpers.php");
 
 $background = isset($_POST['background']) && $_POST['background'] == '1';
 
@@ -108,7 +108,7 @@
             // Wait for ttyd to create the socket (up to 2s) to avoid 502
             waitForTtydSocket($socketName);
 
-            echo "/plugins/compose.manager/php/show_ttyd.php?socket=" . urlencode($socketName);
+            echo "/plugins/compose.manager/include/ShowTtyd.php?socket=" . urlencode($socketName);
         }
         break;
 }
diff --git a/source/compose.manager/php/dashboard_stacks.php b/source/compose.manager/include/DashboardStacks.php
similarity index 96%
rename from source/compose.manager/php/dashboard_stacks.php
rename to source/compose.manager/include/DashboardStacks.php
index f5398422..027e59b9 100644
--- a/source/compose.manager/php/dashboard_stacks.php
+++ b/source/compose.manager/include/DashboardStacks.php
@@ -6,8 +6,8 @@
 
 $plugin_root = "/usr/local/emhttp/plugins/compose.manager";
 
-require_once("$plugin_root/php/defines.php");
-require_once("$plugin_root/php/util.php");
+require_once("$plugin_root/include/Defines.php");
+require_once("$plugin_root/include/Util.php");
 
 $summary = [
     'total' => 0,
diff --git a/source/compose.manager/php/defines.php b/source/compose.manager/include/Defines.php
similarity index 100%
rename from source/compose.manager/php/defines.php
rename to source/compose.manager/include/Defines.php
diff --git a/source/compose.manager/php/exec.php b/source/compose.manager/include/Exec.php
similarity index 99%
rename from source/compose.manager/php/exec.php
rename to source/compose.manager/include/Exec.php
index 8b4ba44d..728d5b24 100644
--- a/source/compose.manager/php/exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
-require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
-require_once("/usr/local/emhttp/plugins/compose.manager/php/exec_functions.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/ExecHelpers.php");
 require_once("/usr/local/emhttp/plugins/dynamix/include/Wrappers.php");
 
 /**
@@ -1232,7 +1232,7 @@ function getPostScript(): string
         break;
 
     case 'createBackup':
-        require_once("/usr/local/emhttp/plugins/compose.manager/php/backup_functions.php");
+        require_once("/usr/local/emhttp/plugins/compose.manager/include/BackupFunctions.php");
         clientDebug("[backup] Manual backup starting...", null, 'daemon', 'info');
         $result = createBackup();
         if ($result['result'] === 'success') {
@@ -1244,14 +1244,14 @@ function getPostScript(): string
         break;
 
     case 'listBackups':
-        require_once("/usr/local/emhttp/plugins/compose.manager/php/backup_functions.php");
+        require_once("/usr/local/emhttp/plugins/compose.manager/include/BackupFunctions.php");
         $directory = isset($_POST['directory']) && $_POST['directory'] !== '' ? trim($_POST['directory']) : null;
         $archives = listBackupArchives($directory);
         echo json_encode(['result' => 'success', 'archives' => $archives]);
         break;
 
     case 'uploadBackup':
-        require_once("/usr/local/emhttp/plugins/compose.manager/php/backup_functions.php");
+        require_once("/usr/local/emhttp/plugins/compose.manager/include/BackupFunctions.php");
         if (!isset($_FILES['file']) || $_FILES['file']['error'] !== UPLOAD_ERR_OK) {
             $errMsg = 'No file uploaded.';
             if (isset($_FILES['file'])) {
@@ -1301,7 +1301,7 @@ function getPostScript(): string
         break;
 
     case 'readManifest':
-        require_once("/usr/local/emhttp/plugins/compose.manager/php/backup_functions.php");
+        require_once("/usr/local/emhttp/plugins/compose.manager/include/BackupFunctions.php");
         $archive = isset($_POST['archive']) ? trim($_POST['archive']) : '';
         $directory = isset($_POST['directory']) && $_POST['directory'] !== '' ? trim($_POST['directory']) : null;
         if (empty($archive)) {
@@ -1314,7 +1314,7 @@ function getPostScript(): string
         break;
 
     case 'restoreBackup':
-        require_once("/usr/local/emhttp/plugins/compose.manager/php/backup_functions.php");
+        require_once("/usr/local/emhttp/plugins/compose.manager/include/BackupFunctions.php");
         $archive = isset($_POST['archive']) ? basename(trim($_POST['archive'])) : '';
         $stacks = isset($_POST['stacks']) ? $_POST['stacks'] : '';
         if (is_string($stacks)) {
@@ -1344,7 +1344,7 @@ function getPostScript(): string
         break;
 
     case 'deleteBackup':
-        require_once("/usr/local/emhttp/plugins/compose.manager/php/backup_functions.php");
+        require_once("/usr/local/emhttp/plugins/compose.manager/include/BackupFunctions.php");
         $archive = isset($_POST['archive']) ? trim($_POST['archive']) : '';
         if (empty($archive)) {
             echo json_encode(['result' => 'error', 'message' => 'No archive specified.']);
@@ -1361,7 +1361,7 @@ function getPostScript(): string
         break;
 
     case 'updateBackupCron':
-        require_once("/usr/local/emhttp/plugins/compose.manager/php/backup_functions.php");
+        require_once("/usr/local/emhttp/plugins/compose.manager/include/BackupFunctions.php");
         updateBackupCron();
         echo json_encode(['result' => 'success', 'message' => 'Backup schedule updated.']);
         break;
@@ -1419,7 +1419,7 @@ function getPostScript(): string
         file_put_contents($cfgFile, implode("\n", $lines) . "\n");
 
         // Update cron job and log the action
-        require_once("/usr/local/emhttp/plugins/compose.manager/php/backup_functions.php");
+        require_once("/usr/local/emhttp/plugins/compose.manager/include/BackupFunctions.php");
         updateBackupCron();
 
         // Log the scheduler status
diff --git a/source/compose.manager/php/exec_functions.php b/source/compose.manager/include/ExecHelpers.php
similarity index 93%
rename from source/compose.manager/php/exec_functions.php
rename to source/compose.manager/include/ExecHelpers.php
index 6774c862..e4bed358 100644
--- a/source/compose.manager/php/exec_functions.php
+++ b/source/compose.manager/include/ExecHelpers.php
@@ -2,8 +2,8 @@
 /**
  * Exec Functions for Compose Manager
  * 
- * Contains utility functions used by exec.php for AJAX action handling.
- * Separated from exec.php to allow unit testing without triggering the switch statement.
+ * Contains utility functions used by Exec.php for AJAX action handling.
+ * Separated from Exec.php to allow unit testing without triggering the switch statement.
  */
 
 /**
@@ -77,6 +77,6 @@ function sanitizeFolderName($stackName) {
 function buildComposeArgs(string $stack): array {
     global $compose_root;
 
-    require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
+    require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
     return StackInfo::fromProject($compose_root, $stack)->buildComposeArgs();
 }
diff --git a/source/compose.manager/php/compose_util_functions.php b/source/compose.manager/include/Helpers.php
similarity index 96%
rename from source/compose.manager/php/compose_util_functions.php
rename to source/compose.manager/include/Helpers.php
index dd805ea2..dca7935b 100644
--- a/source/compose.manager/php/compose_util_functions.php
+++ b/source/compose.manager/include/Helpers.php
@@ -3,12 +3,12 @@
 /**
  * Compose Util Functions for Compose Manager
  *
- * Contains utility functions used by compose_util.php for compose command execution.
- * Separated from compose_util.php to allow unit testing without triggering the switch statement.
+ * Contains utility functions used by ComposeUtil.php for compose command execution.
+ * Separated from ComposeUtil.php to allow unit testing without triggering the switch statement.
  */
 
-require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
-require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
 require_once("/usr/local/emhttp/plugins/dynamix/include/Wrappers.php");
 
 /**
@@ -179,7 +179,7 @@ function echoComposeCommand($action, $recreate = false, $background = false)
             $composeCommandStr = join(" ", $composeCommandEscaped);
             execComposeCommandInTTY($composeCommandStr, $debug, $logFile);
             clientDebug("Executing command in ttyd: " . $composeCommandStr, ['command' => $composeCommandStr], 'daemon', 'debug');
-            $composeCommand = "/plugins/compose.manager/php/show_ttyd.php" . ($action !== 'logs' ? "?done=1" : "");
+            $composeCommand = "/plugins/compose.manager/include/ShowTtyd.php" . ($action !== 'logs' ? "?done=1" : "");
             echo $composeCommand;
         } else {
             $i = 0;
@@ -331,7 +331,7 @@ function echoComposeCommandMultiple($action, $paths, $background = false)
         $ttydCommand = "bash " . escapeshellarg($tmpScript);
         execComposeCommandInTTY($ttydCommand, $debug);
         clientDebug("Multi-stack script created: " . $tmpScript, null, 'daemon', 'debug');
-        echo "/plugins/compose.manager/php/show_ttyd.php?done=1";
+        echo "/plugins/compose.manager/include/ShowTtyd.php?done=1";
     } else {
         // For nchan/traditional output, create a temporary bash script that runs all commands
         $tmpScript = "/tmp/compose_multi_" . uniqid() . ".sh";
diff --git a/source/compose.manager/php/icon.php b/source/compose.manager/include/Icon.php
similarity index 95%
rename from source/compose.manager/php/icon.php
rename to source/compose.manager/include/Icon.php
index 80da10d0..9786a585 100644
--- a/source/compose.manager/php/icon.php
+++ b/source/compose.manager/include/Icon.php
@@ -4,7 +4,7 @@
  */
 
 $docroot = $_SERVER['DOCUMENT_ROOT'] ?? '/usr/local/emhttp';
-require_once "$docroot/plugins/compose.manager/php/defines.php";
+require_once "$docroot/plugins/compose.manager/include/Defines.php";
 
 $project = $_GET['project'] ?? '';
 
diff --git a/source/compose.manager/php/show_ttyd.php b/source/compose.manager/include/ShowTtyd.php
similarity index 98%
rename from source/compose.manager/php/show_ttyd.php
rename to source/compose.manager/include/ShowTtyd.php
index 7c7cd4d4..7edf811a 100644
--- a/source/compose.manager/php/show_ttyd.php
+++ b/source/compose.manager/include/ShowTtyd.php
@@ -1,5 +1,5 @@
 <?php
-require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
 
 // Allow callers to override the socket name via query parameter
 // (used by per-container console/logs). Sanitise to alphanumeric + _ and -.
diff --git a/source/compose.manager/php/util.php b/source/compose.manager/include/Util.php
similarity index 99%
rename from source/compose.manager/php/util.php
rename to source/compose.manager/include/Util.php
index 48fe1d3f..6de1b824 100644
--- a/source/compose.manager/php/util.php
+++ b/source/compose.manager/include/Util.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
+require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
 require_once("/usr/local/emhttp/plugins/dynamix/include/Wrappers.php");
 
 /**
diff --git a/source/compose.manager/javascript/common.js b/source/compose.manager/javascript/common.js
index e2eb10e1..aaaa5fe9 100644
--- a/source/compose.manager/javascript/common.js
+++ b/source/compose.manager/javascript/common.js
@@ -2,7 +2,7 @@
 // Use `getConfig().then(cfg => { ... })` to access configuration.
 var _configCache = null;
 var _configPromise = null;
-var caURL = "/plugins/compose.manager/php/exec.php";
+var caURL = "/plugins/compose.manager/include/Exec.php";
 
 // Shared HTML/attribute escape helpers (namespaced to avoid global collisions with other plugins)
 function composeEscapeHtml(text) {
diff --git a/source/compose.manager/scripts/backup_cron.sh b/source/compose.manager/scripts/backup_cron.sh
index 76e57f58..28884cf7 100644
--- a/source/compose.manager/scripts/backup_cron.sh
+++ b/source/compose.manager/scripts/backup_cron.sh
@@ -10,8 +10,8 @@ logger -t "$LOG_TAG" "[backup] Scheduled backup starting..."
 # Execute the backup via the PHP backend
 result=$(php -r "
   \$_POST = ['action' => 'createBackup'];
-  require_once('${PLUGIN_ROOT}/php/defines.php');
-  require_once('${PLUGIN_ROOT}/php/backup_functions.php');
+  require_once('${PLUGIN_ROOT}/include/Defines.php');
+  require_once('${PLUGIN_ROOT}/include/BackupFunctions.php');
   \$r = createBackup();
   echo json_encode(\$r);
 ")
diff --git a/source/compose.manager/styles/comboButton.css b/source/compose.manager/sheets/ComboButton.css
similarity index 99%
rename from source/compose.manager/styles/comboButton.css
rename to source/compose.manager/sheets/ComboButton.css
index 12502b81..2e59b32a 100644
--- a/source/compose.manager/styles/comboButton.css
+++ b/source/compose.manager/sheets/ComboButton.css
@@ -204,7 +204,7 @@
 
   /* ── Stack table structural rules ──
    Critical layout rules (table-layout, column widths, advanced/basic
-   visibility) are inlined in compose_manager_main.php for instant
+   visibility) are inlined in ComposeManager.php for instant
    availability.  The rules below are supplemental / non-critical. */
 
   /* Update column links - ensure pointer cursor */
diff --git a/source/compose.manager/styles/editorModal.css b/source/compose.manager/sheets/EditorModal.css
similarity index 100%
rename from source/compose.manager/styles/editorModal.css
rename to source/compose.manager/sheets/EditorModal.css
diff --git a/source/pkg_build.sh b/source/pkg_build.sh
index f56fd32e..1dca8de2 100755
--- a/source/pkg_build.sh
+++ b/source/pkg_build.sh
@@ -73,7 +73,7 @@ cd $tmpdir || exit 1
 echo "Marking plugin scripts and PHP executable..."
 run_quiet chmod -R +x "$tmpdir/usr/local/emhttp/plugins/compose.manager/event/"
 run_quiet chmod -R +x "$tmpdir/usr/local/emhttp/plugins/compose.manager/scripts/"
-run_quiet chmod -R +x "$tmpdir/usr/local/emhttp/plugins/compose.manager/php/"
+run_quiet chmod -R +x "$tmpdir/usr/local/emhttp/plugins/compose.manager/include/"
 
 echo "Downloading Docker Compose CLI plugin v${COMPOSE_VERSION}..."
 run_quiet wget $(wget_args) "https://github.com/docker/compose/releases/download/v${COMPOSE_VERSION}/docker-compose-linux-x86_64"
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index bf7c30ee..00181c9f 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -35,16 +35,17 @@ function clientDebug($message, $data = null, $type = 'daemon', $level = 'info'):
 use PluginTests\Mocks\FunctionMocks;
 
 // Initialize the plugin test environment
-// This auto-maps all .php files from source/compose.manager/php/ to Unraid paths
+// This auto-maps all .php files from source/compose.manager/include/ to Unraid paths
 PluginBootstrap::init(
     'compose.manager',
-    __DIR__ . '/../source/compose.manager/php',
+    __DIR__ . '/../source/compose.manager/include',
     [
         'config' => [
             'PROJECTS_FOLDER' => sys_get_temp_dir() . '/compose_test_projects',
             'DEBUG_TO_LOG' => 'false',
             'OUTPUTSTYLE' => 'nchan',
         ],
+        'subPath' => 'include',
     ]
 );
 
diff --git a/tests/unit/AutoupdateRunnerTest.php b/tests/unit/AutoupdateRunnerTest.php
index bc9e5a0a..794c0768 100644
--- a/tests/unit/AutoupdateRunnerTest.php
+++ b/tests/unit/AutoupdateRunnerTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for autoupdate_runner.php
+ * Tests for AutoUpdateRunner.php
  */
 declare(strict_types=1);
 namespace ComposeManager\Tests;
@@ -18,15 +18,15 @@ protected function setUp(): void
         if (!is_dir($compose_root)) mkdir($compose_root, 0755, true);
         // ensure scripts dir
         if (!is_dir($plugin_root . 'scripts')) mkdir($plugin_root . 'scripts', 0755, true);
-        // ensure php helper path and create shim
-        if (!is_dir($plugin_root . 'php')) mkdir($plugin_root . 'php', 0755, true);
+        // ensure include helper path and create shim
+        if (!is_dir($plugin_root . 'include')) mkdir($plugin_root . 'include', 0755, true);
         $shim = <<<'PHP'
 <?php
 $marker = getenv('AUTOTEST_MARKER');
 if ($marker) file_put_contents($marker, "RAN\n");
 exit(0);
 PHP;
-        file_put_contents($plugin_root . 'php/sh_wrapper.php', $shim);
+        file_put_contents($plugin_root . 'include/sh_wrapper.php', $shim);
         // redirect cron writes to plugin root in tests (not strictly needed here but harmless)
         putenv('COMPOSE_MANAGER_CRON_DIR=' . $plugin_root);
         // ensure autoupdate config file resolves to plugin_root in tests
@@ -78,11 +78,11 @@ public function testRunnerTriggersScriptForDueStack(): void
 
         // configure shim so the runner will invoke our PHP wrapper instead of a real sh
         putenv('AUTOTEST_MARKER=' . $marker);
-        $wrapper = $plugin_root . 'php/sh_wrapper.php';
+        $wrapper = $plugin_root . 'include/sh_wrapper.php';
         putenv('COMPOSE_MANAGER_SH=' . PHP_BINARY . ' ' . escapeshellarg($wrapper));
 
         // Run runner (include directly)
-        include $plugin_root . 'php/autoupdate_runner.php';
+        include $plugin_root . 'include/AutoUpdateRunner.php';
 
         // The runner backgrounds the script; wait briefly
         sleep(1);
diff --git a/tests/unit/AutoupdateTest.php b/tests/unit/AutoupdateTest.php
index 9907996d..6c215254 100644
--- a/tests/unit/AutoupdateTest.php
+++ b/tests/unit/AutoupdateTest.php
@@ -47,7 +47,7 @@ public function testGetConfigWhenMissingReturnsEmptyObject(): void
     {
         $_POST = ['action' => 'getConfig'];
         ob_start();
-        include '/usr/local/emhttp/plugins/compose.manager/php/autoupdate.php';
+        include '/usr/local/emhttp/plugins/compose.manager/include/AutoUpdate.php';
         $out = ob_get_clean();
         $json = json_decode($out, true);
         $this->assertIsArray($json);
@@ -58,7 +58,7 @@ public function testGetConfigWhenMissingReturnsEmptyObject(): void
     public function testRunNowMissingPathReturnsError(): void
     {
         $_POST = ['action' => 'runNow'];
-        ob_start(); include '/usr/local/emhttp/plugins/compose.manager/php/autoupdate.php'; $out = ob_get_clean();
+        ob_start(); include '/usr/local/emhttp/plugins/compose.manager/include/AutoUpdate.php'; $out = ob_get_clean();
         $r = json_decode($out, true);
         $this->assertArrayHasKey('error', $r);
         $_POST = [];
@@ -86,7 +86,7 @@ public function testRunNowExecutesScript(): void
         putenv('COMPOSE_MANAGER_SH=' . PHP_BINARY . ' ' . escapeshellarg($wrapper));
 
         $_POST = ['action' => 'runNow', 'path' => $tmp];
-        ob_start(); include '/usr/local/emhttp/plugins/compose.manager/php/autoupdate.php'; $out = ob_get_clean();
+        ob_start(); include '/usr/local/emhttp/plugins/compose.manager/include/AutoUpdate.php'; $out = ob_get_clean();
         $r = json_decode($out, true);
         // rc should be 0 for our stub
         $this->assertEquals(0, $r['rc']);
@@ -111,7 +111,7 @@ public function testInstallCronUsesAbsolutePhpBinary(): void
 
         $_POST = ['action' => 'installCron'];
         ob_start();
-        include '/usr/local/emhttp/plugins/compose.manager/php/autoupdate.php';
+        include '/usr/local/emhttp/plugins/compose.manager/include/AutoUpdate.php';
         $out = ob_get_clean();
 
         $response = json_decode($out, true);
@@ -122,7 +122,7 @@ public function testInstallCronUsesAbsolutePhpBinary(): void
 
         $line = file_get_contents($cronFile);
         $this->assertStringContainsString('/usr/bin/php', $line);
-        $this->assertStringContainsString('autoupdate_runner.php', $line);
+        $this->assertStringContainsString('AutoUpdateRunner.php', $line);
 
         if (is_file($cronFile)) {
             unlink($cronFile);
diff --git a/tests/unit/BackupFunctionsTest.php b/tests/unit/BackupFunctionsTest.php
index ebcad184..d092ccc7 100644
--- a/tests/unit/BackupFunctionsTest.php
+++ b/tests/unit/BackupFunctionsTest.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * Unit Tests for backup_functions.php
+ * Unit Tests for BackupFunctions.php
  * 
- * Tests the backup/restore helper functions in source/compose.manager/php/backup_functions.php.
+ * Tests the backup/restore helper functions in source/compose.manager/include/BackupFunctions.php.
  * These functions handle creating, listing, restoring, and managing backup archives.
  */
 
@@ -14,10 +14,10 @@
 use PluginTests\TestCase;
 use PluginTests\Mocks\FunctionMocks;
 
-// Load backup_functions.php only if not already loaded (avoids logger() redeclaration
-// conflict with compose_util_functions.php which also defines logger()).
+// Load BackupFunctions.php only if not already loaded (avoids logger() redeclaration
+// conflict with Helpers.php which also defines logger()).
 if (!function_exists('getBackupDestination')) {
-    require_once '/usr/local/emhttp/plugins/compose.manager/php/backup_functions.php';
+    require_once '/usr/local/emhttp/plugins/compose.manager/include/BackupFunctions.php';
 }
 
 class BackupFunctionsTest extends TestCase
diff --git a/tests/unit/ComposeFilterTest.php b/tests/unit/ComposeFilterTest.php
index 24132022..432a8223 100644
--- a/tests/unit/ComposeFilterTest.php
+++ b/tests/unit/ComposeFilterTest.php
@@ -7,7 +7,7 @@
 use PluginTests\TestCase;
 
 // Include util.php (contains hide_compose_from_docker())
-include_once '/usr/local/emhttp/plugins/compose.manager/php/util.php';
+include_once '/usr/local/emhttp/plugins/compose.manager/include/Util.php';
 
 class ComposeFilterTest extends TestCase
 {
diff --git a/tests/unit/ComposeListHtmlTest.php b/tests/unit/ComposeListHtmlTest.php
index d6b69b04..7623b920 100644
--- a/tests/unit/ComposeListHtmlTest.php
+++ b/tests/unit/ComposeListHtmlTest.php
@@ -3,7 +3,7 @@
 /**
  * Unit Tests for Compose List HTML Structure
  * 
- * Tests the HTML output structure in compose_list.php, verifying column classes,
+ * Tests the HTML output structure in ComposeList.php, verifying column classes,
  * update column selector, expand arrow spacing, and autostart cell class.
  * These are source-level tests that verify the PHP template markup.
  */
@@ -21,8 +21,8 @@ class ComposeListHtmlTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->listPagePath = __DIR__ . '/../../source/compose.manager/php/compose_list.php';
-        $this->assertFileExists($this->listPagePath, 'compose_list.php must exist');
+        $this->listPagePath = __DIR__ . '/../../source/compose.manager/include/ComposeList.php';
+        $this->assertFileExists($this->listPagePath, 'ComposeList.php must exist');
     }
 
     private function getPageSource(): string
diff --git a/tests/unit/ComposeManagerMainSourceTest.php b/tests/unit/ComposeManagerMainSourceTest.php
index fa38ad3d..e4dacec3 100644
--- a/tests/unit/ComposeManagerMainSourceTest.php
+++ b/tests/unit/ComposeManagerMainSourceTest.php
@@ -7,7 +7,7 @@
 use PluginTests\TestCase;
 
 /**
- * Source-level tests for compose_manager_main.php.
+ * Source-level tests for ComposeManager.php.
  *
  * These verify key CPU/memory load logic markers in the page source so
  * regressions are caught even when the page cannot be executed in unit tests.
@@ -19,8 +19,8 @@ class ComposeManagerMainSourceTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->mainPagePath = __DIR__ . '/../../source/compose.manager/php/compose_manager_main.php';
-        $this->assertFileExists($this->mainPagePath, 'compose_manager_main.php must exist');
+        $this->mainPagePath = __DIR__ . '/../../source/compose.manager/include/ComposeManager.php';
+        $this->assertFileExists($this->mainPagePath, 'ComposeManager.php must exist');
     }
 
     private function getPageSource(): string
diff --git a/tests/unit/ComposeUtilTest.php b/tests/unit/ComposeUtilTest.php
index bec6df52..6da315d6 100644
--- a/tests/unit/ComposeUtilTest.php
+++ b/tests/unit/ComposeUtilTest.php
@@ -3,7 +3,7 @@
 /**
  * Unit Tests for Compose Utility Functions (REAL SOURCE)
  * 
- * Tests the actual source: source/compose.manager/php/compose_util_functions.php
+ * Tests the actual source: source/compose.manager/include/Helpers.php
  * Functions are now in a separate file for testability.
  */
 
@@ -16,15 +16,15 @@
 use PluginTests\Mocks\FunctionMocks;
 
 // Load the functions file directly (no switch statement)
-require_once '/usr/local/emhttp/plugins/compose.manager/php/compose_util_functions.php';
-require_once '/usr/local/emhttp/plugins/compose.manager/php/util.php';
-require_once '/usr/local/emhttp/plugins/compose.manager/php/defines.php';
-require_once '/usr/local/emhttp/plugins/compose.manager/php/exec_functions.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Helpers.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Util.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Defines.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/ExecHelpers.php';
 
 /**
  * Tests for compose_util.php functions
  * 
- * Note: compose_util.php contains these functions:
+ * Note: ComposeUtil.php contains these functions:
  * - logger($string) - calls system logger
  * - execComposeCommandInTTY($cmd, $debug) - runs ttyd
  * - echoComposeCommand($action) - echoes compose command
diff --git a/tests/unit/ContainerInfoTest.php b/tests/unit/ContainerInfoTest.php
index b10d9006..50538e40 100644
--- a/tests/unit/ContainerInfoTest.php
+++ b/tests/unit/ContainerInfoTest.php
@@ -6,7 +6,7 @@
 
 use PluginTests\TestCase;
 
-require_once '/usr/local/emhttp/plugins/compose.manager/php/util.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Util.php';
 
 class ContainerInfoTest extends TestCase
 {
diff --git a/tests/unit/DashboardStacksTest.php b/tests/unit/DashboardStacksTest.php
index 8bc51eb0..0aff0764 100644
--- a/tests/unit/DashboardStacksTest.php
+++ b/tests/unit/DashboardStacksTest.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * Unit Tests for dashboard_stacks.php (REAL SOURCE)
+ * Unit Tests for DashboardStacks.php (REAL SOURCE)
  * 
- * Tests the dashboard tile data generation: source/compose.manager/php/dashboard_stacks.php
+ * Tests the dashboard tile data generation: source/compose.manager/include/DashboardStacks.php
  * This file returns JSON data for the compose manager dashboard tile.
  */
 
@@ -446,7 +446,7 @@ public function testCompleteSummaryJsonOutput(): void
      */
     public function testContentTypeForJsonResponse(): void
     {
-        // dashboard_stacks.php sets: header('Content-Type: application/json');
+        // DashboardStacks.php sets: header('Content-Type: application/json');
         $expectedHeader = 'Content-Type: application/json';
         
         // We can't actually test headers in unit tests, but we verify the format
diff --git a/tests/unit/DefinesTest.php b/tests/unit/DefinesTest.php
index f207ded6..6dadea1a 100644
--- a/tests/unit/DefinesTest.php
+++ b/tests/unit/DefinesTest.php
@@ -3,7 +3,7 @@
 /**
  * Unit Tests for defines.php
  * 
- * Tests the locate_compose_root() function in source/compose.manager/php/defines.php
+ * Tests the locate_compose_root() function in source/compose.manager/include/Defines.php
  */
 
 declare(strict_types=1);
@@ -14,7 +14,7 @@
 use PluginTests\Mocks\FunctionMocks;
 
 // Load the actual source file via stream wrapper
-require_once '/usr/local/emhttp/plugins/compose.manager/php/defines.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Defines.php';
 
 class DefinesTest extends TestCase
 {
diff --git a/tests/unit/DockerUpdateTest.php b/tests/unit/DockerUpdateTest.php
index 26014e3a..905414e4 100644
--- a/tests/unit/DockerUpdateTest.php
+++ b/tests/unit/DockerUpdateTest.php
@@ -15,7 +15,7 @@
 
 // Load the actual source file via stream wrapper using includeWithSwitch()
 // This safely includes exec.php which has a switch($_POST['action']) block
-includeWithSwitch('/usr/local/emhttp/plugins/compose.manager/php/exec.php');
+includeWithSwitch('/usr/local/emhttp/plugins/compose.manager/include/Exec.php');
 
 class DockerUpdateTest extends TestCase
 {
diff --git a/tests/unit/ExecActionsTest.php b/tests/unit/ExecActionsTest.php
index 56d722f7..f9153fb1 100644
--- a/tests/unit/ExecActionsTest.php
+++ b/tests/unit/ExecActionsTest.php
@@ -3,8 +3,8 @@
 /**
  * Unit Tests for exec.php Actions (REAL SOURCE)
  * 
- * Tests the AJAX action handlers in source/compose.manager/php/exec.php
- * Now that functions are in exec_functions.php, we can include exec.php
+ * Tests the AJAX action handlers in source/compose.manager/include/Exec.php
+ * Now that functions are in ExecHelpers.php, we can include Exec.php
  * multiple times to test different actions.
  * 
  * Note: Some tests use Linux commands (rm) and are skipped on Windows.
@@ -18,7 +18,7 @@
 use PluginTests\Mocks\FunctionMocks;
 
 
-require_once '/usr/local/emhttp/plugins/compose.manager/php/util.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Util.php';
 
 class ExecActionsTest extends TestCase
 {
@@ -85,7 +85,7 @@ private function executeAction(string $action, array $postData = []): string
         $_POST = array_merge(['action' => $action], $postData);
         
         ob_start();
-        include '/usr/local/emhttp/plugins/compose.manager/php/exec.php';
+        include '/usr/local/emhttp/plugins/compose.manager/include/Exec.php';
         $output = ob_get_clean();
         
         $_POST = [];
diff --git a/tests/unit/ExecFunctionsTest.php b/tests/unit/ExecFunctionsTest.php
index eeef5f49..442e903f 100644
--- a/tests/unit/ExecFunctionsTest.php
+++ b/tests/unit/ExecFunctionsTest.php
@@ -1,11 +1,11 @@
 <?php
 
 /**
- * Unit Tests for exec_functions.php (REAL SOURCE)
+ * Unit Tests for ExecHelpers.php (REAL SOURCE)
  * 
- * Tests the actual source functions from source/compose.manager/php/exec_functions.php
+ * Tests the actual source functions from source/compose.manager/include/ExecHelpers.php
  * 
- * exec_functions.php contains these functions:
+ * ExecHelpers.php contains these functions:
  * - getElement($element) - converts element name to safe HTML ID
  * - normalizeImageForUpdateCheck($image) - normalizes Docker image names for update checking
  * - sanitizeFolderName($stackName) - sanitizes stack names for folder creation
@@ -18,7 +18,7 @@
 use PluginTests\TestCase;
 
 // Load the actual source functions file directly (no switch statement to bypass)
-require_once '/usr/local/emhttp/plugins/compose.manager/php/exec_functions.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/ExecHelpers.php';
 
 /**
  * @covers ::getElement
diff --git a/tests/unit/IconTest.php b/tests/unit/IconTest.php
index 12a0261d..5d561663 100644
--- a/tests/unit/IconTest.php
+++ b/tests/unit/IconTest.php
@@ -3,7 +3,7 @@
 /**
  * Unit Tests for icon.php (REAL SOURCE)
  * 
- * Tests the icon serving endpoint: source/compose.manager/php/icon.php
+ * Tests the icon serving endpoint: source/compose.manager/include/Icon.php
  * This file serves project icons via GET requests.
  */
 
@@ -110,7 +110,7 @@ private function executeIconPhp(array $getParams = []): array
         $originalHeaders = [];
         
         try {
-            include '/usr/local/emhttp/plugins/compose.manager/php/icon.php';
+            include '/usr/local/emhttp/plugins/compose.manager/include/Icon.php';
         } catch (\Throwable $e) {
             // Icon.php uses exit(), catch any issues
         }
diff --git a/tests/unit/OverrideInfoTest.php b/tests/unit/OverrideInfoTest.php
index 4a9e4a2f..0e13a54a 100644
--- a/tests/unit/OverrideInfoTest.php
+++ b/tests/unit/OverrideInfoTest.php
@@ -7,7 +7,7 @@
 use PluginTests\TestCase;
 
 // Load the actual source file via stream wrapper
-require_once '/usr/local/emhttp/plugins/compose.manager/php/util.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Util.php';
 
 class OverrideInfoTest extends TestCase
 {
diff --git a/tests/unit/StackInfoSourceTest.php b/tests/unit/StackInfoSourceTest.php
index 3128a42b..6bf2336d 100644
--- a/tests/unit/StackInfoSourceTest.php
+++ b/tests/unit/StackInfoSourceTest.php
@@ -13,8 +13,8 @@ class StackInfoSourceTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->utilPath = __DIR__ . '/../../source/compose.manager/php/util.php';
-        $this->assertFileExists($this->utilPath, 'util.php must exist');
+        $this->utilPath = __DIR__ . '/../../source/compose.manager/include/Util.php';
+        $this->assertFileExists($this->utilPath, 'Util.php must exist');
     }
 
     private function getSource(): string
diff --git a/tests/unit/StackInfoTest.php b/tests/unit/StackInfoTest.php
index 986f5515..a6fc3fa4 100644
--- a/tests/unit/StackInfoTest.php
+++ b/tests/unit/StackInfoTest.php
@@ -6,7 +6,7 @@
 
 use PluginTests\TestCase;
 
-require_once '/usr/local/emhttp/plugins/compose.manager/php/util.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Util.php';
 
 class StackInfoTest extends TestCase
 {
diff --git a/tests/unit/UtilTest.php b/tests/unit/UtilTest.php
index cb41f067..79e27098 100644
--- a/tests/unit/UtilTest.php
+++ b/tests/unit/UtilTest.php
@@ -3,7 +3,7 @@
 /**
  * Unit Tests for Compose Manager Utility Functions (REAL SOURCE)
  * 
- * Tests the actual source file: source/compose.manager/php/util.php
+ * Tests the actual source file: source/compose.manager/include/Util.php
  * Uses stream wrapper to redirect Unraid paths to local files.
  */
 
@@ -14,7 +14,7 @@
 use PluginTests\TestCase;
 
 // Load the actual source file via stream wrapper
-require_once '/usr/local/emhttp/plugins/compose.manager/php/util.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Util.php';
 
 class UtilTest extends TestCase
 {