From 7cc64ae0d2560dff7cdacee8711e7831b3a95c8b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 21 Sep 2023 20:55:14 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 43 +++++++++++++++
 src/Common/Current.java                       | 12 ++---
 src/Common/Global.java                        |  2 +-
 .../PackageModeSupervisor.java                | 53 ++++++++++++++-----
 src/Common/UI/UI.java                         |  8 +--
 src/GlobalData/GlobalDatabase.java            | 10 ++--
 .../Json}/SapforVersion_json.java             |  2 +-
 .../Json}/ScenarioResults_json.java           |  4 +-
 .../Json}/Scenario_json.java                  |  2 +-
 .../SapforConfiguration.java                  |  2 +-
 .../SapforConfigurationDBTable.java           |  6 +--
 .../SapforConfigurationInterface.java         |  4 +-
 .../UI/SapforConfigurationFields.form         |  2 +-
 .../UI/SapforConfigurationFields.java         |  2 +-
 .../SapforConfigurationCommand.java           |  2 +-
 .../SapforConfigurationCommandInterface.java  |  2 +-
 .../SapforConfigurationCommandsDBTable.java   |  4 +-
 .../UI/SapforConfigurationCommandFields.form  |  2 +-
 .../UI/SapforConfigurationCommandFields.java  |  2 +-
 .../SapforTask/MatchState.java                |  2 +-
 .../SapforTask/SapforTaskResult.java          |  4 +-
 .../SapforTask/SapforTask_2023.java           |  4 +-
 .../SapforTask/SapforTasksDBTable.java        |  2 +-
 .../SapforTasksPackage_2023.java              |  4 +-
 .../SapforTasksPackagesDBTable.java           |  4 +-
 src/TestingSystem/TestsDatabase.java          |  4 +-
 .../All/AnalyseSapforPackageResults.java      |  4 +-
 .../Passes/All/CompareSapforPackages.java     |  2 +-
 .../Passes/All/DeleteSapforConfiguration.java |  2 +-
 .../All/DeleteSapforConfigurationCommand.java |  2 +-
 .../Passes/All/DeleteSapforTasksPackage.java  |  2 +-
 .../Passes/All/EditSapforConfiguration.java   |  2 +-
 .../All/EditSapforConfigurationCommand.java   |  2 +-
 ...ditSapforConfigurationCommandOnServer.java |  2 +-
 .../All/EditSapforConfigurationOnServer.java  |  2 +-
 .../Passes/All/OpenSapforTest.java            |  6 +--
 .../Passes/All/PerformSapforTasksPackage.java |  8 +--
 .../Passes/All/PerformScenario.java           | 10 ++--
 .../All/PublishSapforConfiguration.java       |  2 +-
 .../PublishSapforConfigurationCommand.java    |  2 +-
 .../Passes/All/StartSapforTests.java          | 10 ++--
 .../UI/Interface/TestingWindow.java           |  2 +-
 .../UI/Main/SapforPackagesComparisonForm.java |  4 +-
 .../UI/Main/SapforTasksComparisonForm.java    |  2 +-
 src/Visual_DVM_2021/UI/Main/TestingForm.java  |  2 +-
 45 files changed, 164 insertions(+), 92 deletions(-)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem/Json}/SapforVersion_json.java (90%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem/Json}/ScenarioResults_json.java (69%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem/Json}/Scenario_json.java (90%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforConfiguration/SapforConfiguration.java (94%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforConfiguration/SapforConfigurationDBTable.java (95%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforConfiguration/SapforConfigurationInterface.java (95%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforConfiguration/UI/SapforConfigurationFields.form (98%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforConfiguration/UI/SapforConfigurationFields.java (94%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforConfigurationCommand/SapforConfigurationCommand.java (89%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforConfigurationCommand/SapforConfigurationCommandInterface.java (83%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java (94%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form (93%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java (94%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforTask/MatchState.java (96%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforTask/SapforTaskResult.java (80%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforTask/SapforTask_2023.java (94%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforTask/SapforTasksDBTable.java (97%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforTasksPackage/SapforTasksPackage_2023.java (96%)
 rename src/{TestingSystem/Sapfor => SapforTestingSystem}/SapforTasksPackage/SapforTasksPackagesDBTable.java (96%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 700117b3..9b91812c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,50 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/ModesSupervisors/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/ModesSupervisors/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTask/MatchState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/MatchState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTask/SapforTaskResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTaskResult.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTask/SapforTask_2023.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask_2023.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackage_2023.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/ScenarioResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/ScenarioResults_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/Scenario_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/Scenario_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformScenario.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Current.java b/src/Common/Current.java
index d8192fe1..a85ceae4 100644
--- a/src/Common/Current.java
+++ b/src/Common/Current.java
@@ -20,9 +20,9 @@ import ProjectData.SapforData.Regions.ParallelRegion;
 import Repository.BugReport.BugReport;
 import Repository.Subscribes.Subscriber;
 import TestingSystem.Configuration.Configuration;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 import TestingSystem.Tasks.TestCompilationTask;
 import TestingSystem.Tasks.TestRunTask;
 import TestingSystem.TasksPackage.TasksPackage;
@@ -236,7 +236,7 @@ public enum Current {
         return (Configuration) get(Current.Configuration);
     }
     public static SapforConfiguration getSapforConfiguration() {
-        return (TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
+        return (SapforTestingSystem.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
     }
     //--
     public static Test getTest() {
@@ -374,8 +374,8 @@ public enum Current {
     public static boolean CheckID(Current name, int id) {
         return (get(name) != null) && (((iDBObject) get(name)).id == id);
     }
-    public static TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
-    return (TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
+    public static SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
+    return (SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
     }
     public static boolean HasSapforProfile() {
         return get(Current.SapforProfile)!=null;
diff --git a/src/Common/Global.java b/src/Common/Global.java
index cbe72776..37d7cb7d 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -382,7 +382,7 @@ public class Global {
                         }
                     };
                     Log.ClearLog();
-                    new PackageModeSupervisor().Start();
+                    new PackageModeSupervisor().Do();
                     break;
                 case Undefined:
                     break;
diff --git a/src/Common/ModesSupervisors/PackageModeSupervisor.java b/src/Common/ModesSupervisors/PackageModeSupervisor.java
index b97eefb6..d1c032a0 100644
--- a/src/Common/ModesSupervisors/PackageModeSupervisor.java
+++ b/src/Common/ModesSupervisors/PackageModeSupervisor.java
@@ -2,19 +2,20 @@ package Common.ModesSupervisors;
 import Common.Global;
 import Common.Utils.InterruptThread;
 import Common.Utils.Utils;
-import TestingSystem.Sapfor.Scenario_json;
+import SapforTestingSystem.Json.Scenario_json;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.util.Stack;
+import java.util.Vector;
 public class PackageModeSupervisor {
     Thread interruptThread = new InterruptThread(5000, () -> {
         System.exit(0);
         return null;
     });
     //--->>
-    int free_kernels = 4;
-    int busy_kernels = 0;
+    int kernels = 4;
     //--->>
     Scenario_json scenario;
     //--->>
@@ -23,21 +24,49 @@ public class PackageModeSupervisor {
     File sapfor_drv;
     File scenarioFile;
     //--->>
-    public void Start() {
+    Vector<String> activeTests = new Vector<>();
+    Stack<String> waitingTests = new Stack<>();
+    //--->>
+    public void init() throws Exception {
+        packageWorkspace = new File(Global.Home);
+        scenarioFile = new File(packageWorkspace, "scenario.txt");
+        sapfor_drv = new File(packageWorkspace, "SAPFOR_F.exe");
+        String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
+        scenario = Utils.gson.fromJson(packed, Scenario_json.class);
+        //--->>
+        for (String test : scenario.tests)
+            waitingTests.push(test);
+    }
+    public boolean isFinished(String test){
+        return true;
+    }
+    //--->>
+    public void checkActiveTests() throws Exception {
+        Vector<String> finishedTests = new Vector<>();
+        for (String test: activeTests){
+            if (isFinished(test))
+                finishedTests.add(test);
+        }
+        for (String test: finishedTests){
+            activeTests.remove(test);
+        }
+    }
+    public void startWaitingTests() throws Exception {
+    }
+    //--->>
+    public void Do() {
         try {
             interruptThread.start();
             //--->>
-            packageWorkspace = new File(Global.Home);
-            scenarioFile = new File(packageWorkspace, "scenario.txt");
-            sapfor_drv = new File(packageWorkspace, "SAPFOR_F.exe");
+            init();
             //--->>
-            String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
-            scenario = Utils.gson.fromJson(packed, Scenario_json.class);
+            do {
+                checkActiveTests();
+                startWaitingTests();
+                Thread.sleep(1000);
+            } while (!activeTests.isEmpty() && !waitingTests.isEmpty());
         } catch (Exception ex) {
             ex.printStackTrace();
         }
     }
-    //--->>
-    public void startTest() {
-    }
 }
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index c43a4884..6c13129a 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -70,10 +70,10 @@ import Repository.Component.UI.ComponentsForm;
 import Repository.Subscribes.SubsribersDBTable;
 import TestingSystem.Configuration.UI.ConfigurationDBTable;
 import TestingSystem.Group.GroupsDBTable;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfigurationDBTable;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
-import TestingSystem.Sapfor.SapforTask.SapforTasksDBTable;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackagesDBTable;
+import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import SapforTestingSystem.SapforTask.SapforTasksDBTable;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
 import TestingSystem.Tasks.TestRunTasksDBTable;
 import TestingSystem.TasksPackage.TasksPackageDBTable;
 import TestingSystem.Test.TestDBTable;
diff --git a/src/GlobalData/GlobalDatabase.java b/src/GlobalData/GlobalDatabase.java
index f1c104be..c7cab745 100644
--- a/src/GlobalData/GlobalDatabase.java
+++ b/src/GlobalData/GlobalDatabase.java
@@ -33,11 +33,11 @@ import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
 import GlobalData.Tasks.RunTask.RunTasksDBTable;
 import GlobalData.User.UsersDBTable;
 import Repository.Component.ComponentType;
-import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.SapforTask.SapforTasksDBTable;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackagesDBTable;
+import SapforTestingSystem.SapforTask.SapforTaskResult;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.SapforTask.SapforTasksDBTable;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
 import TestingSystem.TaskKey.TaskKeysDBTable;
 import Visual_DVM_2021.PassStats.PassStatsDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/Sapfor/SapforVersion_json.java b/src/SapforTestingSystem/Json/SapforVersion_json.java
similarity index 90%
rename from src/TestingSystem/Sapfor/SapforVersion_json.java
rename to src/SapforTestingSystem/Json/SapforVersion_json.java
index 93191c6c..848fc34a 100644
--- a/src/TestingSystem/Sapfor/SapforVersion_json.java
+++ b/src/SapforTestingSystem/Json/SapforVersion_json.java
@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor;
+package SapforTestingSystem.Json;
 import com.google.gson.annotations.Expose;
 public class SapforVersion_json {
     @Expose
diff --git a/src/TestingSystem/Sapfor/ScenarioResults_json.java b/src/SapforTestingSystem/Json/ScenarioResults_json.java
similarity index 69%
rename from src/TestingSystem/Sapfor/ScenarioResults_json.java
rename to src/SapforTestingSystem/Json/ScenarioResults_json.java
index 8062e95f..c19cce06 100644
--- a/src/TestingSystem/Sapfor/ScenarioResults_json.java
+++ b/src/SapforTestingSystem/Json/ScenarioResults_json.java
@@ -1,5 +1,5 @@
-package TestingSystem.Sapfor;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
+package SapforTestingSystem.Json;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;
diff --git a/src/TestingSystem/Sapfor/Scenario_json.java b/src/SapforTestingSystem/Json/Scenario_json.java
similarity index 90%
rename from src/TestingSystem/Sapfor/Scenario_json.java
rename to src/SapforTestingSystem/Json/Scenario_json.java
index 94af1358..72bdf526 100644
--- a/src/TestingSystem/Sapfor/Scenario_json.java
+++ b/src/SapforTestingSystem/Json/Scenario_json.java
@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor;
+package SapforTestingSystem.Json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
 
diff --git a/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfiguration.java b/src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java
similarity index 94%
rename from src/TestingSystem/Sapfor/SapforConfiguration/SapforConfiguration.java
rename to src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java
index ef460102..5b4cf757 100644
--- a/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfiguration.java
+++ b/src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java
@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforConfiguration;
+package SapforTestingSystem.SapforConfiguration;
 import Common.Database.rDBObject;
 public class SapforConfiguration extends rDBObject {
     //настройки.
diff --git a/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationDBTable.java b/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
similarity index 95%
rename from src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationDBTable.java
rename to src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
index 0a81f8c1..34b76322 100644
--- a/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
@@ -1,12 +1,12 @@
-package TestingSystem.Sapfor.SapforConfiguration;
+package SapforTestingSystem.SapforConfiguration;
 import Common.Current;
 import Common.Database.*;
 import Common.Global;
 import Common.UI.DataSetControlForm;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Utils;
-import TestingSystem.Sapfor.SapforConfiguration.UI.SapforConfigurationFields;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 
 import java.util.LinkedHashMap;
 public class SapforConfigurationDBTable extends DBTable<String, SapforConfiguration> {
diff --git a/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationInterface.java b/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java
similarity index 95%
rename from src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationInterface.java
rename to src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java
index 47805385..234a2b6e 100644
--- a/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationInterface.java
+++ b/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java
@@ -1,7 +1,7 @@
-package TestingSystem.Sapfor.SapforConfiguration;
+package SapforTestingSystem.SapforConfiguration;
 import Common.Global;
 import Common.Utils.TextLog;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import java.util.Vector;
diff --git a/src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.form b/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form
similarity index 98%
rename from src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.form
rename to src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form
index 5c7967e2..144b027a 100644
--- a/src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.form
+++ b/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Sapfor.SapforConfiguration.UI.SapforConfigurationFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.java b/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java
similarity index 94%
rename from src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.java
rename to src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java
index 500523d7..c00d0f14 100644
--- a/src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.java
+++ b/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java
@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforConfiguration.UI;
+package SapforTestingSystem.SapforConfiguration.UI;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.Windows.Dialog.DialogFields;
 
diff --git a/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommand.java b/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java
similarity index 89%
rename from src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommand.java
rename to src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java
index b2038890..4ee68c06 100644
--- a/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommand.java
+++ b/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java
@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforConfigurationCommand;
+package SapforTestingSystem.SapforConfigurationCommand;
 import Common.Database.rDBObject;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.sun.org.glassfish.gmbal.Description;
diff --git a/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandInterface.java b/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
similarity index 83%
rename from src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
rename to src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
index 6e4918eb..06ef1edc 100644
--- a/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
+++ b/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforConfigurationCommand;
+package SapforTestingSystem.SapforConfigurationCommand;
 import Common.Current;
 public class SapforConfigurationCommandInterface {
     public static boolean isVisible(SapforConfigurationCommand object) {
diff --git a/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java b/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
similarity index 94%
rename from src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
rename to src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
index b096497c..be124155 100644
--- a/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
+++ b/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
@@ -1,10 +1,10 @@
-package TestingSystem.Sapfor.SapforConfigurationCommand;
+package SapforTestingSystem.SapforConfigurationCommand;
 import Common.Current;
 import Common.Database.DBTable;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.DBObjectDialog;
-import TestingSystem.Sapfor.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
+import SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforConfigurationCommand> {
     public SapforConfigurationCommandsDBTable() {
diff --git a/src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form b/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
similarity index 93%
rename from src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
rename to src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
index e4e0816d..2e533797 100644
--- a/src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
+++ b/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Sapfor.SapforConfigurationCommand.UI.SapforConfigurationCommandFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java b/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
similarity index 94%
rename from src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
rename to src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
index 6375a60c..82b4460c 100644
--- a/src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
+++ b/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforConfigurationCommand.UI;
+package SapforTestingSystem.SapforConfigurationCommand.UI;
 import Common.Current;
 import Common.UI.Tables.StyledCellLabel;
 import Common.UI.Windows.Dialog.DialogFields;
diff --git a/src/TestingSystem/Sapfor/SapforTask/MatchState.java b/src/SapforTestingSystem/SapforTask/MatchState.java
similarity index 96%
rename from src/TestingSystem/Sapfor/SapforTask/MatchState.java
rename to src/SapforTestingSystem/SapforTask/MatchState.java
index 0f2d9126..e0074cba 100644
--- a/src/TestingSystem/Sapfor/SapforTask/MatchState.java
+++ b/src/SapforTestingSystem/SapforTask/MatchState.java
@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforTask;
+package SapforTestingSystem.SapforTask;
 import Common.Current;
 import Common.UI.StatusEnum;
 import Common.UI.Themes.VisualiserFonts;
diff --git a/src/TestingSystem/Sapfor/SapforTask/SapforTaskResult.java b/src/SapforTestingSystem/SapforTask/SapforTaskResult.java
similarity index 80%
rename from src/TestingSystem/Sapfor/SapforTask/SapforTaskResult.java
rename to src/SapforTestingSystem/SapforTask/SapforTaskResult.java
index 075d8173..3e0ae2d4 100644
--- a/src/TestingSystem/Sapfor/SapforTask/SapforTaskResult.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTaskResult.java
@@ -1,6 +1,6 @@
-package TestingSystem.Sapfor.SapforTask;
+package SapforTestingSystem.SapforTask;
 import Common.Database.DBObject;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 public class SapforTaskResult extends DBObject {
     public SapforTasksPackage_2023 sapforTasksPackage;
     public SapforTask_2023 task;
diff --git a/src/TestingSystem/Sapfor/SapforTask/SapforTask_2023.java b/src/SapforTestingSystem/SapforTask/SapforTask_2023.java
similarity index 94%
rename from src/TestingSystem/Sapfor/SapforTask/SapforTask_2023.java
rename to src/SapforTestingSystem/SapforTask/SapforTask_2023.java
index 4f8d64dc..3828a9d9 100644
--- a/src/TestingSystem/Sapfor/SapforTask/SapforTask_2023.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTask_2023.java
@@ -1,8 +1,8 @@
-package TestingSystem.Sapfor.SapforTask;
+package SapforTestingSystem.SapforTask;
 import Common.Database.DBObject;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
-import TestingSystem.Sapfor.SapforVersion_json;
+import SapforTestingSystem.Json.SapforVersion_json;
 import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;
 
diff --git a/src/TestingSystem/Sapfor/SapforTask/SapforTasksDBTable.java b/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
similarity index 97%
rename from src/TestingSystem/Sapfor/SapforTask/SapforTasksDBTable.java
rename to src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
index 3a911290..7ae5ca09 100644
--- a/src/TestingSystem/Sapfor/SapforTask/SapforTasksDBTable.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforTask;
+package SapforTestingSystem.SapforTask;
 import Common.Current;
 import Common.Database.DBTable;
 import Common.UI.DataSetControlForm;
diff --git a/src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackage_2023.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java
similarity index 96%
rename from src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackage_2023.java
rename to src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java
index df3611d1..7cdf00f0 100644
--- a/src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackage_2023.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java
@@ -1,7 +1,7 @@
-package TestingSystem.Sapfor.SapforTasksPackage;
+package SapforTestingSystem.SapforTasksPackage;
 import Common.Database.DBObject;
 import Common.Database.iDBObject;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import TestingSystem.TasksPackage.TasksPackageState;
 import TestingSystem.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackagesDBTable.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
similarity index 96%
rename from src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackagesDBTable.java
rename to src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
index aa117338..addd4e8d 100644
--- a/src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackagesDBTable.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
@@ -1,8 +1,8 @@
-package TestingSystem.Sapfor.SapforTasksPackage;
+package SapforTestingSystem.SapforTasksPackage;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
 
 import java.util.Date;
 import java.util.LinkedHashMap;
diff --git a/src/TestingSystem/TestsDatabase.java b/src/TestingSystem/TestsDatabase.java
index 497a9c02..aea71ec9 100644
--- a/src/TestingSystem/TestsDatabase.java
+++ b/src/TestingSystem/TestsDatabase.java
@@ -4,8 +4,8 @@ import GlobalData.Settings.SettingName;
 import TestingSystem.Configuration.UI.ConfigurationDBTable;
 import TestingSystem.Group.GroupsDBTable;
 import TestingSystem.MachineMaxKernels.MachineMaxKernelsDBTable;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfigurationDBTable;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
 import TestingSystem.TSetting.TSetting;
 import TestingSystem.TSetting.TSettingsDBTable;
 import TestingSystem.Test.TestDBTable;
diff --git a/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java b/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java
index 012ee773..423dadf5 100644
--- a/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java
+++ b/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.ScenarioResults_json;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.Json.ScenarioResults_json;
 import Visual_DVM_2021.Passes.Pass_2021;
 import org.apache.commons.io.FileUtils;
 
diff --git a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
index b8bd01ac..a4155372 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.DataSet;
-import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
+import SapforTestingSystem.SapforTask.SapforTaskResult;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class CompareSapforPackages extends Pass_2021 {
     DataSet<String, SapforTaskResult> masterTasks;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java
index 443db88d..e2980672 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
 
 import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
index 1f0cec9c..b62a9118 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
 
 import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
index d018f9f8..9813af1b 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
@@ -4,7 +4,7 @@ import Common.Database.Database;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 import Visual_DVM_2021.Passes.DeleteObjectPass;
 
 import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java b/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
index 693b2e67..f088c04d 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.EditObjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EditSapforConfiguration extends EditObjectPass<SapforConfiguration> {
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java b/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java
index cd634f42..9a8f2e1a 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.EditObjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EditSapforConfigurationCommand  extends EditObjectPass<SapforConfigurationCommand> {
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java b/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java
index 9bef2d2a..ca1baca3 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java
+++ b/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 public class EditSapforConfigurationCommandOnServer extends TestingSystemPass<SapforConfigurationCommand> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java b/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java
index 1b73c366..cd5ed94b 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java
+++ b/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 public class EditSapforConfigurationOnServer extends TestingSystemPass<SapforConfiguration> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java b/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java
index d51b4506..0bd329b6 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java
@@ -6,9 +6,9 @@ import ProjectData.Files.DBProjectFile;
 import ProjectData.LanguageName;
 import ProjectData.Messages.Errors.MessageError;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.SapforVersion_json;
+import SapforTestingSystem.SapforTask.SapforTaskResult;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.Json.SapforVersion_json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import org.apache.commons.io.FileUtils;
diff --git a/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java
index b85d0051..ef137977 100644
--- a/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java
@@ -2,10 +2,10 @@ package Visual_DVM_2021.Passes.All;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.SapforVersion_json;
-import TestingSystem.Sapfor.ScenarioResults_json;
-import TestingSystem.Sapfor.Scenario_json;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.Json.SapforVersion_json;
+import SapforTestingSystem.Json.ScenarioResults_json;
+import SapforTestingSystem.Json.Scenario_json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/PerformScenario.java b/src/Visual_DVM_2021/Passes/All/PerformScenario.java
index 93e5274b..15636056 100644
--- a/src/Visual_DVM_2021/Passes/All/PerformScenario.java
+++ b/src/Visual_DVM_2021/Passes/All/PerformScenario.java
@@ -3,11 +3,11 @@ import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
-import TestingSystem.Sapfor.SapforVersion_json;
-import TestingSystem.Sapfor.ScenarioResults_json;
-import TestingSystem.Sapfor.Scenario_json;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.Json.SapforVersion_json;
+import SapforTestingSystem.Json.ScenarioResults_json;
+import SapforTestingSystem.Json.Scenario_json;
 import TestingSystem.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java b/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
index fd5154b2..4ece2c01 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 public class PublishSapforConfiguration extends TestingSystemPass<SapforConfiguration> {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java b/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java
index 158e9e67..6d2878ba 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 public class PublishSapforConfigurationCommand extends TestingSystemPass<SapforConfigurationCommand> {
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index dd6e167c..ad6d622c 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -9,11 +9,11 @@ import ProjectData.LanguageName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Group.Group;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfigurationInterface;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
-import TestingSystem.Sapfor.Scenario_json;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.Json.Scenario_json;
 import TestingSystem.Test.Test;
 import TestingSystem.Test.TestInterface;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
index 52b73d53..62de8998 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Interface;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 public interface TestingWindow extends VisualizerForm {
     void ShowAll();
     void RestoreLastCredentials();
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index 1158a3eb..7fe69369 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -7,8 +7,8 @@ import Common.UI.Label.ShortLabel;
 import Common.UI.Menus_2023.VisualiserMenuBar;
 import Common.UI.UI;
 import Common.Utils.TextLog;
-import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTask.SapforTaskResult;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 import TestingSystem.Test.ProjectFiles_json;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java
index 7463bb86..25d35318 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Current;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
 //упразднить.
 public class SapforTasksComparisonForm extends TasksComparisonForm<SapforTask_2023> {
     public SapforTasksComparisonForm(ComparisonForm<SapforTask_2023> slave_in) {
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 840037c3..244c1f5c 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -10,7 +10,7 @@ import GlobalData.Credentials.Credentials;
 import TestingSystem.Configuration.UI.ConfigurationDBTable;
 import TestingSystem.Group.Group;
 import TestingSystem.MachineMaxKernels.MachineMaxKernels;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 import TestingSystem.TasksPackage.TasksPackageDBTable;
 import TestingSystem.Test.Test;
 import Visual_DVM_2021.UI.Interface.FormWithSplitters;