diff --git a/app/Console/Commands/QueueSubmissions.php b/app/Console/Commands/QueueSubmissions.php
index 844b9bc2e5..a696ce53df 100644
--- a/app/Console/Commands/QueueSubmissions.php
+++ b/app/Console/Commands/QueueSubmissions.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Jobs\ProcessSubmission;
-use App\Services\AuthTokenService;
+use App\Utils\AuthTokenUtil;
 use CDash\Model\Project;
 
 use Illuminate\Console\Command;
@@ -88,7 +88,7 @@ private function queueFile($inboxFile)
                 return;
             }
             $len = $end - $begin;
-            if (!AuthTokenService::checkToken(substr($filename, $begin, $len), $project->Id)) {
+            if (!AuthTokenUtil::checkToken(substr($filename, $begin, $len), $project->Id)) {
                 \Storage::move("inbox/{$filename}", "failed/{$filename}");
                 echo "Invalid authentication token for $filename\n";
                 return;
diff --git a/app/Http/Controllers/AbstractBuildController.php b/app/Http/Controllers/AbstractBuildController.php
index 4b154b449f..fa4e24cd8c 100644
--- a/app/Http/Controllers/AbstractBuildController.php
+++ b/app/Http/Controllers/AbstractBuildController.php
@@ -1,7 +1,7 @@
 <?php
 namespace App\Http\Controllers;
 
-use App\Services\TestingDay;
+use App\Utils\TestingDay;
 use CDash\Model\Build;
 use Illuminate\View\View;
 
diff --git a/app/Http/Controllers/AbstractProjectController.php b/app/Http/Controllers/AbstractProjectController.php
index eea0b73115..4a135672c5 100644
--- a/app/Http/Controllers/AbstractProjectController.php
+++ b/app/Http/Controllers/AbstractProjectController.php
@@ -1,7 +1,7 @@
 <?php
 namespace App\Http\Controllers;
 
-use App\Services\TestingDay;
+use App\Utils\TestingDay;
 use CDash\Model\Project;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\View\View;
diff --git a/app/Http/Controllers/AuthTokenController.php b/app/Http/Controllers/AuthTokenController.php
index 8668102874..5c27ab8885 100644
--- a/app/Http/Controllers/AuthTokenController.php
+++ b/app/Http/Controllers/AuthTokenController.php
@@ -5,7 +5,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\AuthToken;
-use App\Services\AuthTokenService;
+use App\Utils\AuthTokenUtil;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\View\View;
@@ -25,7 +25,7 @@ public function manage(): View
      */
     public function fetchAll(): JsonResponse
     {
-        $token_array = AuthTokenService::getAllTokens();
+        $token_array = AuthTokenUtil::getAllTokens();
         $token_map = [];
         foreach ($token_array as $token) {
             $token_map[$token['hash']] = $token;
@@ -55,7 +55,7 @@ public function createToken(Request $request): JsonResponse
         }
 
         try {
-            $gen_auth_token = AuthTokenService::generateToken(
+            $gen_auth_token = AuthTokenUtil::generateToken(
                 Auth::id(),
                 $projectid,
                 $request->input('scope'),
@@ -70,7 +70,7 @@ public function createToken(Request $request): JsonResponse
 
     public function deleteToken(string $token_hash): JsonResponse
     {
-        if (!AuthTokenService::deleteToken($token_hash, Auth::id())) {
+        if (!AuthTokenUtil::deleteToken($token_hash, Auth::id())) {
             return response()->json(['error' => 'Permissions error'], status: Response::HTTP_FORBIDDEN);
         }
         return response()->json('Token deleted');
diff --git a/app/Http/Controllers/BuildController.php b/app/Http/Controllers/BuildController.php
index d1285d7443..ef2c6cf443 100644
--- a/app/Http/Controllers/BuildController.php
+++ b/app/Http/Controllers/BuildController.php
@@ -3,8 +3,8 @@
 
 use App\Models\User;
 use App\Models\Build as EloquentBuild;
-use App\Services\PageTimer;
-use App\Services\TestingDay;
+use App\Utils\PageTimer;
+use App\Utils\TestingDay;
 use CDash\Database;
 use CDash\Model\Build;
 use CDash\Model\BuildConfigure;
diff --git a/app/Http/Controllers/BuildNoteController.php b/app/Http/Controllers/BuildNoteController.php
index f206a3989f..8968334cc3 100644
--- a/app/Http/Controllers/BuildNoteController.php
+++ b/app/Http/Controllers/BuildNoteController.php
@@ -4,8 +4,8 @@
 
 use App\Models\Build as EloquentBuild;
 use App\Models\Note;
-use App\Services\PageTimer;
-use App\Services\TestingDay;
+use App\Utils\PageTimer;
+use App\Utils\TestingDay;
 use CDash\Model\Build;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Http/Controllers/BuildPropertiesController.php b/app/Http/Controllers/BuildPropertiesController.php
index 84ca15c239..5090bece30 100644
--- a/app/Http/Controllers/BuildPropertiesController.php
+++ b/app/Http/Controllers/BuildPropertiesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 use CDash\Database;
 use DateInterval;
 use DateTime;
diff --git a/app/Http/Controllers/CoverageController.php b/app/Http/Controllers/CoverageController.php
index af189d7a95..1dabfb463e 100644
--- a/app/Http/Controllers/CoverageController.php
+++ b/app/Http/Controllers/CoverageController.php
@@ -2,8 +2,8 @@
 namespace App\Http\Controllers;
 
 use App\Models\User;
-use App\Services\PageTimer;
-use App\Services\TestingDay;
+use App\Utils\PageTimer;
+use App\Utils\TestingDay;
 use CDash\Config;
 use CDash\Database;
 use CDash\Model\Build;
diff --git a/app/Http/Controllers/DynamicAnalysisController.php b/app/Http/Controllers/DynamicAnalysisController.php
index fa9ee8b1ea..1c2782e27d 100644
--- a/app/Http/Controllers/DynamicAnalysisController.php
+++ b/app/Http/Controllers/DynamicAnalysisController.php
@@ -1,8 +1,8 @@
 <?php
 namespace App\Http\Controllers;
 
-use App\Services\PageTimer;
-use App\Services\TestingDay;
+use App\Utils\PageTimer;
+use App\Utils\TestingDay;
 use CDash\Model\DynamicAnalysis;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
diff --git a/app/Http/Controllers/ManageMeasurementsController.php b/app/Http/Controllers/ManageMeasurementsController.php
index 2576078ce4..92309e7c22 100644
--- a/app/Http/Controllers/ManageMeasurementsController.php
+++ b/app/Http/Controllers/ManageMeasurementsController.php
@@ -4,7 +4,7 @@
 
 use App\Models\Measurement;
 use App\Models\Project as EloquentProject;
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Gate;
 
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index edd40090c6..02cf14fc8d 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -4,7 +4,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 use CDash\Config;
 use CDash\Model\Project;
 use CDash\Model\Repository;
diff --git a/app/Http/Controllers/ProjectOverviewController.php b/app/Http/Controllers/ProjectOverviewController.php
index 1202724dfe..292df52eeb 100644
--- a/app/Http/Controllers/ProjectOverviewController.php
+++ b/app/Http/Controllers/ProjectOverviewController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php
index 7c03617b9c..8df16fd1ef 100644
--- a/app/Http/Controllers/SiteController.php
+++ b/app/Http/Controllers/SiteController.php
@@ -4,7 +4,7 @@
 
 use App\Models\Site;
 use App\Models\User;
-use App\Services\TestingDay;
+use App\Utils\TestingDay;
 use CDash\Database;
 use CDash\Model\Project;
 use Illuminate\Http\RedirectResponse;
diff --git a/app/Http/Controllers/SubProjectController.php b/app/Http/Controllers/SubProjectController.php
index 819a56613c..4a7ee3a0d8 100644
--- a/app/Http/Controllers/SubProjectController.php
+++ b/app/Http/Controllers/SubProjectController.php
@@ -4,7 +4,7 @@
 
 use App\Models\Banner;
 use App\Models\User;
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 use CDash\Model\SubProject;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
diff --git a/app/Http/Controllers/SubmissionController.php b/app/Http/Controllers/SubmissionController.php
index 7fbc0aeec2..9259805032 100644
--- a/app/Http/Controllers/SubmissionController.php
+++ b/app/Http/Controllers/SubmissionController.php
@@ -4,8 +4,8 @@
 
 use App\Jobs\ProcessSubmission;
 use App\Models\Site;
-use App\Services\AuthTokenService;
-use App\Services\UnparsedSubmissionProcessor;
+use App\Utils\AuthTokenUtil;
+use App\Utils\UnparsedSubmissionProcessor;
 use CDash\Model\Build;
 use CDash\Model\PendingSubmissions;
 use CDash\Model\Project;
@@ -75,8 +75,8 @@ private function submitProcess(): Response
         }
 
         // Get auth token (if any).
-        $authtoken = AuthTokenService::getBearerToken();
-        $authtoken_hash = $authtoken === null || $authtoken === '' ? '' : AuthTokenService::hashToken($authtoken);
+        $authtoken = AuthTokenUtil::getBearerToken();
+        $authtoken_hash = $authtoken === null || $authtoken === '' ? '' : AuthTokenUtil::hashToken($authtoken);
 
         // Save the incoming file in the inbox directory.
         $filename = "{$projectname}_-_{$authtoken_hash}_-_" . Str::uuid()->toString() . "_-_{$expected_md5}.xml";
@@ -115,7 +115,7 @@ private function submitProcess(): Response
         $this->project->CheckForTooManyBuilds();
 
         // Check for valid authentication token if this project requires one.
-        if ($this->project->AuthenticateSubmissions && !AuthTokenService::checkToken($authtoken_hash, $this->project->Id)) {
+        if ($this->project->AuthenticateSubmissions && !AuthTokenUtil::checkToken($authtoken_hash, $this->project->Id)) {
             Storage::delete("inbox/{$filename}");
             abort(Response::HTTP_FORBIDDEN, 'Invalid Token');
         } elseif (intval($this->project->Id) < 1) {
diff --git a/app/Http/Controllers/TestController.php b/app/Http/Controllers/TestController.php
index c351417515..fc199a2f9c 100644
--- a/app/Http/Controllers/TestController.php
+++ b/app/Http/Controllers/TestController.php
@@ -2,7 +2,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\BuildTest;
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 use CDash\Database;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 0c14eb4f83..744f1f23a8 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -2,8 +2,8 @@
 namespace App\Http\Controllers;
 
 use App\Models\User;
-use App\Services\AuthTokenService;
-use App\Services\PageTimer;
+use App\Utils\AuthTokenUtil;
+use App\Utils\PageTimer;
 use App\Validators\Password;
 use CDash\Config;
 use CDash\Database;
@@ -89,7 +89,7 @@ public function userPageContent(): JsonResponse
         }
         $response['projects'] = $projects_response;
 
-        $response['authtokens'] = AuthTokenService::getTokensForUser($userid);
+        $response['authtokens'] = AuthTokenUtil::getTokensForUser($userid);
         $response['allow_full_access_tokens'] = config('cdash.allow_full_access_tokens') === true;
         $response['allow_submit_only_tokens'] = config('cdash.allow_submit_only_tokens') === true;
 
diff --git a/app/Http/Controllers/UserStatisticsController.php b/app/Http/Controllers/UserStatisticsController.php
index 1f4838e68c..d16c314f9a 100644
--- a/app/Http/Controllers/UserStatisticsController.php
+++ b/app/Http/Controllers/UserStatisticsController.php
@@ -2,7 +2,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\User;
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 use Illuminate\Http\JsonResponse;
 
 final class UserStatisticsController extends AbstractProjectController
diff --git a/app/Http/Middleware/AuthenticateToken.php b/app/Http/Middleware/AuthenticateToken.php
index 452cdc0007..d2046cd46f 100644
--- a/app/Http/Middleware/AuthenticateToken.php
+++ b/app/Http/Middleware/AuthenticateToken.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Services\AuthTokenService;
+use App\Utils\AuthTokenUtil;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -19,7 +19,7 @@ class AuthenticateToken
      */
     public function handle(Request $request, Closure $next)
     {
-        $user_id = AuthTokenService::getUserIdFromRequest();
+        $user_id = AuthTokenUtil::getUserIdFromRequest();
         if ($user_id !== null) {
             Auth::loginUsingId($user_id);
         }
diff --git a/app/Jobs/ProcessSubmission.php b/app/Jobs/ProcessSubmission.php
index 75b5354134..e5e3d69729 100644
--- a/app/Jobs/ProcessSubmission.php
+++ b/app/Jobs/ProcessSubmission.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Services\UnparsedSubmissionProcessor;
+use App\Utils\UnparsedSubmissionProcessor;
 use App\Models\SuccessfulJob;
 
 use BuildPropertiesJSONHandler;
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index f89d523954..c71e1266db 100755
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -7,7 +7,7 @@
 use App\Models\Test;
 use App\Models\TestImage;
 use App\Models\User;
-use App\Services\ProjectPermissions;
+use App\Utils\ProjectPermissions;
 use CDash\Model\Image;
 use CDash\Model\Project;
 use Illuminate\Auth\Access\Response;
diff --git a/app/Services/AuthTokenService.php b/app/Utils/AuthTokenUtil.php
similarity index 99%
rename from app/Services/AuthTokenService.php
rename to app/Utils/AuthTokenUtil.php
index 155b64f68f..ce90cf4497 100644
--- a/app/Services/AuthTokenService.php
+++ b/app/Utils/AuthTokenUtil.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Utils;
 
 use App\Models\AuthToken;
 use App\Models\User;
@@ -16,7 +16,7 @@
 use Illuminate\Support\Facades\Auth;
 use RuntimeException;
 
-class AuthTokenService
+class AuthTokenUtil
 {
     /**
      * Contract: we assume that $user_id has already been validated and blindly create a token
diff --git a/app/Services/NoteCreator.php b/app/Utils/NoteCreator.php
similarity index 98%
rename from app/Services/NoteCreator.php
rename to app/Utils/NoteCreator.php
index 1395ebda64..0a96130f70 100755
--- a/app/Services/NoteCreator.php
+++ b/app/Utils/NoteCreator.php
@@ -14,7 +14,7 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
-namespace App\Services;
+namespace App\Utils;
 
 use App\Models\Note;
 
diff --git a/app/Services/PageTimer.php b/app/Utils/PageTimer.php
similarity index 97%
rename from app/Services/PageTimer.php
rename to app/Utils/PageTimer.php
index e9630310ea..85fab6f540 100755
--- a/app/Services/PageTimer.php
+++ b/app/Utils/PageTimer.php
@@ -14,7 +14,7 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
-namespace App\Services;
+namespace App\Utils;
 
 /**
  * This class handles page load time calculations, reporting, and logging.
diff --git a/app/Services/ProjectPermissions.php b/app/Utils/ProjectPermissions.php
similarity index 99%
rename from app/Services/ProjectPermissions.php
rename to app/Utils/ProjectPermissions.php
index 3d80b59d2c..eca6a82370 100644
--- a/app/Services/ProjectPermissions.php
+++ b/app/Utils/ProjectPermissions.php
@@ -16,7 +16,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Utils;
 
 use CDash\Model\Project;
 use CDash\Model\UserProject;
diff --git a/app/Services/TestCreator.php b/app/Utils/TestCreator.php
similarity index 99%
rename from app/Services/TestCreator.php
rename to app/Utils/TestCreator.php
index 4a440253c1..48f6064db3 100755
--- a/app/Services/TestCreator.php
+++ b/app/Utils/TestCreator.php
@@ -14,7 +14,7 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
-namespace App\Services;
+namespace App\Utils;
 
 use App\Models\BuildTest;
 use App\Models\TestImage;
diff --git a/app/Services/TestDiffService.php b/app/Utils/TestDiffUtil.php
similarity index 99%
rename from app/Services/TestDiffService.php
rename to app/Utils/TestDiffUtil.php
index f578119994..ebd694918b 100755
--- a/app/Services/TestDiffService.php
+++ b/app/Utils/TestDiffUtil.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Utils;
 
 use App\Enums\TestDiffType;
 use App\Models\TestDiff;
@@ -15,7 +15,7 @@
  * It also sets `build2test::newstatus` = 1 as appropriate.
  **/
 
-class TestDiffService
+class TestDiffUtil
 {
     public static function computeDifferences(Build $build) : bool
     {
diff --git a/app/Services/TestingDay.php b/app/Utils/TestingDay.php
similarity index 99%
rename from app/Services/TestingDay.php
rename to app/Utils/TestingDay.php
index d6b8c88edd..f9d184e616 100755
--- a/app/Services/TestingDay.php
+++ b/app/Utils/TestingDay.php
@@ -14,7 +14,7 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
-namespace App\Services;
+namespace App\Utils;
 
 use CDash\Model\Project;
 
diff --git a/app/Services/UnparsedSubmissionProcessor.php b/app/Utils/UnparsedSubmissionProcessor.php
similarity index 97%
rename from app/Services/UnparsedSubmissionProcessor.php
rename to app/Utils/UnparsedSubmissionProcessor.php
index e9c36d644f..70bb225204 100644
--- a/app/Services/UnparsedSubmissionProcessor.php
+++ b/app/Utils/UnparsedSubmissionProcessor.php
@@ -14,7 +14,7 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
-namespace App\Services;
+namespace App\Utils;
 
 use App\Jobs\ProcessSubmission;
 use CDash\Model\Build;
@@ -154,7 +154,7 @@ public function initializeBuild(): JsonResponse
         $projectid = $project_row->id;
 
         // Check if this submission requires a valid authentication token.
-        if (($this->token || $project_row->authenticatesubmissions) && !AuthTokenService::checkToken($this->token, $projectid)) {
+        if (($this->token || $project_row->authenticatesubmissions) && !AuthTokenUtil::checkToken($this->token, $projectid)) {
             abort(Response::HTTP_FORBIDDEN, 'Forbidden');
         }
 
@@ -311,9 +311,9 @@ public function populateBuildFileRow(): void
 
         // Check if this submission requires a valid authentication token.
         if ($this->project->AuthenticateSubmissions) {
-            $token = AuthTokenService::getBearerToken();
-            $authtoken_hash = AuthTokenService::hashToken($token);
-            if (!AuthTokenService::checkToken($authtoken_hash, $this->project->Id)) {
+            $token = AuthTokenUtil::getBearerToken();
+            $authtoken_hash = AuthTokenUtil::hashToken($token);
+            if (!AuthTokenUtil::checkToken($authtoken_hash, $this->project->Id)) {
                 Storage::delete($this->inboxdatafilename);
                 abort(Response::HTTP_FORBIDDEN, 'Forbidden');
             }
@@ -444,9 +444,9 @@ private function getAuthTokenHash(): void
         if ($this->token) {
             return;
         }
-        $token = AuthTokenService::getBearerToken();
+        $token = AuthTokenUtil::getBearerToken();
         if ($token) {
-            $this->token = AuthTokenService::hashToken($token);
+            $this->token = AuthTokenUtil::hashToken($token);
         } else {
             $this->token = '';
         }
diff --git a/app/cdash/app/Controller/Api.php b/app/cdash/app/Controller/Api.php
index bb9b03787a..b1833d3828 100644
--- a/app/cdash/app/Controller/Api.php
+++ b/app/cdash/app/Controller/Api.php
@@ -15,7 +15,7 @@
 =========================================================================*/
 namespace CDash\Controller;
 
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 use CDash\Database;
 
 /**
diff --git a/app/cdash/app/Controller/Api/Index.php b/app/cdash/app/Controller/Api/Index.php
index 9b19557f91..b7aee2e6ec 100644
--- a/app/cdash/app/Controller/Api/Index.php
+++ b/app/cdash/app/Controller/Api/Index.php
@@ -15,7 +15,7 @@
 =========================================================================*/
 namespace CDash\Controller\Api;
 
-use App\Services\TestingDay;
+use App\Utils\TestingDay;
 use CDash\Database;
 use CDash\Model\Build;
 use CDash\Model\BuildGroup;
diff --git a/app/cdash/app/Controller/Api/ResultsApi.php b/app/cdash/app/Controller/Api/ResultsApi.php
index 69e1efc3a2..b653c972cc 100644
--- a/app/cdash/app/Controller/Api/ResultsApi.php
+++ b/app/cdash/app/Controller/Api/ResultsApi.php
@@ -15,7 +15,7 @@
 =========================================================================*/
 namespace CDash\Controller\Api;
 
-use App\Services\TestingDay;
+use App\Utils\TestingDay;
 
 use CDash\Database;
 use CDash\Model\Build;
diff --git a/app/cdash/app/Controller/Api/Timeline.php b/app/cdash/app/Controller/Api/Timeline.php
index dcc538d2d6..299a0b16c9 100644
--- a/app/cdash/app/Controller/Api/Timeline.php
+++ b/app/cdash/app/Controller/Api/Timeline.php
@@ -18,7 +18,7 @@
 
 use App\Enums\ClassicPalette;
 use App\Enums\HighContrastPalette;
-use App\Services\TestingDay;
+use App\Utils\TestingDay;
 use CDash\Database;
 use CDash\Model\Build;
 use CDash\Model\BuildGroup;
diff --git a/app/cdash/app/Model/Build.php b/app/cdash/app/Model/Build.php
index 84f3dfb375..0801b95c85 100644
--- a/app/cdash/app/Model/Build.php
+++ b/app/cdash/app/Model/Build.php
@@ -22,8 +22,8 @@
 use App\Models\BuildTest;
 use App\Models\Site;
 use App\Models\Test;
-use App\Services\TestingDay;
-use App\Services\TestDiffService;
+use App\Utils\TestingDay;
+use App\Utils\TestDiffUtil;
 use App\Models\BuildInformation;
 
 use CDash\Collection\BuildEmailCollection;
@@ -1235,7 +1235,7 @@ public function ComputeTestTiming(): bool
 
         // Record test differences from the previous build.
         // (+/- number of tests that failed, etc.)
-        TestDiffService::computeDifferences($this);
+        TestDiffUtil::computeDifferences($this);
 
         $project_stmt = $this->PDO->prepare(
             'SELECT testtimestd, testtimestdthreshold, testtimemaxstatus
diff --git a/app/cdash/include/common.php b/app/cdash/include/common.php
index d332cbeeb3..d443ae1c6d 100644
--- a/app/cdash/include/common.php
+++ b/app/cdash/include/common.php
@@ -16,7 +16,7 @@
 
 use Illuminate\Support\Facades\Auth;
 
-use App\Services\TestingDay;
+use App\Utils\TestingDay;
 
 use CDash\Config;
 use CDash\Database;
diff --git a/app/cdash/public/api/v1/manageBuildGroup.php b/app/cdash/public/api/v1/manageBuildGroup.php
index 34363dd26d..f70af9f667 100644
--- a/app/cdash/public/api/v1/manageBuildGroup.php
+++ b/app/cdash/public/api/v1/manageBuildGroup.php
@@ -17,7 +17,7 @@
 namespace CDash\Api\v1\ManageBuildGroup;
 
 use App\Models\User;
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 use CDash\Database;
 use CDash\Model\BuildGroup;
 use CDash\Model\Project;
diff --git a/app/cdash/public/api/v1/manageOverview.php b/app/cdash/public/api/v1/manageOverview.php
index bf7bcc69db..24cc11a6dd 100644
--- a/app/cdash/public/api/v1/manageOverview.php
+++ b/app/cdash/public/api/v1/manageOverview.php
@@ -18,7 +18,7 @@
 
 include_once 'include/api_common.php';
 
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 use CDash\Database;
 use CDash\Model\Project;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/cdash/public/api/v1/relateBuilds.php b/app/cdash/public/api/v1/relateBuilds.php
index 3cebb811ed..43fd338089 100644
--- a/app/cdash/public/api/v1/relateBuilds.php
+++ b/app/cdash/public/api/v1/relateBuilds.php
@@ -18,7 +18,7 @@
 
 require_once 'include/api_common.php';
 
-use App\Services\AuthTokenService;
+use App\Utils\AuthTokenUtil;
 use CDash\Model\Build;
 use CDash\Model\BuildRelationship;
 use CDash\Model\Project;
@@ -78,8 +78,8 @@
     // Check for valid authentication token if this project requires one.
     $project->Fill();
 
-    $token_hash = AuthTokenService::hashToken(AuthTokenService::getBearerToken());
-    if ($project->AuthenticateSubmissions && !AuthTokenService::checkToken($token_hash, $project->Id)) {
+    $token_hash = AuthTokenUtil::hashToken(AuthTokenUtil::getBearerToken());
+    if ($project->AuthenticateSubmissions && !AuthTokenUtil::checkToken($token_hash, $project->Id)) {
         return;
     }
 
diff --git a/app/cdash/public/api/v1/subproject.php b/app/cdash/public/api/v1/subproject.php
index 3cf67c41c7..4174f05b33 100644
--- a/app/cdash/public/api/v1/subproject.php
+++ b/app/cdash/public/api/v1/subproject.php
@@ -16,7 +16,7 @@
 
 namespace CDash\Api\v1\SubProject;
 
-use App\Services\PageTimer;
+use App\Utils\PageTimer;
 
 use CDash\Database;
 use CDash\Model\Project;
diff --git a/app/cdash/tests/case/CDash/NightlyTimeTest.php b/app/cdash/tests/case/CDash/NightlyTimeTest.php
index 84ac8e7ea7..f8b3738036 100644
--- a/app/cdash/tests/case/CDash/NightlyTimeTest.php
+++ b/app/cdash/tests/case/CDash/NightlyTimeTest.php
@@ -14,7 +14,7 @@
  * =========================================================================
  */
 
-use App\Services\TestingDay;
+use App\Utils\TestingDay;
 
 use CDash\Model\Project;
 use Tests\TestCase;
diff --git a/app/cdash/tests/test_authtoken.php b/app/cdash/tests/test_authtoken.php
index aa8f2a4278..2d612c4313 100644
--- a/app/cdash/tests/test_authtoken.php
+++ b/app/cdash/tests/test_authtoken.php
@@ -4,7 +4,7 @@
 
 
 use App\Models\AuthToken;
-use App\Services\AuthTokenService;
+use App\Utils\AuthTokenUtil;
 use CDash\Model\Project;
 use CDash\Model\UserProject;
 use Illuminate\Support\Facades\DB;
@@ -258,7 +258,7 @@ public function testRevokeToken()
     public function testRemoveExpiredToken()
     {
         // Put an expired token in the database.
-        $result = AuthTokenService::generateToken(1, -1, AuthToken::SCOPE_FULL_ACCESS, "Test Token 1");
+        $result = AuthTokenUtil::generateToken(1, -1, AuthToken::SCOPE_FULL_ACCESS, "Test Token 1");
         $token = $result['raw_token'];
         $authtoken = $result['token'];
         $authtoken['expires'] = gmdate(FMT_DATETIME, 1);
diff --git a/app/cdash/tests/test_autoremovebuilds_on_submit.php b/app/cdash/tests/test_autoremovebuilds_on_submit.php
index 85ff82fed2..473a345a5c 100644
--- a/app/cdash/tests/test_autoremovebuilds_on_submit.php
+++ b/app/cdash/tests/test_autoremovebuilds_on_submit.php
@@ -3,7 +3,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-use App\Services\TestingDay;
+use App\Utils\TestingDay;
 
 use CDash\Database;
 use CDash\Model\BuildGroup;
diff --git a/app/cdash/tests/test_buildproperties.php b/app/cdash/tests/test_buildproperties.php
index bd05482e39..787dab5f08 100644
--- a/app/cdash/tests/test_buildproperties.php
+++ b/app/cdash/tests/test_buildproperties.php
@@ -3,7 +3,7 @@
 
 
 
-use App\Services\TestCreator;
+use App\Utils\TestCreator;
 
 use CDash\Database;
 use CDash\Model\Build;
diff --git a/app/cdash/tests/test_consistenttestingday.php b/app/cdash/tests/test_consistenttestingday.php
index 695cd7e64a..016e6f8070 100644
--- a/app/cdash/tests/test_consistenttestingday.php
+++ b/app/cdash/tests/test_consistenttestingday.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__FILE__) . '/cdash_test_case.php';
 
-use App\Services\TestingDay;
+use App\Utils\TestingDay;
 use CDash\Database;
 use CDash\Model\Build;
 use CDash\Model\Project;
diff --git a/app/cdash/tests/test_removebuilds.php b/app/cdash/tests/test_removebuilds.php
index 3358df969a..5e9e862f00 100644
--- a/app/cdash/tests/test_removebuilds.php
+++ b/app/cdash/tests/test_removebuilds.php
@@ -6,8 +6,8 @@
 require_once dirname(__FILE__) . '/cdash_test_case.php';
 
 use App\Models\TestMeasurement;
-use App\Services\TestCreator;
-use App\Services\NoteCreator;
+use App\Utils\TestCreator;
+use App\Utils\NoteCreator;
 
 use CDash\Model\Build;
 use CDash\Model\BuildConfigure;
diff --git a/app/cdash/xml_handlers/BazelJSON_handler.php b/app/cdash/xml_handlers/BazelJSON_handler.php
index c2f36fbd3b..e7c89c2a0c 100644
--- a/app/cdash/xml_handlers/BazelJSON_handler.php
+++ b/app/cdash/xml_handlers/BazelJSON_handler.php
@@ -15,7 +15,7 @@
 =========================================================================*/
 require_once 'xml_handlers/NonSaxHandler.php';
 
-use App\Services\TestCreator;
+use App\Utils\TestCreator;
 
 use CDash\Model\Build;
 use CDash\Model\BuildConfigure;
diff --git a/app/cdash/xml_handlers/note_handler.php b/app/cdash/xml_handlers/note_handler.php
index afe120cebd..ddca6e3a39 100644
--- a/app/cdash/xml_handlers/note_handler.php
+++ b/app/cdash/xml_handlers/note_handler.php
@@ -16,7 +16,7 @@
 
 require_once 'xml_handlers/abstract_handler.php';
 
-use App\Services\NoteCreator;
+use App\Utils\NoteCreator;
 
 use CDash\Model\Build;
 use App\Models\BuildInformation;
diff --git a/app/cdash/xml_handlers/testing_handler.php b/app/cdash/xml_handlers/testing_handler.php
index 3883619a26..a94a3958eb 100644
--- a/app/cdash/xml_handlers/testing_handler.php
+++ b/app/cdash/xml_handlers/testing_handler.php
@@ -4,7 +4,7 @@
 require_once 'xml_handlers/actionable_build_interface.php';
 
 use App\Models\TestMeasurement;
-use App\Services\TestCreator;
+use App\Utils\TestCreator;
 
 use CDash\Collection\BuildCollection;
 use CDash\Collection\Collection;
diff --git a/app/cdash/xml_handlers/testing_junit_handler.php b/app/cdash/xml_handlers/testing_junit_handler.php
index ea7e2aef7a..1f6866e622 100644
--- a/app/cdash/xml_handlers/testing_junit_handler.php
+++ b/app/cdash/xml_handlers/testing_junit_handler.php
@@ -16,7 +16,7 @@
 
 require_once 'xml_handlers/abstract_handler.php';
 
-use App\Services\TestCreator;
+use App\Utils\TestCreator;
 
 use CDash\Model\Build;
 use App\Models\BuildInformation;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 0f20bf8d3d..cab6882107 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -501,12 +501,12 @@ parameters:
 			path: app/Http/Controllers/AuthTokenController.php
 
 		-
-			message: "#^Parameter \\#1 \\$user_id of static method App\\\\Services\\\\AuthTokenService\\:\\:generateToken\\(\\) expects int, int\\|string\\|null given\\.$#"
+			message: "#^Parameter \\#1 \\$user_id of static method App\\\\Utils\\\\AuthTokenUtil\\:\\:generateToken\\(\\) expects int, int\\|string\\|null given\\.$#"
 			count: 1
 			path: app/Http/Controllers/AuthTokenController.php
 
 		-
-			message: "#^Parameter \\#2 \\$expected_user_id of static method App\\\\Services\\\\AuthTokenService\\:\\:deleteToken\\(\\) expects int, int\\|string\\|null given\\.$#"
+			message: "#^Parameter \\#2 \\$expected_user_id of static method App\\\\Utils\\\\AuthTokenUtil\\:\\:deleteToken\\(\\) expects int, int\\|string\\|null given\\.$#"
 			count: 1
 			path: app/Http/Controllers/AuthTokenController.php
 
@@ -2843,7 +2843,7 @@ parameters:
 			path: app/Http/Middleware/VerifyCsrfToken.php
 
 		-
-			message: "#^Access to an undefined property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$backupFileName\\.$#"
+			message: "#^Access to an undefined property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$backupFileName\\.$#"
 			count: 1
 			path: app/Jobs/ProcessSubmission.php
 
@@ -3383,32 +3383,32 @@ parameters:
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
-			path: app/Services/AuthTokenService.php
+			path: app/Utils/AuthTokenUtil.php
 
 		-
 			message: "#^Dynamic call to static method Illuminate\\\\Database\\\\Eloquent\\\\Builder\\<App\\\\Models\\\\AuthToken\\>\\:\\:leftJoin\\(\\)\\.$#"
 			count: 3
-			path: app/Services/AuthTokenService.php
+			path: app/Utils/AuthTokenUtil.php
 
 		-
 			message: "#^Implicit array creation is not allowed \\- variable \\$params does not exist\\.$#"
 			count: 1
-			path: app/Services/AuthTokenService.php
+			path: app/Utils/AuthTokenUtil.php
 
 		-
 			message: "#^Only booleans are allowed in an if condition, int\\|false given\\.$#"
 			count: 1
-			path: app/Services/AuthTokenService.php
+			path: app/Utils/AuthTokenUtil.php
 
 		-
 			message: "#^Parameter \\#2 \\$string of function explode expects string, \\(int\\|string\\) given\\.$#"
 			count: 1
-			path: app/Services/AuthTokenService.php
+			path: app/Utils/AuthTokenUtil.php
 
 		-
 			message: "#^Parameter \\#2 \\$timestamp of function gmdate expects int\\|null, float\\|int given\\.$#"
 			count: 1
-			path: app/Services/AuthTokenService.php
+			path: app/Utils/AuthTokenUtil.php
 
 		-
 			message: """
@@ -3416,362 +3416,362 @@ parameters:
 				04/01/2023$#
 			"""
 			count: 2
-			path: app/Services/NoteCreator.php
+			path: app/Utils/NoteCreator.php
 
 		-
-			message: "#^Method App\\\\Services\\\\NoteCreator\\:\\:computeCrc32\\(\\) has no return type specified\\.$#"
+			message: "#^Method App\\\\Utils\\\\NoteCreator\\:\\:computeCrc32\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: app/Services/NoteCreator.php
+			path: app/Utils/NoteCreator.php
 
 		-
-			message: "#^Method App\\\\Services\\\\NoteCreator\\:\\:create\\(\\) has no return type specified\\.$#"
+			message: "#^Method App\\\\Utils\\\\NoteCreator\\:\\:create\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: app/Services/NoteCreator.php
+			path: app/Utils/NoteCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\NoteCreator\\:\\:\\$buildid has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\NoteCreator\\:\\:\\$buildid has no type specified\\.$#"
 			count: 1
-			path: app/Services/NoteCreator.php
+			path: app/Utils/NoteCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\NoteCreator\\:\\:\\$crc32 has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\NoteCreator\\:\\:\\$crc32 has no type specified\\.$#"
 			count: 1
-			path: app/Services/NoteCreator.php
+			path: app/Utils/NoteCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\NoteCreator\\:\\:\\$name has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\NoteCreator\\:\\:\\$name has no type specified\\.$#"
 			count: 1
-			path: app/Services/NoteCreator.php
+			path: app/Utils/NoteCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\NoteCreator\\:\\:\\$text has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\NoteCreator\\:\\:\\$text has no type specified\\.$#"
 			count: 1
-			path: app/Services/NoteCreator.php
+			path: app/Utils/NoteCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\NoteCreator\\:\\:\\$time has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\NoteCreator\\:\\:\\$time has no type specified\\.$#"
 			count: 1
-			path: app/Services/NoteCreator.php
+			path: app/Utils/NoteCreator.php
 
 		-
-			message: "#^Class App\\\\Services\\\\PageTimer has an uninitialized property \\$duration\\. Give it default value or assign it in the constructor\\.$#"
+			message: "#^Class App\\\\Utils\\\\PageTimer has an uninitialized property \\$duration\\. Give it default value or assign it in the constructor\\.$#"
 			count: 1
-			path: app/Services/PageTimer.php
+			path: app/Utils/PageTimer.php
 
 		-
-			message: "#^Method App\\\\Services\\\\PageTimer\\:\\:end\\(\\) has no return type specified\\.$#"
+			message: "#^Method App\\\\Utils\\\\PageTimer\\:\\:end\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: app/Services/PageTimer.php
+			path: app/Utils/PageTimer.php
 
 		-
-			message: "#^Method App\\\\Services\\\\PageTimer\\:\\:end\\(\\) has parameter \\$response with no type specified\\.$#"
+			message: "#^Method App\\\\Utils\\\\PageTimer\\:\\:end\\(\\) has parameter \\$response with no type specified\\.$#"
 			count: 1
-			path: app/Services/PageTimer.php
+			path: app/Utils/PageTimer.php
 
 		-
 			message: "#^Loose comparison via \"\\=\\=\" is not allowed\\.$#"
 			count: 3
-			path: app/Services/ProjectPermissions.php
+			path: app/Utils/ProjectPermissions.php
 
 		-
 			message: "#^Access to an undefined property App\\\\Models\\\\BuildTest\\:\\:\\$measurements\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
 			message: "#^Call to function base64_decode\\(\\) requires parameter \\#2 to be set\\.$#"
 			count: 2
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
 			message: "#^Loose comparison via \"\\=\\=\" is not allowed\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Method App\\\\Services\\\\TestCreator\\:\\:saveImage\\(\\) has parameter \\$outputid with no type specified\\.$#"
+			message: "#^Method App\\\\Utils\\\\TestCreator\\:\\:saveImage\\(\\) has parameter \\$outputid with no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
 			message: "#^Only booleans are allowed in an elseif condition, mixed given\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
 			message: "#^Only booleans are allowed in an if condition, array given\\.$#"
 			count: 2
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
 			message: "#^Parameter \\#1 \\$image of function imagegif expects GdImage, GdImage\\|false given\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
 			message: "#^Parameter \\#1 \\$image of function imagejpeg expects GdImage, GdImage\\|false given\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
 			message: "#^Parameter \\#1 \\$image of function imagepng expects GdImage, GdImage\\|false given\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
 			message: "#^Parameter \\#1 \\$string of function crc32 expects string, string\\|false given\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
 			message: "#^Property App\\\\Models\\\\BuildTest\\:\\:\\$time \\(float\\) does not accept string\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$alreadyCompressed has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$alreadyCompressed has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$buildTestTime has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$buildTestTime has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$images has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$images has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$labels has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$labels has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$measurements has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$measurements has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$projectid has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$projectid has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$testCommand has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$testCommand has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$testDetails has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$testDetails has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$testName has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$testName has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$testOutput has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$testOutput has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$testPath has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$testPath has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
-			message: "#^Property App\\\\Services\\\\TestCreator\\:\\:\\$testStatus has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\TestCreator\\:\\:\\$testStatus has no type specified\\.$#"
 			count: 1
-			path: app/Services/TestCreator.php
+			path: app/Utils/TestCreator.php
 
 		-
 			message: "#^Access to an undefined property object\\:\\:\\$difference_negative\\.$#"
 			count: 1
-			path: app/Services/TestDiffService.php
+			path: app/Utils/TestDiffUtil.php
 
 		-
 			message: "#^Access to an undefined property object\\:\\:\\$difference_positive\\.$#"
 			count: 1
-			path: app/Services/TestDiffService.php
+			path: app/Utils/TestDiffUtil.php
 
 		-
 			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
 			count: 2
-			path: app/Services/TestDiffService.php
+			path: app/Utils/TestDiffUtil.php
 
 		-
 			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
 			count: 2
-			path: app/Services/TestDiffService.php
+			path: app/Utils/TestDiffUtil.php
 
 		-
 			message: "#^Only booleans are allowed in an if condition, object\\|null given\\.$#"
 			count: 2
-			path: app/Services/TestDiffService.php
+			path: app/Utils/TestDiffUtil.php
 
 		-
 			message: "#^Parameter \\#1 \\$array of function array_column expects array, array\\|false given\\.$#"
 			count: 2
-			path: app/Services/TestDiffService.php
+			path: app/Utils/TestDiffUtil.php
 
 		-
-			message: "#^Method App\\\\Services\\\\TestingDay\\:\\:get\\(\\) has no return type specified\\.$#"
+			message: "#^Method App\\\\Utils\\\\TestingDay\\:\\:get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: app/Services/TestingDay.php
+			path: app/Utils/TestingDay.php
 
 		-
-			message: "#^Method App\\\\Services\\\\TestingDay\\:\\:get\\(\\) has parameter \\$date with no type specified\\.$#"
+			message: "#^Method App\\\\Utils\\\\TestingDay\\:\\:get\\(\\) has parameter \\$date with no type specified\\.$#"
 			count: 1
-			path: app/Services/TestingDay.php
+			path: app/Utils/TestingDay.php
 
 		-
 			message: "#^Access to an undefined property object\\:\\:\\$authenticatesubmissions\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Access to an undefined property object\\:\\:\\$id\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Loose comparison via \"\\!\\=\" is not allowed\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Method App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:deserializeBuildMetadata\\(\\) has parameter \\$fp with no type specified\\.$#"
+			message: "#^Method App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:deserializeBuildMetadata\\(\\) has parameter \\$fp with no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Only booleans are allowed in a negated boolean, object\\|null given\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Only booleans are allowed in an if condition, string\\|null given\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, \\(array\\<int, string\\>\\|string\\) given\\.$#"
 			count: 2
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|null given\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Parameter \\#1 \\$string of function substr expects string, \\(array\\<int, string\\>\\|string\\) given\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Parameter \\#2 \\$contents of static method Illuminate\\\\Contracts\\\\Filesystem\\\\Filesystem\\:\\:put\\(\\) expects resource\\|string, string\\|false given\\.$#"
 			count: 2
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$backupfilename has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$backupfilename has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$build has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$build has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$buildid has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$buildid has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$buildname has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$buildname has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$buildstamp has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$buildstamp has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$endtime has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$endtime has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$generator has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$generator has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$inboxdatafilename has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$inboxdatafilename has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$md5 has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$md5 has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$project has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$project has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$projectname has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$projectname has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$sitename has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$sitename has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$starttime has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$starttime has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$subprojectname has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$subprojectname has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$token has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$token has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
-			message: "#^Property App\\\\Services\\\\UnparsedSubmissionProcessor\\:\\:\\$type has no type specified\\.$#"
+			message: "#^Property App\\\\Utils\\\\UnparsedSubmissionProcessor\\:\\:\\$type has no type specified\\.$#"
 			count: 1
-			path: app/Services/UnparsedSubmissionProcessor.php
+			path: app/Utils/UnparsedSubmissionProcessor.php
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"