From beb1359544a920c1e76a528d2c697eed8f0be1b4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 17 Nov 2023 00:04:21 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 137 ++++++++++++++++--
 src/Common/Current.java                       |  42 +++---
 src/Common/Global.java                        |   4 +-
 .../GroupsMenuBar/GroupsMenuBar.java          |   6 +-
 .../UI/Menus_2023/TestingBar/TestingBar.java  |   2 +-
 src/Common/UI/UI.java                         |  22 +--
 src/GlobalData/Tasks/RunTask/RunTask.java     |   2 +-
 src/GlobalData/User/User.java                 |   2 +-
 src/ProjectData/Files/DBProjectFile.java      |  15 ++
 src/ProjectData/Project/db_project_info.java  |   7 +-
 src/Repository/Server/ServerCode.java         |   1 +
 .../PerformSapforTask.java                    |   6 +-
 .../ServerSapfor/ServerSapforsDBTable.java    | 121 ----------------
 src/SapforTestingSystem/TaskThread.java       |   4 +-
 .../Group/Group.java}                         |  94 ++++++------
 .../{ => Common}/Group/GroupsDBTable.java     |   9 +-
 .../{ => Common}/Group/UI/GroupFields.form    |   2 +-
 .../{ => Common}/Group/UI/GroupFields.java    |   4 +-
 .../{ => Common}/TSetting/TSetting.java       |   2 +-
 .../TSetting/TSettingsDBTable.java            |   2 +-
 .../{ => Common}/TasksDatabase.java           |  28 ++--
 .../TasksPackageToKill.java                   |   2 +-
 .../TasksPackageToKillDBTable.java            |   2 +-
 .../{ => Common}/Test/ProjectFiles_json.java  |   2 +-
 src/TestingSystem/{ => Common}/Test/Test.java |  30 +++-
 .../{ => Common}/Test/TestDBTable.java        |  13 +-
 .../{ => Common}/Test/TestType.java           |   2 +-
 .../{ => Common}/Test/UI/TestFields.form      |   2 +-
 .../{ => Common}/Test/UI/TestFields.java      |   2 +-
 .../{ => Common}/TestingPlanner.java          |  17 ++-
 .../{ => Common}/TestingServer.java           |  49 +++----
 .../{ => Common}/TestsDatabase.java           |  18 +--
 .../Configuration/Configuration.java          |   2 +-
 .../Configuration/ConfigurationInterface.java |  10 +-
 .../UI/ConfigurationDBTable.java              |   6 +-
 .../Configuration/UI/ConfigurationFields.form |   2 +-
 .../Configuration/UI/ConfigurationFields.java |   2 +-
 .../{ => DVM}/Tasks/TestCompilationTask.java  |   8 +-
 .../Tasks/TestCompilationTasksDBTable.java    |   2 +-
 .../{ => DVM}/Tasks/TestRunTask.java          |   8 +-
 .../{ => DVM}/Tasks/TestRunTaskInterface.java |   2 +-
 .../{ => DVM}/Tasks/TestRunTasksDBTable.java  |   2 +-
 .../{ => DVM}/Tasks/TestTask.java             |  10 +-
 .../{ => DVM}/TasksPackage/TasksPackage.java  |   4 +-
 .../TasksPackage/TasksPackageDBTable.java     |   4 +-
 .../TasksPackage/TasksPackageState.java       |   2 +-
 .../TestsSupervisor_2022.java                 |  19 ++-
 .../{ => DVM}/UserConnection.java             |   2 +-
 src/TestingSystem/Group/Group.java            |  42 ------
 .../Json/SapforConfiguration_json.java        |   2 +-
 .../SAPFOR}/Json/SapforTasksPackage_json.java |   2 +-
 .../SAPFOR}/Json/SapforTasksResults_json.java |  10 +-
 .../SAPFOR}/Json/SapforTest_json.java         |   2 +-
 .../SAPFOR}/Json/SapforVersion_json.java      |   4 +-
 .../SAPFOR}/PackageModeSupervisor.java        |  12 +-
 .../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 +-
 .../SAPFOR}/SapforTask/MatchState.java        |   2 +-
 .../SAPFOR}/SapforTask/SapforTask.java        |   6 +-
 .../SapforTask/SapforTasksDBTable.java        |   2 +-
 .../SapforTasksPackage.java                   |   8 +-
 .../SapforTasksPackagesDBTable.java           |   4 +-
 .../UI/ConfigurationSummary.java              |   4 +-
 .../SapforTasksPackage/UI/GroupSummary.java   |   2 +-
 .../SapforTasksPackage/UI/MatchesSummary.java |   4 +-
 .../SapforTasksPackage/UI/PackageSummary.java |   2 +-
 .../UI/SapforPackageTreeNode.java             |   2 +-
 .../UI/SapforTasksPackageTree.java            |   4 +-
 .../UI/SapforVersionsTreeCellRenderer.java    |   2 +-
 .../SapforTasksPackage/UI/StateSummary.java   |   2 +-
 .../SapforTasksPackage/UI/TreeSummary.java    |   2 +-
 .../SapforTasksPackage/UI/VersionSummary.java |   4 +-
 .../SapforTasksPackageSupervisor.java         |  26 ++--
 .../SAPFOR}/ServerSapfor/ServerSapfor.java    |   2 +-
 .../ServerSapfor/ServerSapforsDBTable.java    |  46 ++++++
 src/TestingSystem/Test/TestInterface.java     |  24 ---
 .../Passes/All/AbortSapforTaskPackage.java    |   4 +-
 .../Passes/All/AbortSelectedPackages.java     |   4 +-
 .../Passes/All/ConvertCorrectnessTests.java   |   6 +-
 .../CreateTestsGroupFromSelectedVersions.java |   6 +-
 .../Passes/All/DeleteGroup.java               |   4 +-
 .../Passes/All/DeleteSapforConfiguration.java |   2 +-
 .../All/DeleteSapforConfigurationCommand.java |   2 +-
 .../Passes/All/DeleteSapforTasksPackage.java  |   4 +-
 .../All/DeleteSelectedConfigurations.java     |   2 +-
 .../Passes/All/DeleteSelectedTests.java       |   2 +-
 .../Passes/All/DeleteServerSapfor.java        |   4 +-
 .../All/DownloadSapforTasksPackage.java       |   4 +-
 .../Passes/All/DownloadTaskTest.java          |   4 +-
 .../Passes/All/DownloadTest.java              |  17 +--
 .../Passes/All/EditConfiguration.java         |   2 +-
 .../Passes/All/EditConfigurationOnServer.java |   2 +-
 src/Visual_DVM_2021/Passes/All/EditGroup.java |   4 +-
 .../Passes/All/EditSapforConfiguration.java   |   2 +-
 .../All/EditSapforConfigurationCommand.java   |   2 +-
 ...ditSapforConfigurationCommandOnServer.java |   2 +-
 .../All/EditSapforConfigurationOnServer.java  |   2 +-
 src/Visual_DVM_2021/Passes/All/EditTest.java  |   2 +-
 .../Passes/All/EditTestOnServer.java          |   2 +-
 .../Passes/All/InstallServerSapfor.java       |   2 +-
 .../Passes/All/PauseTesting.java              |   2 +-
 .../Passes/All/PlayTesting.java               |   2 +-
 .../Passes/All/PublishConfiguration.java      |   2 +-
 .../Passes/All/PublishGroup.java              |   4 +-
 .../All/PublishSapforConfiguration.java       |   2 +-
 .../PublishSapforConfigurationCommand.java    |   2 +-
 .../Passes/All/PublishServerSapfor.java       |   4 +-
 .../Passes/All/PublishTest.java               |  33 +++--
 .../Passes/All/PublishTestProject.java        |  16 ++
 .../Passes/All/ShowSapforTaskPackage.java     |   4 +-
 .../Passes/All/StartSapforTests.java          |  12 +-
 .../Passes/All/StartTests.java                |  19 ++-
 .../Passes/All/SwitchTestingEmail.java        |   2 +-
 .../Passes/All/SynchronizeTestsTasks.java     |   2 +-
 .../Passes/All/UnpackSapforTasksPackage.java  |   2 +-
 .../Passes/OpenSapforVersionPass.java         |   4 +-
 src/Visual_DVM_2021/Passes/PassCode_2021.java |   3 +
 .../Passes/Server/TestingSystemPass.java      |   2 +-
 src/Visual_DVM_2021/UI/Main/MainForm.java     |   4 +-
 .../UI/Main/SapforPackageFields.java          |   2 +-
 .../UI/Main/SapforPackageForm.java            |   2 +-
 .../UI/Main/SapforPackagesComparisonForm.java |   6 +-
 .../UI/Main/SapforVersionsComparisonForm.java |   2 +-
 .../UI/Main/TestRunTasksComparisonForm.java   |   2 +-
 132 files changed, 617 insertions(+), 591 deletions(-)
 delete mode 100644 src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java
 rename src/TestingSystem/{Group/GroupInterface.java => Common/Group/Group.java} (60%)
 rename src/TestingSystem/{ => Common}/Group/GroupsDBTable.java (96%)
 rename src/TestingSystem/{ => Common}/Group/UI/GroupFields.form (98%)
 rename src/TestingSystem/{ => Common}/Group/UI/GroupFields.java (92%)
 rename src/TestingSystem/{ => Common}/TSetting/TSetting.java (95%)
 rename src/TestingSystem/{ => Common}/TSetting/TSettingsDBTable.java (82%)
 rename src/TestingSystem/{ => Common}/TasksDatabase.java (91%)
 rename src/TestingSystem/{ => Common}/TasksPackageToKill/TasksPackageToKill.java (71%)
 rename src/TestingSystem/{ => Common}/TasksPackageToKill/TasksPackageToKillDBTable.java (80%)
 rename src/TestingSystem/{ => Common}/Test/ProjectFiles_json.java (86%)
 rename src/TestingSystem/{ => Common}/Test/Test.java (64%)
 rename src/TestingSystem/{ => Common}/Test/TestDBTable.java (90%)
 rename src/TestingSystem/{ => Common}/Test/TestType.java (93%)
 rename src/TestingSystem/{ => Common}/Test/UI/TestFields.form (97%)
 rename src/TestingSystem/{ => Common}/Test/UI/TestFields.java (93%)
 rename src/TestingSystem/{ => Common}/TestingPlanner.java (95%)
 rename src/TestingSystem/{ => Common}/TestingServer.java (94%)
 rename src/TestingSystem/{ => Common}/TestsDatabase.java (80%)
 rename src/TestingSystem/{ => DVM}/Configuration/Configuration.java (96%)
 rename src/TestingSystem/{ => DVM}/Configuration/ConfigurationInterface.java (86%)
 rename src/TestingSystem/{ => DVM}/Configuration/UI/ConfigurationDBTable.java (97%)
 rename src/TestingSystem/{ => DVM}/Configuration/UI/ConfigurationFields.form (99%)
 rename src/TestingSystem/{ => DVM}/Configuration/UI/ConfigurationFields.java (98%)
 rename src/TestingSystem/{ => DVM}/Tasks/TestCompilationTask.java (91%)
 rename src/TestingSystem/{ => DVM}/Tasks/TestCompilationTasksDBTable.java (93%)
 rename src/TestingSystem/{ => DVM}/Tasks/TestRunTask.java (95%)
 rename src/TestingSystem/{ => DVM}/Tasks/TestRunTaskInterface.java (99%)
 rename src/TestingSystem/{ => DVM}/Tasks/TestRunTasksDBTable.java (99%)
 rename src/TestingSystem/{ => DVM}/Tasks/TestTask.java (94%)
 rename src/TestingSystem/{ => DVM}/TasksPackage/TasksPackage.java (97%)
 rename src/TestingSystem/{ => DVM}/TasksPackage/TasksPackageDBTable.java (97%)
 rename src/TestingSystem/{ => DVM}/TasksPackage/TasksPackageState.java (98%)
 rename src/TestingSystem/{TestsSupervisor_2022 => DVM}/TestsSupervisor_2022.java (97%)
 rename src/TestingSystem/{ => DVM}/UserConnection.java (99%)
 delete mode 100644 src/TestingSystem/Group/Group.java
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/Json/SapforConfiguration_json.java (90%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/Json/SapforTasksPackage_json.java (92%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/Json/SapforTasksResults_json.java (98%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/Json/SapforTest_json.java (83%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/Json/SapforVersion_json.java (99%)
 rename src/{SapforTestingSystem/PackageModeSupervisor => TestingSystem/SAPFOR}/PackageModeSupervisor.java (90%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforConfiguration/SapforConfiguration.java (94%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforConfiguration/SapforConfigurationDBTable.java (95%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforConfiguration/SapforConfigurationInterface.java (95%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforConfiguration/UI/SapforConfigurationFields.form (98%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforConfiguration/UI/SapforConfigurationFields.java (93%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforConfigurationCommand/SapforConfigurationCommand.java (89%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforConfigurationCommand/SapforConfigurationCommandInterface.java (83%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java (94%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form (93%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java (94%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTask/MatchState.java (96%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTask/SapforTask.java (97%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTask/SapforTasksDBTable.java (97%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/SapforTasksPackage.java (94%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/SapforTasksPackagesDBTable.java (96%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/UI/ConfigurationSummary.java (90%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/UI/GroupSummary.java (86%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/UI/MatchesSummary.java (84%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/UI/PackageSummary.java (85%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/UI/SapforPackageTreeNode.java (89%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/UI/SapforTasksPackageTree.java (96%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java (93%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/UI/StateSummary.java (92%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/UI/TreeSummary.java (89%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackage/UI/VersionSummary.java (83%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java (94%)
 rename src/{SapforTestingSystem => TestingSystem/SAPFOR}/ServerSapfor/ServerSapfor.java (96%)
 create mode 100644 src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
 delete mode 100644 src/TestingSystem/Test/TestInterface.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/PublishTestProject.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 298eb1b7..3a745c79 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,19 +7,138 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteGroup.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestProject.java" afterDir="false" />
       <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/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.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/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedGroups.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforConfiguration_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTasksPackage_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTest_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTest_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/MatchState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/MatchState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/GroupSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/MatchesSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/StateSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/TreeSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/TaskThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/TaskThread.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/Configuration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/ConfigurationInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/ConfigurationInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/UI/ConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/UI/ConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/Group.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/GroupInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/UI/GroupFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/GroupFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/UI/GroupFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/GroupFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TSetting/TSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TSetting/TSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TSetting/TSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TSetting/TSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestCompilationTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestCompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestCompilationTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTaskInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTaskInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackageToKill/TasksPackageToKill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackageToKill/TasksPackageToKillDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKillDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/ProjectFiles_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/ProjectFiles_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/TestInterface.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/TestType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/UI/TestFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/TestFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/UI/TestFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/TestFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteGroup.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/DeleteSelectedConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditGroup.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/EditTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTestOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTestOnServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PauseTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PauseTesting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PlayTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PlayTesting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.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/PublishServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.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/Passes/All/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.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/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestRunTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestRunTasksComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -61,7 +180,7 @@
     <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/src/TestingSystem/TestingServer.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="KotlinCodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
@@ -117,11 +236,11 @@
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Editor" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
+      <recent name="TestingSystem.Group.GroupsDBTable" />
       <recent name="Common.Constants" />
       <recent name="SapforTestingSystem.SapforTask.SapforTask" />
       <recent name="TestingSystem.TestingServer" />
       <recent name="Common.Constants.Constants" />
-      <recent name="Constants" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" />
diff --git a/src/Common/Current.java b/src/Common/Current.java
index d7045bd9..9d9f44ca 100644
--- a/src/Common/Current.java
+++ b/src/Common/Current.java
@@ -18,12 +18,12 @@ import ProjectData.SapforData.Functions.FuncInfo;
 import ProjectData.SapforData.Regions.ParallelRegion;
 import Repository.BugReport.BugReport;
 import Repository.Subscribes.Subscriber;
-import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.Test.Test;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.UI.PassForm;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -224,22 +224,22 @@ public enum Current {
     public static boolean HasGroup() {
         return get(Current.Group) != null;
     }
-    public static TestingSystem.Group.Group getGroup() {
-        return (TestingSystem.Group.Group) get(Current.Group);
+    public static TestingSystem.Common.Group.Group getGroup() {
+        return (TestingSystem.Common.Group.Group) get(Current.Group);
     }
     //--
     public static boolean HasConfiguration() {
         return get(Current.Configuration) != null;
     }
-    public static TestingSystem.Configuration.Configuration getConfiguration() {
+    public static TestingSystem.DVM.Configuration.Configuration getConfiguration() {
         return (Configuration) get(Current.Configuration);
     }
     public static SapforConfiguration getSapforConfiguration() {
-        return (SapforTestingSystem.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
+        return (TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
     }
     //--
     public static Test getTest() {
-        return (TestingSystem.Test.Test) get(Current.Test);
+        return (TestingSystem.Common.Test.Test) get(Current.Test);
     }
     public static boolean HasTest() {
         return get(Current.Test) != null;
@@ -248,7 +248,7 @@ public enum Current {
         return get(Current.Version) != null;
     }
     public static TestCompilationTask getTestCompilationTask() {
-        return (TestingSystem.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
+        return (TestingSystem.DVM.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
     }
     public static boolean HasTestCompilationTask() {
         return get(Current.TestCompilationTask) != null;
@@ -257,7 +257,7 @@ public enum Current {
         return get(Current.TestRunTask) != null;
     }
     public static TestRunTask getTestRunTask() {
-        return (TestingSystem.Tasks.TestRunTask) get(Current.TestRunTask);
+        return (TestingSystem.DVM.Tasks.TestRunTask) get(Current.TestRunTask);
     }
     public static RemoteFile getComponentServerBackup() {
         return (RemoteFile) get(Current.ComponentServerBackup);
@@ -332,8 +332,8 @@ public enum Current {
     public static boolean HasSapforTask() {
         return get(Current.SapforTask) != null;
     }
-    public static SapforTestingSystem.SapforTask.SapforTask getSapforTask() {
-        return (SapforTestingSystem.SapforTask.SapforTask) get(Current.SapforTask);
+    public static TestingSystem.SAPFOR.SapforTask.SapforTask getSapforTask() {
+        return (TestingSystem.SAPFOR.SapforTask.SapforTask) get(Current.SapforTask);
     }
     public static ProjectData.ProjectView getProjectView() {
         return (ProjectData.ProjectView) get(ProjectView);
@@ -360,8 +360,8 @@ public enum Current {
     public static boolean CheckID(Current name, int id) {
         return (get(name) != null) && (((iDBObject) get(name)).id == id);
     }
-    public static SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
-        return (SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
+    public static TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
+        return (TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
     }
     public static boolean HasSapforProfile() {
         return get(Current.SapforProfile) != null;
@@ -372,15 +372,15 @@ public enum Current {
     public static boolean HasSapforTasksPackage() {
         return get(Current.SapforTasksPackage) != null;
     }
-    public static SapforTestingSystem.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
-        return (SapforTestingSystem.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
+    public static TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
+        return (TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
     }
     //сапфоры установленные на тестовый сервер.
     public static boolean HasServerSapfor() {
         return get(Current.ServerSapfor) != null;
     }
-    public static SapforTestingSystem.ServerSapfor.ServerSapfor getServerSapfor() {
-        return (SapforTestingSystem.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
+    public static TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
+        return (TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
     }
     //--------------------------------------------
     public String getDescription() {
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 09927ac1..3613eed8 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -13,8 +13,8 @@ import Repository.Component.Sapfor.MessagesServer;
 import Repository.Component.Sapfor.Sapfor_F;
 import Repository.Component.Sapfor.TransformationPermission;
 import Repository.Server.ComponentsServer;
-import SapforTestingSystem.PackageModeSupervisor.PackageModeSupervisor;
-import TestingSystem.TestingServer;
+import TestingSystem.SAPFOR.PackageModeSupervisor;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import Visual_DVM_2021.UI.Interface.Loggable;
diff --git a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
index ef6cb1dc..c37f0819 100644
--- a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
+++ b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
@@ -3,7 +3,7 @@ import Common.Global;
 import Common.UI.Menus_2023.DataMenuBar;
 import Common.UI.Menus_2023.MenuBarButton;
 import Common.Utils.Utils;
-import TestingSystem.Group.GroupInterface;
+import TestingSystem.Common.Group.GroupsDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
@@ -21,13 +21,13 @@ public class GroupsMenuBar extends DataMenuBar {
                 setToolTipText("Отображать только группы тестов авторства пользователя");
                 Mark();
                 addActionListener(e -> {
-                    GroupInterface.filterMyOnly = !GroupInterface.filterMyOnly;
+                    GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
                     Mark();
                     Global.testingServer.db.groups.ShowUI();
                 });
             }
             public void Mark() {
-                setIcon(Utils.getIcon(GroupInterface.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                setIcon(Utils.getIcon(GroupsDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
     }
diff --git a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
index adc72c67..c54a3705 100644
--- a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
+++ b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
@@ -6,7 +6,7 @@ import Common.UI.Menus_2023.VisualiserMenuBar;
 import Common.UI.Themes.VisualiserFonts;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 8671bbb9..6850a264 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -57,7 +57,7 @@ import GlobalData.Tasks.RunTask.RunTasksDBTable;
 import GlobalData.User.UsersDBTable;
 import ProjectData.DBArray.ArraysDBTable;
 import ProjectData.Files.UI.FilesTreeCellRenderer;
-import SapforTestingSystem.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
 import ProjectData.Project.UI.VersionsTreeCellRenderer;
 import ProjectData.SapforData.Arrays.ArraysSet;
 import ProjectData.SapforData.Arrays.UI.DimensionRenderer;
@@ -69,16 +69,16 @@ import ProjectData.SapforData.Variants.VariantsSet;
 import Repository.BugReport.BugReportsDBTable;
 import Repository.Component.UI.ComponentsForm;
 import Repository.Subscribes.SubsribersDBTable;
-import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
-import SapforTestingSystem.SapforTask.SapforTasksDBTable;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
-import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
-import TestingSystem.Configuration.UI.ConfigurationDBTable;
-import TestingSystem.Group.GroupsDBTable;
-import TestingSystem.Tasks.TestRunTasksDBTable;
-import TestingSystem.TasksPackage.TasksPackageDBTable;
-import TestingSystem.Test.TestDBTable;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
+import TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
+import TestingSystem.Common.Group.GroupsDBTable;
+import TestingSystem.DVM.Tasks.TestRunTasksDBTable;
+import TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
+import TestingSystem.Common.Test.TestDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.UI.Interface.DebugWindow;
 import Visual_DVM_2021.UI.Interface.VersionsWindow;
diff --git a/src/GlobalData/Tasks/RunTask/RunTask.java b/src/GlobalData/Tasks/RunTask/RunTask.java
index a743a1f6..94b4c015 100644
--- a/src/GlobalData/Tasks/RunTask/RunTask.java
+++ b/src/GlobalData/Tasks/RunTask/RunTask.java
@@ -10,7 +10,7 @@ import GlobalData.Tasks.CompilationTask.CompilationTask;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Tasks.TestRunTaskInterface;
+import TestingSystem.DVM.Tasks.TestRunTaskInterface;
 import com.sun.org.glassfish.gmbal.Description;
 import org.apache.commons.io.FileUtils;
 
diff --git a/src/GlobalData/User/User.java b/src/GlobalData/User/User.java
index b342b2af..a5c27c5a 100644
--- a/src/GlobalData/User/User.java
+++ b/src/GlobalData/User/User.java
@@ -3,7 +3,7 @@ import Common.Constants;
 import Common.Current;
 import Common.Database.iDBObject;
 import GlobalData.Machine.Machine;
-import TestingSystem.UserConnection;
+import TestingSystem.DVM.UserConnection;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 import com.sun.org.glassfish.gmbal.Description;
 
diff --git a/src/ProjectData/Files/DBProjectFile.java b/src/ProjectData/Files/DBProjectFile.java
index 7968f80f..c301a693 100644
--- a/src/ProjectData/Files/DBProjectFile.java
+++ b/src/ProjectData/Files/DBProjectFile.java
@@ -472,4 +472,19 @@ public class DBProjectFile extends ProjectFile {
         }
         return res;
     }
+    //---
+    public String getStyleOptions() {
+        if (languageName == LanguageName.fortran) {
+            switch (style) {
+                case fixed:
+                case extended:
+                    return "-FI";
+                case free:
+                    return "-f90";
+                case none:
+                    break;
+            }
+        }
+        return "";
+    }
 }
\ No newline at end of file
diff --git a/src/ProjectData/Project/db_project_info.java b/src/ProjectData/Project/db_project_info.java
index 0302b294..69084b60 100644
--- a/src/ProjectData/Project/db_project_info.java
+++ b/src/ProjectData/Project/db_project_info.java
@@ -31,9 +31,8 @@ import ProjectData.SapforData.Regions.ParallelRegion;
 import ProjectData.SapforData.Regions.RegionsSet;
 import ProjectData.SapforData.Variants.ParallelVariant;
 import ProjectData.SapforData.Variants.VariantsSet;
-import TestingSystem.Test.ProjectFiles_json;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestInterface;
+import TestingSystem.Common.Test.ProjectFiles_json;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import com.mxgraph.swing.mxGraphComponent;
@@ -212,7 +211,7 @@ public class db_project_info extends DBObject {
     }
     //для запуска тестов.
     public db_project_info(Test test) throws Exception {
-        Home = TestInterface.getServerPath(test);
+        Home = test.getServerPath();
         //-
         CheckVisualiserDirectories();
         db = new ProjectDatabase(this);
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index 9dbfc26b..9cfeff97 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -79,4 +79,5 @@ public enum ServerCode {
     OLD,
     //-
     PublishAIObject, //публикация объекта с автоинкрементом.
+    PublishTestProject, //отправка теста на сервер в архиве.
 }
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index 956c7960..22e3f58d 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -4,9 +4,9 @@ import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Messages.Errors.MessageError;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.Json.SapforVersion_json;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import org.apache.commons.io.FileUtils;
diff --git a/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java b/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java
deleted file mode 100644
index 33d38e0d..00000000
--- a/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package SapforTestingSystem.ServerSapfor;
-import Common.Current;
-import Common.Database.iDBTable;
-import Common.UI.DataSetControlForm;
-import Common.UI.Tables.TableRenderers;
-public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
-    public ServerSapforsDBTable() {
-        super(ServerSapfor.class);
-    }
-    @Override
-    public String getSingleDescription() {
-        return "SAPFOR";
-    }
-    @Override
-    public String getPluralDescription() {
-        return "SAPFOR";
-    }
-    @Override
-    public Current CurrentName() {
-        return Current.ServerSapfor;
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{"версия", "дата сборки"};
-    }
-    @Override
-    public Object getFieldAt(ServerSapfor object, int columnIndex) {
-        switch (columnIndex) {
-            case 1:
-                return object.version;
-            case 2:
-                return object.getBuildDate();
-        }
-        return null;
-    }
-    @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-                columns.get(2).setRenderer(TableRenderers.RendererDate);
-            }
-        };
-    }
-    //---
-    /*
-    @Override
-    public DBObjectDialog<RemoteSapfor, RemoteSapforFields> getDialog() {
-        return new DBObjectDialog<RemoteSapfor, RemoteSapforFields>(RemoteSapforFields.class) {
-            @Override
-            public void validateFields() {
-                //<editor-fold desc="расположение">
-                String home = fields.tfHome.getText();
-                if (!home.isEmpty()) {
-                    if (home.startsWith("/")) {
-                        if (Utils.ContainsCyrillic(home))
-                            Log.Writeln("Расположение системы SAPFOR не может содержать кириллицу");
-                        else {
-                            new PathValidator(home, "Расположение системы SAPFOR", Log).Validate();
-                        }
-                    } else
-                        Log.Writeln("Расположение системы SAPFOR может быть либо пустой строкой, либо путём к файлу");
-                }
-                //</editor-fold>
-                //<editor-fold desc="команда вызова">
-                String call_command = fields.tfCallCommand.getText();
-                if (call_command.isEmpty()) Log.Writeln("Команда вызова системы SAPFOR не может быть пустой");
-                else if (Utils.ContainsCyrillic(call_command))
-                    Log.Writeln("Команда вызова системы SAPFOR не может содержать кириллицу");
-                else {
-                    switch (call_command.charAt(0)) {
-                        case ' ':
-                            Log.Writeln("Команда вызова системы SAPFOR не может начинаться с пробела.");
-                            break;
-                        case '/':
-                            if (call_command.endsWith("/"))
-                                Log.Writeln("Каталог не может быть указан в качестве команды.");
-                            else new PathValidator(call_command, "Команда вызова системы SAPFOR", Log).Validate();
-                            break;
-                        default:
-                            //это команда.
-                            //самое опасное место. теоретически тут можно ввести любую команду ОС, в том числе rm -rf
-                            if (call_command.contains(" "))
-                                Log.Writeln("Прямая команда вызова системы SAPFOR не может содержать пробелы");
-                            if (!call_command.contains("+") && Utils.ContainsForbiddenName(call_command))
-                                Log.Writeln("Прямая команда вызова системы SAPFOR содержит запрещённые символы");
-                            else {
-                                if (Utils.isLinuxSystemCommand(call_command))
-                                    Log.Writeln(Utils.DQuotes(call_command) + " является системной командой Linux");
-                            }
-                            break;
-                    }
-                }
-                //</editor-fold>
-            }
-            @Override
-            public void fillFields() {
-                fields.tfDescription.setText(Result.description);
-                fields.tfCallCommand.setText(Result.call_command);
-                fields.tfHome.setText(Result.home_path);
-                UI.TrySelect(fields.cbLanguageName, Result.languageName);
-                fields.tfVersion.setText(Result.version);
-                fields.events_on = true;
-            }
-            @Override
-            public void ProcessResult() {
-                Result.machine_id = Current.getMachine().id;
-                Result.description = fields.tfDescription.getText();
-                Result.call_command = fields.tfCallCommand.getText();
-                Result.home_path = fields.tfHome.getText();
-                Result.languageName = (LanguageName) fields.cbLanguageName.getSelectedItem();
-                Result.version = fields.tfVersion.getText();
-            }
-            @Override
-            public int getDefaultHeight() {
-                return 300;
-            }
-        };
-     */
-}
diff --git a/src/SapforTestingSystem/TaskThread.java b/src/SapforTestingSystem/TaskThread.java
index ef64d6ac..0cce3301 100644
--- a/src/SapforTestingSystem/TaskThread.java
+++ b/src/SapforTestingSystem/TaskThread.java
@@ -1,6 +1,6 @@
 package SapforTestingSystem;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 
 import java.io.File;
 public class TaskThread extends Thread {
diff --git a/src/TestingSystem/Group/GroupInterface.java b/src/TestingSystem/Common/Group/Group.java
similarity index 60%
rename from src/TestingSystem/Group/GroupInterface.java
rename to src/TestingSystem/Common/Group/Group.java
index ebeab1dc..3b466a14 100644
--- a/src/TestingSystem/Group/GroupInterface.java
+++ b/src/TestingSystem/Common/Group/Group.java
@@ -1,55 +1,33 @@
-package TestingSystem.Group;
+package TestingSystem.Common.Group;
 import Common.Current;
+import Common.Database.DBObject;
+import Common.Database.riDBObject;
 import Common.Global;
+import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.LanguageName;
 import ProjectData.Project.db_project_info;
+import TestingSystem.Common.Test.TestType;
+import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.LinkedHashMap;
 import java.util.Vector;
-//dynamic cats возможен через рефлексию.
-//https://stackoverflow.com/questions/2127318/java-how-can-i-do-dynamic-casting-of-a-variable-from-one-type-to-another
-public class GroupInterface {
-    //-
-    public static boolean filterMyOnly = false;
+public class Group extends riDBObject {
+    @Description("DEFAULT 'Default'")
+    public TestType type = TestType.Default;
+    @Description("DEFAULT 'fortran'")
+    public LanguageName language = LanguageName.fortran;
     //--
-    public static boolean isVisible(Group object) {
-        return (!filterMyOnly || Current.getAccount().email.equals(object.sender_address)) &&
-                Global.testingServer.db.groups.applyFilters(object);
-    }
-    public static String getStyleOptions(DBProjectFile program) {
-        if (program.languageName == LanguageName.fortran) {
-            switch (program.style) {
-                case fixed:
-                case extended:
-                    return "-FI";
-                case free:
-                    return "-f90";
-                case none:
-                    break;
-            }
-        }
-        return "";
-    }
-    public static String getLanguageCompileCommand(LanguageName language) {
-        switch (language) {
-            case fortran:
-                return "f";
-            case c:
-                return "c";
-        }
-        return "";
-    }
-    public static String getLanguageLinkCommand(LanguageName language) {
-        switch (language) {
-            case fortran:
-                return "flink";
-            case c:
-                return "clink";
-        }
-        return "";
+    @Description("IGNORE")
+    public LinkedHashMap<String, byte[]> testsFiles = new LinkedHashMap<>(); //транспорт.
+    //--
+    @Override
+    public boolean isVisible() {
+        return (!GroupsDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) &&
+                Global.testingServer.db.groups.applyFilters(this);
     }
+    //-
     public static void generateForLanguage(
             String dvm_drv,
             LinkedHashMap<LanguageName, Vector<DBProjectFile>> programs,
@@ -75,7 +53,7 @@ public class GroupInterface {
                                 String.join(" ",
                                         Utils.MFVar(LANG_ + "COMMAND"),
                                         Utils.MFVar(LANG_ + "FLAGS"),
-                                        getStyleOptions(program),
+                                        program.getStyleOptions(),
                                         "-c",
                                         program.getQSourceName(),
                                         "-o",
@@ -85,7 +63,7 @@ public class GroupInterface {
             }
             titles.add(String.join("\n",
                     LANG_ + "COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
-                            getLanguageCompileCommand(language),
+                            language.getDVMCompile(),
                     LANG_ + "FLAGS=" + flags_in,
                     LANG_ + "OBJECTS=" + String.join(" ", module_objects),
                     ""
@@ -94,7 +72,7 @@ public class GroupInterface {
             bodies.add(module_body);
         }
     }
-    public static String GenerateMakefile(Group object, db_project_info project, String dvm_drv, String flags_in) {
+    public String GenerateMakefile(db_project_info project, String dvm_drv, String flags_in) {
         //----->>
         LinkedHashMap<LanguageName, Vector<DBProjectFile>> programs = project.getPrograms();
         Vector<String> titles = new Vector<>();
@@ -102,11 +80,11 @@ public class GroupInterface {
         Vector<String> bodies = new Vector<>();
         String binary = Utils.DQuotes("0");
         //----->>
-        generateForLanguage(dvm_drv, programs, object.language, titles, objects, bodies, flags_in);
+        generateForLanguage(dvm_drv, programs, language, titles, objects, bodies, flags_in);
         //----->>
         return String.join("\n",
                 "LINK_COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
-                        getLanguageLinkCommand(object.language),
+                        language.getDVMLink(),
                 "LINK_FLAGS=" + flags_in + "\n",
                 String.join("\n", titles),
                 "all: " + binary,
@@ -114,7 +92,27 @@ public class GroupInterface {
                 "\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary,
                 String.join(" ", bodies));
     }
-    public static String getSummary(Group group) {
-        return group.description + " " + group.language.getDescription();
+    public String getSummary() {
+        return description + " " + language.getDescription();
+    }
+    //-
+
+    @Override
+    public void SynchronizeFields(DBObject src) {
+        super.SynchronizeFields(src);
+        Group g = (Group) src;
+        type = g.type;
+        language = g.language;
+    }
+    public Group(Group group) {
+        this.SynchronizeFields(group);
+    }
+    public Group() {
+    }
+    @Override
+    public void select(boolean flag) {
+        super.select(flag);
+        if (Current.hasUI())
+            UI.getMainWindow().ShowCheckedTestsCount();
     }
 }
diff --git a/src/TestingSystem/Group/GroupsDBTable.java b/src/TestingSystem/Common/Group/GroupsDBTable.java
similarity index 96%
rename from src/TestingSystem/Group/GroupsDBTable.java
rename to src/TestingSystem/Common/Group/GroupsDBTable.java
index 2f86e571..13b93324 100644
--- a/src/TestingSystem/Group/GroupsDBTable.java
+++ b/src/TestingSystem/Common/Group/GroupsDBTable.java
@@ -1,4 +1,4 @@
-package TestingSystem.Group;
+package TestingSystem.Common.Group;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
@@ -7,15 +7,16 @@ import Common.UI.Menus_2023.VisualiserMenu;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import ProjectData.LanguageName;
-import TestingSystem.Group.UI.GroupFields;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestType;
+import TestingSystem.Common.Group.UI.GroupFields;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.Test.TestType;
 
 import javax.swing.*;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 //-
 public class GroupsDBTable extends iDBTable<Group> {
+    public static boolean filterMyOnly = false;
     public Vector<TableFilter<Group>> typeFilters;
     public Vector<TableFilter<Group>> languageFilters;
     //------------------------------------------------>>>
diff --git a/src/TestingSystem/Group/UI/GroupFields.form b/src/TestingSystem/Common/Group/UI/GroupFields.form
similarity index 98%
rename from src/TestingSystem/Group/UI/GroupFields.form
rename to src/TestingSystem/Common/Group/UI/GroupFields.form
index abc7a5d1..d2211196 100644
--- a/src/TestingSystem/Group/UI/GroupFields.form
+++ b/src/TestingSystem/Common/Group/UI/GroupFields.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.Group.UI.GroupFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Common.Group.UI.GroupFields">
   <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/Group/UI/GroupFields.java b/src/TestingSystem/Common/Group/UI/GroupFields.java
similarity index 92%
rename from src/TestingSystem/Group/UI/GroupFields.java
rename to src/TestingSystem/Common/Group/UI/GroupFields.java
index 8843b49f..0f8d7c50 100644
--- a/src/TestingSystem/Group/UI/GroupFields.java
+++ b/src/TestingSystem/Common/Group/UI/GroupFields.java
@@ -1,8 +1,8 @@
-package TestingSystem.Group.UI;
+package TestingSystem.Common.Group.UI;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.Windows.Dialog.DialogFields;
 import ProjectData.LanguageName;
-import TestingSystem.Test.TestType;
+import TestingSystem.Common.Test.TestType;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/TestingSystem/TSetting/TSetting.java b/src/TestingSystem/Common/TSetting/TSetting.java
similarity index 95%
rename from src/TestingSystem/TSetting/TSetting.java
rename to src/TestingSystem/Common/TSetting/TSetting.java
index ea697110..db7c2ab0 100644
--- a/src/TestingSystem/TSetting/TSetting.java
+++ b/src/TestingSystem/Common/TSetting/TSetting.java
@@ -1,4 +1,4 @@
-package TestingSystem.TSetting;
+package TestingSystem.Common.TSetting;
 import Common.Database.DBObject;
 import GlobalData.Settings.SettingName;
 import com.sun.org.glassfish.gmbal.Description;
diff --git a/src/TestingSystem/TSetting/TSettingsDBTable.java b/src/TestingSystem/Common/TSetting/TSettingsDBTable.java
similarity index 82%
rename from src/TestingSystem/TSetting/TSettingsDBTable.java
rename to src/TestingSystem/Common/TSetting/TSettingsDBTable.java
index 2c43cafb..e2caf1c4 100644
--- a/src/TestingSystem/TSetting/TSettingsDBTable.java
+++ b/src/TestingSystem/Common/TSetting/TSettingsDBTable.java
@@ -1,4 +1,4 @@
-package TestingSystem.TSetting;
+package TestingSystem.Common.TSetting;
 import Common.Database.DBTable;
 public class TSettingsDBTable extends DBTable<String, TSetting> {
     public TSettingsDBTable() {
diff --git a/src/TestingSystem/TasksDatabase.java b/src/TestingSystem/Common/TasksDatabase.java
similarity index 91%
rename from src/TestingSystem/TasksDatabase.java
rename to src/TestingSystem/Common/TasksDatabase.java
index ee823680..5e5c9723 100644
--- a/src/TestingSystem/TasksDatabase.java
+++ b/src/TestingSystem/Common/TasksDatabase.java
@@ -1,21 +1,21 @@
-package TestingSystem;
+package TestingSystem.Common;
 import Common.Constants;
 import Common.Database.SQLITE.SQLiteDatabase;
 import Common.Global;
 import GlobalData.Settings.SettingName;
-import SapforTestingSystem.SapforTask.SapforTasksDBTable;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
-import TestingSystem.TSetting.TSetting;
-import TestingSystem.TSetting.TSettingsDBTable;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestCompilationTasksDBTable;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.Tasks.TestRunTasksDBTable;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackage.TasksPackageDBTable;
-import TestingSystem.TasksPackage.TasksPackageState;
-import TestingSystem.TasksPackageToKill.TasksPackageToKillDBTable;
+import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
+import TestingSystem.Common.TSetting.TSetting;
+import TestingSystem.Common.TSetting.TSettingsDBTable;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestCompilationTasksDBTable;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.Tasks.TestRunTasksDBTable;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import TestingSystem.Common.TasksPackageToKill.TasksPackageToKillDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import javafx.util.Pair;
 
diff --git a/src/TestingSystem/TasksPackageToKill/TasksPackageToKill.java b/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java
similarity index 71%
rename from src/TestingSystem/TasksPackageToKill/TasksPackageToKill.java
rename to src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java
index 17bcde43..fdb715e6 100644
--- a/src/TestingSystem/TasksPackageToKill/TasksPackageToKill.java
+++ b/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java
@@ -1,4 +1,4 @@
-package TestingSystem.TasksPackageToKill;
+package TestingSystem.Common.TasksPackageToKill;
 import Common.Database.iDBObject;
 public class TasksPackageToKill extends iDBObject {
     public String packageName = "";
diff --git a/src/TestingSystem/TasksPackageToKill/TasksPackageToKillDBTable.java b/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKillDBTable.java
similarity index 80%
rename from src/TestingSystem/TasksPackageToKill/TasksPackageToKillDBTable.java
rename to src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKillDBTable.java
index 383f47ea..ca9c4347 100644
--- a/src/TestingSystem/TasksPackageToKill/TasksPackageToKillDBTable.java
+++ b/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKillDBTable.java
@@ -1,4 +1,4 @@
-package TestingSystem.TasksPackageToKill;
+package TestingSystem.Common.TasksPackageToKill;
 import Common.Database.iDBTable;
 public class TasksPackageToKillDBTable extends iDBTable<TasksPackageToKill> {
     public TasksPackageToKillDBTable() {
diff --git a/src/TestingSystem/Test/ProjectFiles_json.java b/src/TestingSystem/Common/Test/ProjectFiles_json.java
similarity index 86%
rename from src/TestingSystem/Test/ProjectFiles_json.java
rename to src/TestingSystem/Common/Test/ProjectFiles_json.java
index e4966596..6cdca19b 100644
--- a/src/TestingSystem/Test/ProjectFiles_json.java
+++ b/src/TestingSystem/Common/Test/ProjectFiles_json.java
@@ -1,4 +1,4 @@
-package TestingSystem.Test;
+package TestingSystem.Common.Test;
 import ProjectData.Files.DBProjectFile;
 import com.google.gson.annotations.Expose;
 
diff --git a/src/TestingSystem/Test/Test.java b/src/TestingSystem/Common/Test/Test.java
similarity index 64%
rename from src/TestingSystem/Test/Test.java
rename to src/TestingSystem/Common/Test/Test.java
index 5913dba6..f9b6532a 100644
--- a/src/TestingSystem/Test/Test.java
+++ b/src/TestingSystem/Common/Test/Test.java
@@ -1,23 +1,23 @@
-package TestingSystem.Test;
+package TestingSystem.Common.Test;
 import Common.Constants;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.riDBObject;
+import Common.Global;
 import Common.UI.UI;
+import GlobalData.User.UserState;
 import com.sun.org.glassfish.gmbal.Description;
+
+import java.io.File;
 public class Test extends riDBObject {
-    @Override
-    public boolean isVisible() {
-        return TestInterface.isVisible(this);
-    }
     @Description("DEFAULT 1")
     public int dim = 1; //размерность теста. для удобства пусть будет и внешним полем.
     @Description("DEFAULT ''")
     public String args = ""; //аргументы командной строки. на всякий случай поле зарезервирую. пусть будут.
     @Description("DEFAULT -1")
     public int group_id = Constants.Nan;
-    @Description("IGNORE")
-    public byte[] project_archive_bytes = null;
+    @Description("DEFAULT 'initial'")
+    public UserState state = UserState.initial; //загружен ли тестовый проект.
     @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
@@ -37,4 +37,20 @@ public class Test extends riDBObject {
         if (Current.hasUI())
             UI.getMainWindow().ShowCheckedTestsCount();
     }
+    //---
+    @Override
+    public boolean isVisible() {
+        return Current.HasGroup() && (Current.getGroup().id == group_id);
+    }
+    //-
+    public File getArchive() {
+        return new File(Global.TestsDirectory, id + ".zip");
+    }
+    //-
+    public File getServerPath() {
+        return new File(Global.TestsDirectory, String.valueOf(id));
+    }
+    public File getHomePath() {
+        return new File(Global.visualiser.getWorkspace(), String.valueOf(id));
+    }
 }
diff --git a/src/TestingSystem/Test/TestDBTable.java b/src/TestingSystem/Common/Test/TestDBTable.java
similarity index 90%
rename from src/TestingSystem/Test/TestDBTable.java
rename to src/TestingSystem/Common/Test/TestDBTable.java
index 017b15a1..09be558b 100644
--- a/src/TestingSystem/Test/TestDBTable.java
+++ b/src/TestingSystem/Common/Test/TestDBTable.java
@@ -1,12 +1,12 @@
-package TestingSystem.Test;
+package TestingSystem.Common.Test;
 import Common.Current;
-import Common.Database.DBTable;
+import Common.Database.iDBTable;
 import Common.UI.DataSetControlForm;
 import Common.UI.Windows.Dialog.DBObjectDialog;
-import TestingSystem.Test.UI.TestFields;
-public class TestDBTable extends DBTable<String, Test> {
+import TestingSystem.Common.Test.UI.TestFields;
+public class TestDBTable extends iDBTable<Test> {
     public TestDBTable() {
-        super(String.class, Test.class);
+        super(Test.class);
     }
     @Override
     public String getSingleDescription() {
@@ -21,13 +21,12 @@ public class TestDBTable extends DBTable<String, Test> {
         return new DataSetControlForm(this) {
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
+                //columns.get(0).setVisible(false);
             }
             @Override
             public boolean hasCheckBox() {
                 return true;
             }
-
         };
     }
     @Override
diff --git a/src/TestingSystem/Test/TestType.java b/src/TestingSystem/Common/Test/TestType.java
similarity index 93%
rename from src/TestingSystem/Test/TestType.java
rename to src/TestingSystem/Common/Test/TestType.java
index 11260899..c44b6b9a 100644
--- a/src/TestingSystem/Test/TestType.java
+++ b/src/TestingSystem/Common/Test/TestType.java
@@ -1,4 +1,4 @@
-package TestingSystem.Test;
+package TestingSystem.Common.Test;
 public enum TestType {
     Default,
     Correctness,
diff --git a/src/TestingSystem/Test/UI/TestFields.form b/src/TestingSystem/Common/Test/UI/TestFields.form
similarity index 97%
rename from src/TestingSystem/Test/UI/TestFields.form
rename to src/TestingSystem/Common/Test/UI/TestFields.form
index 8112271c..0080da03 100644
--- a/src/TestingSystem/Test/UI/TestFields.form
+++ b/src/TestingSystem/Common/Test/UI/TestFields.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.Test.UI.TestFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Common.Test.UI.TestFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="3" 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/Test/UI/TestFields.java b/src/TestingSystem/Common/Test/UI/TestFields.java
similarity index 93%
rename from src/TestingSystem/Test/UI/TestFields.java
rename to src/TestingSystem/Common/Test/UI/TestFields.java
index e3c73626..3859ea95 100644
--- a/src/TestingSystem/Test/UI/TestFields.java
+++ b/src/TestingSystem/Common/Test/UI/TestFields.java
@@ -1,4 +1,4 @@
-package TestingSystem.Test.UI;
+package TestingSystem.Common.Test.UI;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.Windows.Dialog.DialogFields;
 
diff --git a/src/TestingSystem/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
similarity index 95%
rename from src/TestingSystem/TestingPlanner.java
rename to src/TestingSystem/Common/TestingPlanner.java
index 8b1c4d5e..c49ca0ed 100644
--- a/src/TestingSystem/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -1,4 +1,4 @@
-package TestingSystem;
+package TestingSystem.Common;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Machine.Machine;
@@ -6,13 +6,14 @@ import GlobalData.User.User;
 import Repository.EmailMessage;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackageSupervisor.SapforTasksPackageSupervisor;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestTask;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
-import TestingSystem.TestsSupervisor_2022.TestsSupervisor_2022;
+import TestingSystem.DVM.UserConnection;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.SapforTasksPackageSupervisor.SapforTasksPackageSupervisor;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import TestingSystem.DVM.TestsSupervisor_2022;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
similarity index 94%
rename from src/TestingSystem/TestingServer.java
rename to src/TestingSystem/Common/TestingServer.java
index 1de84d46..fc6bc8e3 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -1,4 +1,4 @@
-package TestingSystem;
+package TestingSystem.Common;
 import Common.Constants;
 import Common.Database.DBObject;
 import Common.Global;
@@ -14,19 +14,18 @@ import Repository.RepositoryRefuseException;
 import Repository.RepositoryServer;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforTask.SapforTask;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.ServerSapfor.ServerSapfor;
-import TestingSystem.Group.Group;
-import TestingSystem.Group.GroupInterface;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.Tasks.TestTask;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackageToKill.TasksPackageToKill;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestInterface;
-import TestingSystem.Test.TestType;
+import TestingSystem.DVM.UserConnection;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.Tasks.TestTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.Test.TestType;
 import Visual_DVM_2021.Passes.All.DownloadRepository;
 import Visual_DVM_2021.Passes.All.UnzipFolderPass;
 import Visual_DVM_2021.Passes.All.ZipFolderPass;
@@ -92,7 +91,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                                 task.state = TaskState.Waiting;
                                 task.id = db.IncMaxTaskId();
                                 task.taskspackage_id = tasksPackage.id;
-                                task.makefile_text = GroupInterface.GenerateMakefile(group, project, tasksPackage.dvm_drv, task.flags);
+                                task.makefile_text = group.GenerateMakefile(project, tasksPackage.dvm_drv, task.flags);
                                 task.test_home = tasksPackage.user_workspace + "/projects/" + test_id;
                                 //-->>
                                 task.remote_workspace =
@@ -120,32 +119,32 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             }
         } else if (object instanceof Test) {
             Test new_test = (Test) object;
-            Utils.unpackFile(new_test.project_archive_bytes, TestInterface.getArchive(new_test));
+           // Utils.unpackFile(new_test.project_archive_bytes, new_test.getArchive());
             //распаковать архив в папку с тестами. для тестирования удобнее хранить их уже открытыми.
             UnzipFolderPass unzipFolderPass = new UnzipFolderPass();
             if (!unzipFolderPass.Do(
-                    TestInterface.getArchive(new_test).getAbsolutePath(),
-                    TestInterface.getServerPath(new_test).getParentFile().getAbsolutePath()))
-                throw new RepositoryRefuseException("Не удалось распаковать Тест с именем " + new_test.id);
+                    new_test.getArchive().getAbsolutePath(),
+                    new_test.getServerPath().getParentFile().getAbsolutePath()))
+                throw new RepositoryRefuseException("Не удалось распаковать Тест с id " + new_test.id);
         }
     }
     @Override
     public void DeleteAction(DBObject object) throws Exception {
         if (object instanceof Test) {
             Test test = (Test) object;
-            Utils.forceDeleteWithCheck(TestInterface.getArchive(test));
-            Utils.forceDeleteWithCheck(TestInterface.getServerPath(test));
+            Utils.forceDeleteWithCheck(test.getArchive());
+            Utils.forceDeleteWithCheck(test.getServerPath());
         } else if (object instanceof Group) {
             Group group = (Group) object;
             Vector<Test> tests = new Vector<>();
             for (Test group_test : db.tests.Data.values()) {
-                if (group_test.group_id==group.id) // todo group_name -> group_id
+                if (group_test.group_id == group.id) // todo group_name -> group_id
                     tests.add(group_test);
             }
             for (Test group_test : tests) {
                 db.Delete(group_test);
-                Utils.forceDeleteWithCheck(TestInterface.getArchive(group_test));
-                Utils.forceDeleteWithCheck(TestInterface.getServerPath(group_test));
+                Utils.forceDeleteWithCheck(group_test.getArchive());
+                Utils.forceDeleteWithCheck(group_test.getServerPath());
             }
         } else if (object instanceof ServerSapfor) {
             Utils.forceDeleteWithCheck(
@@ -396,7 +395,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Print("Отправить клиенту тест " + request.arg);
                 if (db.tests.containsKey(request.arg)) {
                     test = db.tests.get(request.arg);
-                    response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.packFile(TestInterface.getArchive(test)));
+                    response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.packFile(test.getArchive()));
                 } else
                     throw new RepositoryRefuseException("Теста с именем " + request.arg + " не существует");
                 break;
diff --git a/src/TestingSystem/TestsDatabase.java b/src/TestingSystem/Common/TestsDatabase.java
similarity index 80%
rename from src/TestingSystem/TestsDatabase.java
rename to src/TestingSystem/Common/TestsDatabase.java
index 6ecb5949..6d5ab9e2 100644
--- a/src/TestingSystem/TestsDatabase.java
+++ b/src/TestingSystem/Common/TestsDatabase.java
@@ -1,15 +1,15 @@
-package TestingSystem;
+package TestingSystem.Common;
 import Common.Constants;
 import Common.Database.SQLITE.SQLiteDatabase;
 import GlobalData.Settings.SettingName;
-import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
-import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
-import TestingSystem.Configuration.UI.ConfigurationDBTable;
-import TestingSystem.Group.GroupsDBTable;
-import TestingSystem.TSetting.TSetting;
-import TestingSystem.TSetting.TSettingsDBTable;
-import TestingSystem.Test.TestDBTable;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
+import TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
+import TestingSystem.Common.Group.GroupsDBTable;
+import TestingSystem.Common.TSetting.TSetting;
+import TestingSystem.Common.TSetting.TSettingsDBTable;
+import TestingSystem.Common.Test.TestDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import java.nio.file.Paths;
diff --git a/src/TestingSystem/Configuration/Configuration.java b/src/TestingSystem/DVM/Configuration/Configuration.java
similarity index 96%
rename from src/TestingSystem/Configuration/Configuration.java
rename to src/TestingSystem/DVM/Configuration/Configuration.java
index 7ad8939a..8eaf0fc0 100644
--- a/src/TestingSystem/Configuration/Configuration.java
+++ b/src/TestingSystem/DVM/Configuration/Configuration.java
@@ -1,4 +1,4 @@
-package TestingSystem.Configuration;
+package TestingSystem.DVM.Configuration;
 import Common.Database.DBObject;
 import Common.Database.rDBObject;
 public class Configuration extends rDBObject {
diff --git a/src/TestingSystem/Configuration/ConfigurationInterface.java b/src/TestingSystem/DVM/Configuration/ConfigurationInterface.java
similarity index 86%
rename from src/TestingSystem/Configuration/ConfigurationInterface.java
rename to src/TestingSystem/DVM/Configuration/ConfigurationInterface.java
index e14934e2..ec8a6237 100644
--- a/src/TestingSystem/Configuration/ConfigurationInterface.java
+++ b/src/TestingSystem/DVM/Configuration/ConfigurationInterface.java
@@ -1,19 +1,19 @@
-package TestingSystem.Configuration;
+package TestingSystem.DVM.Configuration;
 import Common.Utils.Utils;
 import GlobalData.RunConfiguration.RunConfiguration;
 
 import java.util.Vector;
 public class ConfigurationInterface {
-    public static Vector<String> getFlags(TestingSystem.Configuration.Configuration object) {
+    public static Vector<String> getFlags(TestingSystem.DVM.Configuration.Configuration object) {
         return Utils.unpackStrings(object.flags);
     }
-    public static Vector<String> getEnvironments(TestingSystem.Configuration.Configuration object) {
+    public static Vector<String> getEnvironments(TestingSystem.DVM.Configuration.Configuration object) {
         return Utils.unpackStrings(object.environments);
     }
-    public static Vector<String> getParams(TestingSystem.Configuration.Configuration object) {
+    public static Vector<String> getParams(TestingSystem.DVM.Configuration.Configuration object) {
         return Utils.unpackStrings(object.usr_par);
     }
-    public static Vector<String> getMatrixes(TestingSystem.Configuration.Configuration object, int testDim) {
+    public static Vector<String> getMatrixes(TestingSystem.DVM.Configuration.Configuration object, int testDim) {
         Vector<Vector<Integer>> res_ = new Vector<>();
         Vector<String> res = new Vector<>();
         if ((object.max_proc_count==0) || (object.min_dim_proc_count == 0 && object.max_dim_proc_count == 0)) {
diff --git a/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java b/src/TestingSystem/DVM/Configuration/UI/ConfigurationDBTable.java
similarity index 97%
rename from src/TestingSystem/Configuration/UI/ConfigurationDBTable.java
rename to src/TestingSystem/DVM/Configuration/UI/ConfigurationDBTable.java
index d51d2f57..84f81008 100644
--- a/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java
+++ b/src/TestingSystem/DVM/Configuration/UI/ConfigurationDBTable.java
@@ -1,4 +1,4 @@
-package TestingSystem.Configuration.UI;
+package TestingSystem.DVM.Configuration.UI;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.DBTable;
@@ -7,8 +7,8 @@ import Common.UI.Tables.TableRenderers;
 import Common.UI.VisualiserStringList;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Utils;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Configuration.ConfigurationInterface;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.DVM.Configuration.ConfigurationInterface;
 public class ConfigurationDBTable extends DBTable<String, Configuration> {
     public ConfigurationDBTable() {
         super(String.class, Configuration.class);
diff --git a/src/TestingSystem/Configuration/UI/ConfigurationFields.form b/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form
similarity index 99%
rename from src/TestingSystem/Configuration/UI/ConfigurationFields.form
rename to src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form
index dd38cece..03691a85 100644
--- a/src/TestingSystem/Configuration/UI/ConfigurationFields.form
+++ b/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.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.Configuration.UI.ConfigurationFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.DVM.Configuration.UI.ConfigurationFields">
   <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/Configuration/UI/ConfigurationFields.java b/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.java
similarity index 98%
rename from src/TestingSystem/Configuration/UI/ConfigurationFields.java
rename to src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.java
index 557fd16c..19a16fd0 100644
--- a/src/TestingSystem/Configuration/UI/ConfigurationFields.java
+++ b/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.java
@@ -1,4 +1,4 @@
-package TestingSystem.Configuration.UI;
+package TestingSystem.DVM.Configuration.UI;
 import Common.Current;
 import Common.UI.VisualiserStringList;
 import Common.UI.TextField.StyledTextField;
diff --git a/src/TestingSystem/Tasks/TestCompilationTask.java b/src/TestingSystem/DVM/Tasks/TestCompilationTask.java
similarity index 91%
rename from src/TestingSystem/Tasks/TestCompilationTask.java
rename to src/TestingSystem/DVM/Tasks/TestCompilationTask.java
index 6d465d9c..d7149beb 100644
--- a/src/TestingSystem/Tasks/TestCompilationTask.java
+++ b/src/TestingSystem/DVM/Tasks/TestCompilationTask.java
@@ -1,8 +1,8 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Database.DBObject;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Vector;
diff --git a/src/TestingSystem/Tasks/TestCompilationTasksDBTable.java b/src/TestingSystem/DVM/Tasks/TestCompilationTasksDBTable.java
similarity index 93%
rename from src/TestingSystem/Tasks/TestCompilationTasksDBTable.java
rename to src/TestingSystem/DVM/Tasks/TestCompilationTasksDBTable.java
index 60767d75..bf72cb55 100644
--- a/src/TestingSystem/Tasks/TestCompilationTasksDBTable.java
+++ b/src/TestingSystem/DVM/Tasks/TestCompilationTasksDBTable.java
@@ -1,4 +1,4 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Current;
 import Common.Database.DBTable;
 public class TestCompilationTasksDBTable extends DBTable<Integer, TestCompilationTask> {
diff --git a/src/TestingSystem/Tasks/TestRunTask.java b/src/TestingSystem/DVM/Tasks/TestRunTask.java
similarity index 95%
rename from src/TestingSystem/Tasks/TestRunTask.java
rename to src/TestingSystem/DVM/Tasks/TestRunTask.java
index b43ed9f5..4c2e9ebb 100644
--- a/src/TestingSystem/Tasks/TestRunTask.java
+++ b/src/TestingSystem/DVM/Tasks/TestRunTask.java
@@ -1,11 +1,11 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Constants;
 import Common.Database.DBObject;
 import GlobalData.Tasks.TaskState;
 import ProjectData.LanguageName;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Vector;
diff --git a/src/TestingSystem/Tasks/TestRunTaskInterface.java b/src/TestingSystem/DVM/Tasks/TestRunTaskInterface.java
similarity index 99%
rename from src/TestingSystem/Tasks/TestRunTaskInterface.java
rename to src/TestingSystem/DVM/Tasks/TestRunTaskInterface.java
index baa585a7..d8390514 100644
--- a/src/TestingSystem/Tasks/TestRunTaskInterface.java
+++ b/src/TestingSystem/DVM/Tasks/TestRunTaskInterface.java
@@ -1,4 +1,4 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Current;
 import Common.Global;
 import Common.Utils.StringTemplate;
diff --git a/src/TestingSystem/Tasks/TestRunTasksDBTable.java b/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java
similarity index 99%
rename from src/TestingSystem/Tasks/TestRunTasksDBTable.java
rename to src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java
index 45a6948c..a2a021b2 100644
--- a/src/TestingSystem/Tasks/TestRunTasksDBTable.java
+++ b/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java
@@ -1,4 +1,4 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Current;
 import Common.Database.DBTable;
 import Common.Database.TableFilter;
diff --git a/src/TestingSystem/Tasks/TestTask.java b/src/TestingSystem/DVM/Tasks/TestTask.java
similarity index 94%
rename from src/TestingSystem/Tasks/TestTask.java
rename to src/TestingSystem/DVM/Tasks/TestTask.java
index b7c6ec1d..d0ff4e1c 100644
--- a/src/TestingSystem/Tasks/TestTask.java
+++ b/src/TestingSystem/DVM/Tasks/TestTask.java
@@ -1,11 +1,11 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Constants;
 import Common.Database.DBObject;
 import GlobalData.Tasks.TaskState;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestType;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.Test.TestType;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Date;
diff --git a/src/TestingSystem/TasksPackage/TasksPackage.java b/src/TestingSystem/DVM/TasksPackage/TasksPackage.java
similarity index 97%
rename from src/TestingSystem/TasksPackage/TasksPackage.java
rename to src/TestingSystem/DVM/TasksPackage/TasksPackage.java
index cc7fba55..e28c0122 100644
--- a/src/TestingSystem/TasksPackage/TasksPackage.java
+++ b/src/TestingSystem/DVM/TasksPackage/TasksPackage.java
@@ -1,8 +1,8 @@
-package TestingSystem.TasksPackage;
+package TestingSystem.DVM.TasksPackage;
 import Common.Database.DBObject;
 import Common.Database.nDBObject;
 import GlobalData.Machine.MachineType;
-import TestingSystem.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.LinkedHashMap;
diff --git a/src/TestingSystem/TasksPackage/TasksPackageDBTable.java b/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java
similarity index 97%
rename from src/TestingSystem/TasksPackage/TasksPackageDBTable.java
rename to src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java
index db0cb4e7..490f264e 100644
--- a/src/TestingSystem/TasksPackage/TasksPackageDBTable.java
+++ b/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java
@@ -1,9 +1,9 @@
-package TestingSystem.TasksPackage;
+package TestingSystem.DVM.TasksPackage;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
-import TestingSystem.Tasks.TestRunTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
 
 import java.util.Date;
 import java.util.LinkedHashMap;
diff --git a/src/TestingSystem/TasksPackage/TasksPackageState.java b/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java
similarity index 98%
rename from src/TestingSystem/TasksPackage/TasksPackageState.java
rename to src/TestingSystem/DVM/TasksPackage/TasksPackageState.java
index 459f8d28..ce8aad96 100644
--- a/src/TestingSystem/TasksPackage/TasksPackageState.java
+++ b/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java
@@ -1,4 +1,4 @@
-package TestingSystem.TasksPackage;
+package TestingSystem.DVM.TasksPackage;
 import Common.Current;
 import Common.UI.StatusEnum;
 import Common.UI.Themes.VisualiserFonts;
diff --git a/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java b/src/TestingSystem/DVM/TestsSupervisor_2022.java
similarity index 97%
rename from src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java
rename to src/TestingSystem/DVM/TestsSupervisor_2022.java
index e6e5d26b..3ad760ff 100644
--- a/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java
+++ b/src/TestingSystem/DVM/TestsSupervisor_2022.java
@@ -1,19 +1,18 @@
-package TestingSystem.TestsSupervisor_2022;
+package TestingSystem.DVM;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.TaskState;
 import Repository.Server.ServerCode;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.Tasks.TestRunTaskInterface;
-import TestingSystem.Tasks.TestTask;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
-import TestingSystem.Test.TestType;
-import TestingSystem.TestingPlanner;
-import TestingSystem.UserConnection;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.Tasks.TestRunTaskInterface;
+import TestingSystem.DVM.Tasks.TestTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import TestingSystem.Common.Test.TestType;
+import TestingSystem.Common.TestingPlanner;
 import com.jcraft.jsch.ChannelSftp;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
diff --git a/src/TestingSystem/UserConnection.java b/src/TestingSystem/DVM/UserConnection.java
similarity index 99%
rename from src/TestingSystem/UserConnection.java
rename to src/TestingSystem/DVM/UserConnection.java
index c7e48f6d..11feec01 100644
--- a/src/TestingSystem/UserConnection.java
+++ b/src/TestingSystem/DVM/UserConnection.java
@@ -1,4 +1,4 @@
-package TestingSystem;
+package TestingSystem.DVM;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
diff --git a/src/TestingSystem/Group/Group.java b/src/TestingSystem/Group/Group.java
deleted file mode 100644
index 121c4fd6..00000000
--- a/src/TestingSystem/Group/Group.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package TestingSystem.Group;
-import Common.Current;
-import Common.Database.DBObject;
-import Common.Database.riDBObject;
-import Common.UI.UI;
-import ProjectData.LanguageName;
-import TestingSystem.Test.TestType;
-import com.sun.org.glassfish.gmbal.Description;
-
-import java.util.LinkedHashMap;
-public class Group extends riDBObject {
-    @Override
-    public boolean isVisible() {
-        return GroupInterface.isVisible(this);
-    }
-    @Description("DEFAULT 'Default'")
-    public TestType type = TestType.Default;
-    @Description("DEFAULT 'fortran'")
-    public LanguageName language = LanguageName.fortran;
-    //--
-    @Description("IGNORE")
-    public LinkedHashMap<String, byte[]> testsFiles = new LinkedHashMap<>(); //транспорт.
-    //--
-    @Override
-    public void SynchronizeFields(DBObject src) {
-        super.SynchronizeFields(src);
-        Group g = (Group) src;
-        type = g.type;
-        language = g.language;
-    }
-    public Group(Group group) {
-        this.SynchronizeFields(group);
-    }
-    public Group() {
-    }
-    @Override
-    public void select(boolean flag) {
-        super.select(flag);
-        if (Current.hasUI())
-            UI.getMainWindow().ShowCheckedTestsCount();
-    }
-}
diff --git a/src/SapforTestingSystem/Json/SapforConfiguration_json.java b/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
similarity index 90%
rename from src/SapforTestingSystem/Json/SapforConfiguration_json.java
rename to src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
index 9cf249dc..0a57ed0e 100644
--- a/src/SapforTestingSystem/Json/SapforConfiguration_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.Json;
+package TestingSystem.SAPFOR.Json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
 
diff --git a/src/SapforTestingSystem/Json/SapforTasksPackage_json.java b/src/TestingSystem/SAPFOR/Json/SapforTasksPackage_json.java
similarity index 92%
rename from src/SapforTestingSystem/Json/SapforTasksPackage_json.java
rename to src/TestingSystem/SAPFOR/Json/SapforTasksPackage_json.java
index a6814759..319f4884 100644
--- a/src/SapforTestingSystem/Json/SapforTasksPackage_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforTasksPackage_json.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.Json;
+package TestingSystem.SAPFOR.Json;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;
diff --git a/src/SapforTestingSystem/Json/SapforTasksResults_json.java b/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java
similarity index 98%
rename from src/SapforTestingSystem/Json/SapforTasksResults_json.java
rename to src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java
index 49b9b648..3705cb72 100644
--- a/src/SapforTestingSystem/Json/SapforTasksResults_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java
@@ -1,10 +1,10 @@
-package SapforTestingSystem.Json;
+package TestingSystem.SAPFOR.Json;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
-import SapforTestingSystem.SapforTask.MatchState;
-import SapforTestingSystem.SapforTask.SapforTask;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.UI.*;
+import TestingSystem.SAPFOR.SapforTask.MatchState;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.*;
 import com.google.gson.annotations.Expose;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/SapforTestingSystem/Json/SapforTest_json.java b/src/TestingSystem/SAPFOR/Json/SapforTest_json.java
similarity index 83%
rename from src/SapforTestingSystem/Json/SapforTest_json.java
rename to src/TestingSystem/SAPFOR/Json/SapforTest_json.java
index 408f68ad..54addeda 100644
--- a/src/SapforTestingSystem/Json/SapforTest_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforTest_json.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.Json;
+package TestingSystem.SAPFOR.Json;
 import com.google.gson.annotations.Expose;
 public class SapforTest_json {
     @Expose
diff --git a/src/SapforTestingSystem/Json/SapforVersion_json.java b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
similarity index 99%
rename from src/SapforTestingSystem/Json/SapforVersion_json.java
rename to src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
index aa58b70e..8dcd7c1d 100644
--- a/src/SapforTestingSystem/Json/SapforVersion_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.Json;
+package TestingSystem.SAPFOR.Json;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
@@ -8,7 +8,7 @@ import ProjectData.Files.ProjectFile;
 import ProjectData.LanguageName;
 import ProjectData.Messages.Errors.MessageError;
 import ProjectData.Project.db_project_info;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import com.google.gson.annotations.Expose;
 import org.apache.commons.io.FileUtils;
 
diff --git a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
similarity index 90%
rename from src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
rename to src/TestingSystem/SAPFOR/PackageModeSupervisor.java
index 4af0d921..bc9cbe34 100644
--- a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
+++ b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
@@ -1,12 +1,12 @@
-package SapforTestingSystem.PackageModeSupervisor;
+package TestingSystem.SAPFOR;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.Json.SapforTasksPackage_json;
-import SapforTestingSystem.Json.SapforTasksResults_json;
-import SapforTestingSystem.Json.SapforTest_json;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
+import TestingSystem.SAPFOR.Json.SapforTasksPackage_json;
+import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
+import TestingSystem.SAPFOR.Json.SapforTest_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import SapforTestingSystem.TaskThread;
 import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
similarity index 94%
rename from src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java
rename to src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
index 5b4cf757..a4048617 100644
--- a/src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforConfiguration;
+package TestingSystem.SAPFOR.SapforConfiguration;
 import Common.Database.rDBObject;
 public class SapforConfiguration extends rDBObject {
     //настройки.
diff --git a/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
similarity index 95%
rename from src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
rename to src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index b4eb25c4..07774023 100644
--- a/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -1,11 +1,11 @@
-package SapforTestingSystem.SapforConfiguration;
+package TestingSystem.SAPFOR.SapforConfiguration;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Utils;
-import SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
 
 import java.util.LinkedHashMap;
 public class SapforConfigurationDBTable extends DBTable<String, SapforConfiguration> {
diff --git a/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java
similarity index 95%
rename from src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java
rename to src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java
index a1f30274..45ce6dc1 100644
--- a/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java
@@ -1,7 +1,7 @@
-package SapforTestingSystem.SapforConfiguration;
+package TestingSystem.SAPFOR.SapforConfiguration;
 import Common.Global;
 import Common.Utils.TextLog;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import java.util.Vector;
diff --git a/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form
similarity index 98%
rename from src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form
rename to src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form
index 6fbe7da9..d7b5b46b 100644
--- a/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form
+++ b/src/TestingSystem/SAPFOR/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="SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.SAPFOR.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/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
similarity index 93%
rename from src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java
rename to src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
index 15a1f5c0..b6b5223b 100644
--- a/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforConfiguration.UI;
+package TestingSystem.SAPFOR.SapforConfiguration.UI;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.Windows.Dialog.DialogFields;
 
diff --git a/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java
similarity index 89%
rename from src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java
rename to src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java
index 4ee68c06..95dc4787 100644
--- a/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java
+++ b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforConfigurationCommand;
+package TestingSystem.SAPFOR.SapforConfigurationCommand;
 import Common.Database.rDBObject;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.sun.org.glassfish.gmbal.Description;
diff --git a/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
similarity index 83%
rename from src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
rename to src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
index 06ef1edc..b7e0cb63 100644
--- a/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
+++ b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforConfigurationCommand;
+package TestingSystem.SAPFOR.SapforConfigurationCommand;
 import Common.Current;
 public class SapforConfigurationCommandInterface {
     public static boolean isVisible(SapforConfigurationCommand object) {
diff --git a/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
similarity index 94%
rename from src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
rename to src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
index 98a03d5f..d299f89a 100644
--- a/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
@@ -1,10 +1,10 @@
-package SapforTestingSystem.SapforConfigurationCommand;
+package TestingSystem.SAPFOR.SapforConfigurationCommand;
 import Common.Current;
 import Common.Database.DBTable;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.DBObjectDialog;
-import SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforConfigurationCommand> {
     public SapforConfigurationCommandsDBTable() {
diff --git a/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
similarity index 93%
rename from src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
rename to src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
index 2e533797..3dc52b47 100644
--- a/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
+++ b/src/TestingSystem/SAPFOR/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="SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.SAPFOR.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/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
similarity index 94%
rename from src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
rename to src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
index 82b4460c..cb2220fb 100644
--- a/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
+++ b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforConfigurationCommand.UI;
+package TestingSystem.SAPFOR.SapforConfigurationCommand.UI;
 import Common.Current;
 import Common.UI.Tables.StyledCellLabel;
 import Common.UI.Windows.Dialog.DialogFields;
diff --git a/src/SapforTestingSystem/SapforTask/MatchState.java b/src/TestingSystem/SAPFOR/SapforTask/MatchState.java
similarity index 96%
rename from src/SapforTestingSystem/SapforTask/MatchState.java
rename to src/TestingSystem/SAPFOR/SapforTask/MatchState.java
index 212250c2..6d271a06 100644
--- a/src/SapforTestingSystem/SapforTask/MatchState.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/MatchState.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTask;
+package TestingSystem.SAPFOR.SapforTask;
 import Common.Current;
 import Common.UI.StatusEnum;
 import Common.UI.Themes.VisualiserFonts;
diff --git a/src/SapforTestingSystem/SapforTask/SapforTask.java b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
similarity index 97%
rename from src/SapforTestingSystem/SapforTask/SapforTask.java
rename to src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index 6fd64376..a12256e9 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTask.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -1,11 +1,11 @@
-package SapforTestingSystem.SapforTask;
+package TestingSystem.SAPFOR.SapforTask;
 import Common.Constants;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
-import SapforTestingSystem.Json.SapforVersion_json;
-import SapforTestingSystem.SapforTasksPackage.UI.VersionSummary;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.VersionSummary;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;
diff --git a/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java b/src/TestingSystem/SAPFOR/SapforTask/SapforTasksDBTable.java
similarity index 97%
rename from src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
rename to src/TestingSystem/SAPFOR/SapforTask/SapforTasksDBTable.java
index 48c7392a..20a00de1 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/SapforTasksDBTable.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTask;
+package TestingSystem.SAPFOR.SapforTask;
 import Common.Current;
 import Common.Database.DBTable;
 import Common.UI.DataSetControlForm;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java
similarity index 94%
rename from src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java
index 89142f34..7cd1b64f 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java
@@ -1,12 +1,12 @@
-package SapforTestingSystem.SapforTasksPackage;
+package TestingSystem.SAPFOR.SapforTasksPackage;
 import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.nDBObject;
 import Common.Global;
 import Common.Utils.Utils;
-import SapforTestingSystem.Json.SapforTasksResults_json;
-import SapforTestingSystem.SapforTask.SapforTask;
-import TestingSystem.TasksPackage.TasksPackageState;
+import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.File;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
similarity index 96%
rename from src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
index 57351b99..8d4b7fe9 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
@@ -1,8 +1,8 @@
-package SapforTestingSystem.SapforTasksPackage;
+package TestingSystem.SAPFOR.SapforTasksPackage;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 
 import java.util.Date;
 import java.util.LinkedHashMap;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java
similarity index 90%
rename from src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java
index 5c3fc679..548a7ad5 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java
@@ -1,6 +1,6 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.Utils.Utils;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import java.util.Arrays;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/GroupSummary.java
similarity index 86%
rename from src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/GroupSummary.java
index d429b9ed..313f4a8a 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/GroupSummary.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 public class GroupSummary extends SapforPackageTreeNode {
     public String group_name = "";
     @Override
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/MatchesSummary.java
similarity index 84%
rename from src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/MatchesSummary.java
index bdf39968..7510f6c8 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/MatchesSummary.java
@@ -1,5 +1,5 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
-import SapforTestingSystem.SapforTask.MatchState;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
+import TestingSystem.SAPFOR.SapforTask.MatchState;
 public class MatchesSummary extends SapforPackageTreeNode {
     public MatchState state;
     public int count = 0;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageSummary.java
similarity index 85%
rename from src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageSummary.java
index fc372479..1d3c85f4 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageSummary.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 public class PackageSummary extends SapforPackageTreeNode {
     public int count = 0;
     @Override
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
similarity index 89%
rename from src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
index 558034e2..8d33c3e5 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.util.Objects;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
similarity index 96%
rename from src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
index 4c41d7e0..f0edb6c4 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
@@ -1,9 +1,9 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.Current;
 import Common.UI.Trees.DataTree;
 import Common.UI.Trees.TreeRenderers;
 import Common.UI.UI;
-import SapforTestingSystem.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
similarity index 93%
rename from src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
index 6889e937..cd89d985 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.UI.Trees.StyledTreeCellRenderer;
 
 import javax.swing.*;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/StateSummary.java
similarity index 92%
rename from src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/StateSummary.java
index 3df3bc32..753dd52d 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/StateSummary.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import GlobalData.Tasks.TaskState;
 public class StateSummary extends SapforPackageTreeNode {
     public TaskState state;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/TreeSummary.java
similarity index 89%
rename from src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/TreeSummary.java
index fc616668..7f03d491 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/TreeSummary.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import javax.swing.*;
 import java.util.Objects;
 public abstract class TreeSummary {
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java
similarity index 83%
rename from src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java
index 5ece8df9..308aba34 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java
@@ -1,5 +1,5 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
-import SapforTestingSystem.Json.SapforVersion_json;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
 public class VersionSummary extends SapforPackageTreeNode{
 
     public String version_name = "";
diff --git a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
similarity index 94%
rename from src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index d9394d92..9a0d9475 100644
--- a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -1,22 +1,22 @@
-package SapforTestingSystem.SapforTasksPackageSupervisor;
+package TestingSystem.SAPFOR.SapforTasksPackageSupervisor;
 import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.GlobalProperties;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.Json.SapforTasksPackage_json;
-import SapforTestingSystem.Json.SapforTasksResults_json;
-import SapforTestingSystem.Json.SapforTest_json;
-import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
-import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
-import SapforTestingSystem.SapforTask.SapforTask;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.Group.Group;
-import TestingSystem.TasksPackage.TasksPackageState;
-import TestingSystem.Test.Test;
-import TestingSystem.TestingPlanner;
+import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
+import TestingSystem.SAPFOR.Json.SapforTasksPackage_json;
+import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
+import TestingSystem.SAPFOR.Json.SapforTest_json;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationInterface;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.TestingPlanner;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
diff --git a/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
similarity index 96%
rename from src/SapforTestingSystem/ServerSapfor/ServerSapfor.java
rename to src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
index a74605f5..b406bb50 100644
--- a/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.ServerSapfor;
+package TestingSystem.SAPFOR.ServerSapfor;
 import Common.Database.riDBObject;
 import Common.Utils.Utils;
 import ProjectData.LanguageName;
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
new file mode 100644
index 00000000..210fa8c1
--- /dev/null
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -0,0 +1,46 @@
+package TestingSystem.SAPFOR.ServerSapfor;
+import Common.Current;
+import Common.Database.iDBTable;
+import Common.UI.DataSetControlForm;
+import Common.UI.Tables.TableRenderers;
+public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
+    public ServerSapforsDBTable() {
+        super(ServerSapfor.class);
+    }
+    @Override
+    public String getSingleDescription() {
+        return "SAPFOR";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "SAPFOR";
+    }
+    @Override
+    public Current CurrentName() {
+        return Current.ServerSapfor;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{"версия", "дата сборки"};
+    }
+    @Override
+    public Object getFieldAt(ServerSapfor object, int columnIndex) {
+        switch (columnIndex) {
+            case 1:
+                return object.version;
+            case 2:
+                return object.getBuildDate();
+        }
+        return null;
+    }
+    @Override
+    protected DataSetControlForm createUI() {
+        return new DataSetControlForm(this) {
+            @Override
+            protected void AdditionalInitColumns() {
+               // columns.get(0).setVisible(false);
+                columns.get(2).setRenderer(TableRenderers.RendererDate);
+            }
+        };
+    }
+}
diff --git a/src/TestingSystem/Test/TestInterface.java b/src/TestingSystem/Test/TestInterface.java
deleted file mode 100644
index 35b5b8ae..00000000
--- a/src/TestingSystem/Test/TestInterface.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package TestingSystem.Test;
-import Common.Current;
-import Common.Global;
-
-import java.io.File;
-import java.nio.file.Paths;
-public class TestInterface {
-    public static boolean isVisible(Test object) {
-        return Current.HasGroup() && (Current.getGroup().id == object.group_id);
-    }
-    public static File getArchive(Test object) {
-        return Paths.get(System.getProperty("user.dir"), "Tests", object.id + ".zip").toFile();
-    }
-    public static File getServerPath(Test object) {
-        return Paths.get(System.getProperty("user.dir"), "Tests", String.valueOf(object.id)).toFile();
-    }
-    public static File getHomePath(Test object) {
-        return Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), String.valueOf(object.id)).toFile();
-    }
-    public static String getSummary(Test test) {
-        return test.description;
-    }
-    //--
-}
diff --git a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
index e4fc5997..ff3fc7a5 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.TasksPackageToKill.TasksPackageToKill;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
 import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java b/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java
index a91c1415..c6bd801e 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java
@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackageToKill.TasksPackageToKill;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
 import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
index 78fe1d80..ed1c0759 100644
--- a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
+++ b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
@@ -7,8 +7,8 @@ import ProjectData.Files.DBProjectFile;
 import ProjectData.Project.db_project_info;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
@@ -96,7 +96,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
                 //архивация.
                 File archive = Utils.getTempFileName("test_archive");
                 if (passes.get(PassCode_2021.ZipFolderPass).Do(vizTestProject.Home.getAbsolutePath(), archive.getAbsolutePath())) {
-                    test.project_archive_bytes = Utils.packFile(archive);
+                 //   test.project_archive_bytes = Utils.packFile(archive);
                     if (test.dim >= 0)
                         tests.add(test);
                     else UI.Info("для теста " + testFileName + " не удалось определить размерность");
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
index e1c255ed..51e15570 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -4,9 +4,9 @@ import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestType;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.Test.TestType;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteGroup.java b/src/Visual_DVM_2021/Passes/All/DeleteGroup.java
index 4e3f2078..dd1f1462 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteGroup.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteGroup.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
-import TestingSystem.Group.Group;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.Server.DeleteServerObject;
 public class DeleteGroup extends DeleteServerObject<TestingServer, Group> {
     public DeleteGroup() {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java
index e2980672..fbd3bcb5 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 SapforTestingSystem.SapforConfiguration.SapforConfiguration;
+import TestingSystem.SAPFOR.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 b62a9118..8fb065ab 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 SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import TestingSystem.SAPFOR.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 b971c18a..5307d8a9 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class DeleteSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java
index e6277410..cff56ce4 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import TestingSystem.Configuration.Configuration;
+import TestingSystem.DVM.Configuration.Configuration;
 import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
 public class DeleteSelectedConfigurations extends DeleteSelectedServerObjects {
     public DeleteSelectedConfigurations() {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java
index a19214af..3da174e8 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import TestingSystem.Test.Test;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
 public class DeleteSelectedTests  extends DeleteSelectedServerObjects {
     public DeleteSelectedTests() {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java b/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
index be33fc22..ec5d8419 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
-import SapforTestingSystem.ServerSapfor.ServerSapfor;
-import TestingSystem.TestingServer;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.Server.DeleteServerObject;
 public class DeleteServerSapfor extends DeleteServerObject<TestingServer, ServerSapfor> {
     public DeleteServerSapfor() {
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
index ef99c5cb..4adc7ee7 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
@@ -3,8 +3,8 @@ import Common.Current;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java b/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
index 96de4b6e..217ae78a 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.Test.Test;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.Common.Test.Test;
 public class DownloadTaskTest extends DownloadTest {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTest.java b/src/Visual_DVM_2021/Passes/All/DownloadTest.java
index a854e4a0..7b57005a 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadTest.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadTest.java
@@ -5,8 +5,7 @@ import Common.UI.UI;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestInterface;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class DownloadTest extends TestingSystemPass<Test> {
@@ -30,29 +29,29 @@ public class DownloadTest extends TestingSystemPass<Test> {
     protected void performPreparation() throws Exception {
         passes.get(PassCode_2021.CloseCurrentProject).Do();
         Current.set(Current.Root, null); //чтобы гарантированно не существовало корня.
-        Utils.forceDeleteWithCheck(TestInterface.getArchive(target));
-        Utils.forceDeleteWithCheck(TestInterface.getHomePath(target));
+        Utils.forceDeleteWithCheck(target.getArchive());
+        Utils.forceDeleteWithCheck(target.getHomePath());
     }
     @Override
     protected void ServerAction() throws Exception {
         Command(new ServerExchangeUnit_2021(ServerCode.DownloadTest, String.valueOf(target.id)));
-        response.Unpack(TestInterface.getArchive(target));
+        response.Unpack(target.getArchive());
     }
     @Override
     protected boolean validate() {
-        return TestInterface.getArchive(target).exists();
+        return target.getArchive().exists();
     }
     @Override
     protected void performDone() throws Exception {
         super.performDone();
         if (passes.get(PassCode_2021.UnzipFolderPass).Do(
-                TestInterface.getArchive(target).getAbsolutePath(),
+                target.getArchive().getAbsolutePath(),
                 Global.visualiser.getWorkspace().getAbsolutePath(), false
         ))
             if (UI.Question("Тестовый проект успешно загружен под именем\n" +
-                    Utils.Brackets(TestInterface.getHomePath(target).getName()) +
+                    Utils.Brackets(target.getHomePath().getName()) +
                     "\nОткрыть его"))
-                passes.get(PassCode_2021.OpenCurrentProject).Do(TestInterface.getHomePath(target));
+                passes.get(PassCode_2021.OpenCurrentProject).Do(target.getHomePath());
     }
 }
 
diff --git a/src/Visual_DVM_2021/Passes/All/EditConfiguration.java b/src/Visual_DVM_2021/Passes/All/EditConfiguration.java
index 19f10c46..fa588f56 100644
--- a/src/Visual_DVM_2021/Passes/All/EditConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/EditConfiguration.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
-import TestingSystem.Configuration.Configuration;
+import TestingSystem.DVM.Configuration.Configuration;
 import Visual_DVM_2021.Passes.EditObjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EditConfiguration extends EditObjectPass<Configuration> {
diff --git a/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java b/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java
index 6d49c4a5..303e7897 100644
--- a/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java
+++ b/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Configuration.Configuration;
+import TestingSystem.DVM.Configuration.Configuration;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class EditConfigurationOnServer extends TestingSystemPass<Configuration> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/EditGroup.java b/src/Visual_DVM_2021/Passes/All/EditGroup.java
index c8229636..4edc6c0a 100644
--- a/src/Visual_DVM_2021/Passes/All/EditGroup.java
+++ b/src/Visual_DVM_2021/Passes/All/EditGroup.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
-import TestingSystem.Group.Group;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.Server.EditServerObject;
 public class EditGroup extends EditServerObject<TestingServer, Group> {
     public EditGroup() {
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java b/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
index f088c04d..258128f8 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 SapforTestingSystem.SapforConfiguration.SapforConfiguration;
+import TestingSystem.SAPFOR.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 4a3f8e33..4348fbde 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 SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import TestingSystem.SAPFOR.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 b1f2959c..990df6bc 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 SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.Server.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 395a8ee6..8ae225b7 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 SapforTestingSystem.SapforConfiguration.SapforConfiguration;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class EditSapforConfigurationOnServer extends TestingSystemPass<SapforConfiguration> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/EditTest.java b/src/Visual_DVM_2021/Passes/All/EditTest.java
index 4fe3090d..fc3b91d3 100644
--- a/src/Visual_DVM_2021/Passes/All/EditTest.java
+++ b/src/Visual_DVM_2021/Passes/All/EditTest.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
-import TestingSystem.Test.Test;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.EditObjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EditTest extends EditObjectPass<Test> {
diff --git a/src/Visual_DVM_2021/Passes/All/EditTestOnServer.java b/src/Visual_DVM_2021/Passes/All/EditTestOnServer.java
index f4d9b404..237f5fc9 100644
--- a/src/Visual_DVM_2021/Passes/All/EditTestOnServer.java
+++ b/src/Visual_DVM_2021/Passes/All/EditTestOnServer.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Test.Test;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class EditTestOnServer extends TestingSystemPass<Test> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
index 51ea70aa..b5065812 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
@@ -6,7 +6,7 @@ import GlobalData.RemoteFile.RemoteFile;
 import ProjectData.LanguageName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.ServerSapfor.ServerSapfor;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
diff --git a/src/Visual_DVM_2021/Passes/All/PauseTesting.java b/src/Visual_DVM_2021/Passes/All/PauseTesting.java
index 7fabd2fe..19499b51 100644
--- a/src/Visual_DVM_2021/Passes/All/PauseTesting.java
+++ b/src/Visual_DVM_2021/Passes/All/PauseTesting.java
@@ -3,7 +3,7 @@ import Common.Current;
 import GlobalData.Settings.SettingName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.TSetting.TSetting;
+import TestingSystem.Common.TSetting.TSetting;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class PauseTesting extends TestingSystemPass<TSetting> {
diff --git a/src/Visual_DVM_2021/Passes/All/PlayTesting.java b/src/Visual_DVM_2021/Passes/All/PlayTesting.java
index a68a45d9..d02ea131 100644
--- a/src/Visual_DVM_2021/Passes/All/PlayTesting.java
+++ b/src/Visual_DVM_2021/Passes/All/PlayTesting.java
@@ -3,7 +3,7 @@ import Common.Current;
 import GlobalData.Settings.SettingName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.TSetting.TSetting;
+import TestingSystem.Common.TSetting.TSetting;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class PlayTesting extends TestingSystemPass<TSetting> {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java b/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java
index 9c2b1bbf..93430c23 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishConfiguration.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.Configuration.Configuration;
+import TestingSystem.DVM.Configuration.Configuration;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class PublishConfiguration extends TestingSystemPass<Configuration> {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishGroup.java b/src/Visual_DVM_2021/Passes/All/PublishGroup.java
index e84bcc03..662d6016 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishGroup.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishGroup.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
-import TestingSystem.Group.Group;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.Server.PublishServerObject;
 public class PublishGroup extends PublishServerObject<TestingServer, Group> {
     public PublishGroup() {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java b/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
index 11962448..d12c9538 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 SapforTestingSystem.SapforConfiguration.SapforConfiguration;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.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 c0401802..83ec35e6 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 SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class PublishSapforConfigurationCommand extends TestingSystemPass<SapforConfigurationCommand> {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java b/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java
index 7b95888f..cf50f5ec 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
-import SapforTestingSystem.ServerSapfor.ServerSapfor;
-import TestingSystem.TestingServer;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.Server.PublishServerObject;
 public class PublishServerSapfor extends PublishServerObject<TestingServer, ServerSapfor> {
     public PublishServerSapfor() {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTest.java b/src/Visual_DVM_2021/Passes/All/PublishTest.java
index 35262c98..a58956ee 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTest.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTest.java
@@ -1,23 +1,18 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Test.Test;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.PublishServerObject;
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-import java.nio.file.Paths;
 public class PublishTest extends PublishServerObject<TestingServer, Test> {
     public PublishTest() {
         super(Global.testingServer, Test.class);
     }
-    protected db_project_info project = null;
+    db_project_info project = null;
     protected boolean setProject() {
         if (Current.Check(Log, Current.Group, Current.Project)
                 && UI.Question("Добавить текущий проект в глобальную базу тестов")) {
@@ -42,21 +37,29 @@ public class PublishTest extends PublishServerObject<TestingServer, Test> {
             target.description = project.getLocalName() + " " + project.description;
             target.dim = project.testMaxDim;
             target.group_id = Current.getGroup().id;
-            if (super.fillObjectFields()) {
-                File src = Utils.getTempFileName("test");
+            return super.fillObjectFields();
+        }
+        return false;
+    }
+    @Override
+    protected void performDone() throws Exception {
+        super.performDone();
+      //  passes.get()
+    }
+    //--
+    /*
+      if (super.fillObjectFields()) {
+                File src = Utils.getTempFileName("test"); //id самого теста неизвестен.
                 Utils.CheckAndCleanDirectory(src);
                 project.Clone(src, false);
                 FileUtils.copyFile(project.db.getFile(),
                         Paths.get(src.getAbsolutePath(),Constants.data, project.db.getFile().getName()).toFile());
                 //архивация.
-                File archive = Utils.getTempFileName("test_archive");
+                File archive = Utils.getTempFileName("test");
                 if (passes.get(PassCode_2021.ZipFolderPass).Do(src.getAbsolutePath(), archive.getAbsolutePath())) {
                     target.project_archive_bytes = Utils.packFile(archive);
                     return true;
                 }
             }
-        }
-        return false;
-    }
-    //--
+     */
 }
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTestProject.java b/src/Visual_DVM_2021/Passes/All/PublishTestProject.java
new file mode 100644
index 00000000..7499634a
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/PublishTestProject.java
@@ -0,0 +1,16 @@
+package Visual_DVM_2021.Passes.All;
+import ProjectData.Project.db_project_info;
+import TestingSystem.Common.Test.Test;
+import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+public class PublishTestProject extends TestingSystemPass<Test> {
+    protected db_project_info project = null;
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        target = (Test) args[0];
+        project= (db_project_info) args[1];
+        return true;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
index 4dba71e6..70115b87 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.UI.UI;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index fccdde08..a493f272 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -7,12 +7,12 @@ import Common.Utils.Index;
 import ProjectData.LanguageName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.Group.Group;
-import TestingSystem.TasksPackage.TasksPackageState;
-import TestingSystem.Test.Test;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
diff --git a/src/Visual_DVM_2021/Passes/All/StartTests.java b/src/Visual_DVM_2021/Passes/All/StartTests.java
index 78297e70..f1131d06 100644
--- a/src/Visual_DVM_2021/Passes/All/StartTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartTests.java
@@ -7,13 +7,12 @@ import GlobalData.Machine.MachineType;
 import GlobalData.User.UserState;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Configuration.ConfigurationInterface;
-import TestingSystem.Group.Group;
-import TestingSystem.Group.GroupInterface;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.Test.Test;
+import TestingSystem.DVM.Configuration.ConfigurationInterface;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
@@ -75,7 +74,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
         return false;
     }
     public static Vector<TestCompilationTask> createTasksCGT(
-            TestingSystem.Configuration.Configuration configuration,
+            TestingSystem.DVM.Configuration.Configuration configuration,
             Group group,
             Test test
     ) {
@@ -145,11 +144,11 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
         if (server.db.groups.getCheckedCount() > 0) {
             //2 Проверяем выбраны ли группы.
             configurations_lines.add("Конфигурации: ");
-            for (TestingSystem.Configuration.Configuration configuration : server.db.configurations.getCheckedItems()) {
+            for (TestingSystem.DVM.Configuration.Configuration configuration : server.db.configurations.getCheckedItems()) {
                 configurations_lines.add(ConfigurationInterface.getSummary(configuration));
                 groups_lines.add("Группы: ");
                 for (Group group : server.db.groups.getCheckedItems()) {
-                    groups_lines.add(GroupInterface.getSummary(group));
+                    groups_lines.add(group.getSummary());
                     Vector<Test> groupTests = new Vector<>();
                     Vector<Test> checkedGroupTests = new Vector<>();
                     for (Test test : server.db.tests.Data.values()) {
diff --git a/src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java b/src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java
index bb1dacce..afef9c41 100644
--- a/src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java
+++ b/src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java
@@ -3,7 +3,7 @@ import Common.Current;
 import GlobalData.Settings.SettingName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.TSetting.TSetting;
+import TestingSystem.Common.TSetting.TSetting;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class SwitchTestingEmail extends TestingSystemPass<TSetting> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java b/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java
index 87cf7ffb..70f4a919 100644
--- a/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java
@@ -5,7 +5,7 @@ import Common.UI.UI;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.Pass_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 import org.apache.commons.io.FileUtils;
diff --git a/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java
index 4a97292b..15062f24 100644
--- a/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
index 4ae2d361..28528628 100644
--- a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
+++ b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
@@ -3,8 +3,8 @@ import Common.Current;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Settings.SettingName;
-import SapforTestingSystem.Json.SapforVersion_json;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 
 import java.io.File;
 import java.nio.file.Paths;
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 2ed04428..7d7e96c4 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -304,6 +304,7 @@ public enum PassCode_2021 {
     OpenSapforEtalonVersion,
     OpenSapforVersion,
     PublishServerSapfor,
+    PublishTestProject,
 
     //->
     TestPass;
@@ -313,6 +314,8 @@ public enum PassCode_2021 {
                 return "?";
             case PublishServerSapfor:
                 return "Опубликовать собранную версию SAPFOR";
+            case PublishTestProject:
+                return "Отправить проект теста";
             case DeleteGroup:
                 return "Удалить группу";
             case UpdateProperty:
diff --git a/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java b/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java
index 112dc870..d3eb8357 100644
--- a/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java
+++ b/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.Global;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.TestingServer;
 public abstract class TestingSystemPass<T> extends RepositoryPass<TestingServer, T> {
     public TestingSystemPass() {
         super(Global.testingServer);
diff --git a/src/Visual_DVM_2021/UI/Main/MainForm.java b/src/Visual_DVM_2021/UI/Main/MainForm.java
index 45d6084e..0ce72a62 100644
--- a/src/Visual_DVM_2021/UI/Main/MainForm.java
+++ b/src/Visual_DVM_2021/UI/Main/MainForm.java
@@ -6,8 +6,8 @@ import Common.UI.UI;
 import Common.UI.Windows.Form;
 import Common.UI.Windows.FormType;
 import Common.Utils.Utils;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import Visual_DVM_2021.UI.Interface.*;
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
index bfe9efa9..c79b71e8 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.UI.Windows.Dialog.DialogFields;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
 import Visual_DVM_2021.UI.Interface.FormWithSplitters;
 
 import javax.swing.*;
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
index cbb76918..b593e201 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
@@ -3,7 +3,7 @@ import Common.Global;
 import Common.UI.Windows.Dialog.Dialog;
 import Common.UI.Windows.FormType;
 import GlobalData.FormsParams.DBForm;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
 public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageFields> {
     SapforTasksPackage sapforTasksPackage = null;
     private DBForm info = null;
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index 4836aed9..82719e70 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -4,9 +4,9 @@ import Common.UI.Label.ShortLabel;
 import Common.UI.Menus_2023.VisualiserMenuBar;
 import Common.UI.UI;
 import Common.Utils.TextLog;
-import SapforTestingSystem.SapforTask.SapforTask;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.UI.SapforTasksPackageTree;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
index 6dcf7637..f7f3a256 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
@@ -6,7 +6,7 @@ import Common.UI.Menus_2023.MenuBarButton;
 import Common.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.ProjectFile;
-import SapforTestingSystem.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Visual_DVM_2021/UI/Main/TestRunTasksComparisonForm.java b/src/Visual_DVM_2021/UI/Main/TestRunTasksComparisonForm.java
index 8421e27e..9be7616f 100644
--- a/src/Visual_DVM_2021/UI/Main/TestRunTasksComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestRunTasksComparisonForm.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Current;
-import TestingSystem.Tasks.TestRunTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
 public class TestRunTasksComparisonForm extends TasksComparisonForm<TestRunTask> {
     public TestRunTasksComparisonForm(ComparisonForm<TestRunTask> slave_in) {
         super(TestRunTask.class, slave_in);