From ad19ee266586151ba97a968757c3a1bce2d7006e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 16 Dec 2023 10:38:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B1=D0=B0=D1=80=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=BA=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D1=83=D1=8E=D1=89=D0=B8=D0=BC=20=D1=82=D0=B0=D0=B1=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=86=D0=B0=D0=BC=20=D0=B2=20=D0=BA=D0=BE=D0=B4=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 24 ++++++++++-
 properties                                    |  2 +-
 .../SapforTasksBar/SapforTasksMenuBar.java    |  7 ----
 .../SapforTasksPackagesBar.java               | 11 -----
 src/Common/UI/UI.java                         | 40 ++++++++-----------
 .../Compiler}/CompilersMenuBar.java           |  2 +-
 .../DVMParameter}/DVMParametersMenuBar.java   |  2 +-
 .../EnvironmentValuesMenuBar.java             |  2 +-
 .../Machine}/MachinesMenuBar.java             |  2 +-
 .../Makefile}/MakefilesMenuBar.java           |  2 +-
 .../Module}/ModulesMenuBar.java               |  2 +-
 .../RunConfigurationsMenuBar.java             |  2 +-
 .../User}/UsersMenuBar.java                   |  2 +-
 .../BugReport}/BugReportsMenuBar.java         |  2 +-
 .../SubscriberWorkspacesMenuBar.java          |  2 +-
 .../Subscribes}/SubscribersMenuBar.java       |  2 +-
 .../Common/Group/GroupsDBTable.java           |  2 -
 .../Common/Group}/GroupsMenuBar.java          |  2 +-
 .../Common/Test}/TestsMenuBar.java            |  2 +-
 .../Configuration}/ConfigurationsMenuBar.java |  2 +-
 .../SapforConfigurationsMenuBar.java          |  3 +-
 .../SapforConfigurationCommandsMenuBar.java   |  2 +-
 .../ServerSapfor}/ServerSapforsBar.java       |  2 +-
 23 files changed, 58 insertions(+), 63 deletions(-)
 delete mode 100644 src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java
 delete mode 100644 src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
 rename src/{Common/UI/Menus_2023/CompilersMenuBar => GlobalData/Compiler}/CompilersMenuBar.java (90%)
 rename src/{Common/UI/Menus_2023/DVMParametersMenuBar => GlobalData/DVMParameter}/DVMParametersMenuBar.java (87%)
 rename src/{Common/UI/Menus_2023/EnvironmentValuesMenuBar => GlobalData/EnvironmentValue}/EnvironmentValuesMenuBar.java (89%)
 rename src/{Common/UI/Menus_2023/MachinesMenuBar => GlobalData/Machine}/MachinesMenuBar.java (87%)
 rename src/{Common/UI/Menus_2023/MakefilesMenuBar => GlobalData/Makefile}/MakefilesMenuBar.java (91%)
 rename src/{Common/UI/Menus_2023/ModulesMenuBar => GlobalData/Module}/ModulesMenuBar.java (84%)
 rename src/{Common/UI/Menus_2023/RunConfigurationsMenuBar => GlobalData/RunConfiguration}/RunConfigurationsMenuBar.java (90%)
 rename src/{Common/UI/Menus_2023/UsersMenuBar => GlobalData/User}/UsersMenuBar.java (89%)
 rename src/{Common/UI/Menus_2023/BugReportsMenuBar => Repository/BugReport}/BugReportsMenuBar.java (93%)
 rename src/{Common/UI/Menus_2023/SubscriberWorkspacesMenuBar => Repository/SubscriberWorkspace}/SubscriberWorkspacesMenuBar.java (83%)
 rename src/{Common/UI/Menus_2023/SubscribersMenuBar => Repository/Subscribes}/SubscribersMenuBar.java (90%)
 rename src/{Common/UI/Menus_2023/GroupsMenuBar => TestingSystem/Common/Group}/GroupsMenuBar.java (97%)
 rename src/{Common/UI/Menus_2023/TestsMenuBar => TestingSystem/Common/Test}/TestsMenuBar.java (92%)
 rename src/{Common/UI/Menus_2023/ConfigurationsMenuBar => TestingSystem/DVM/Configuration}/ConfigurationsMenuBar.java (89%)
 rename src/{Common/UI/Menus_2023/SapforConfigurationsMenuBar => TestingSystem/SAPFOR/SapforConfiguration}/SapforConfigurationsMenuBar.java (79%)
 rename src/{Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar => TestingSystem/SAPFOR/SapforConfigurationCommand}/SapforConfigurationCommandsMenuBar.java (87%)
 rename src/{Common/UI/Menus_2023/ServerSapforsBar => TestingSystem/SAPFOR/ServerSapfor}/ServerSapforsBar.java (85%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dbdbfb08..7f1e7103 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,29 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/ConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParametersMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubscribersMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersMenuBar.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/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 2653b49e..0ce55c18 100644
--- a/properties
+++ b/properties
@@ -26,7 +26,7 @@
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
   "TestingKernels": 28,
-  "AutoCheckTesting": true,
+  "AutoCheckTesting": false,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": false
 }
\ No newline at end of file
diff --git a/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java b/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java
deleted file mode 100644
index bfd31841..00000000
--- a/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package Common.UI.Menus_2023.SapforTasksBar;
-import Common.UI.Menus_2023.DataMenuBar;
-public class SapforTasksMenuBar extends DataMenuBar {
-    public SapforTasksMenuBar() {
-        super("задачи");
-    }
-}
diff --git a/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java b/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
deleted file mode 100644
index 527f9283..00000000
--- a/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package Common.UI.Menus_2023.SapforTasksPackagesBar;
-import Common.UI.Menus_2023.DataMenuBar;
-import Visual_DVM_2021.Passes.PassCode_2021;
-public class SapforTasksPackagesBar extends DataMenuBar {
-    public SapforTasksPackagesBar() {
-        super("пакеты задач",
-                PassCode_2021.AbortSapforTaskPackage,
-                PassCode_2021.DeleteSapforTasksPackage
-                );
-    }
-}
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index d4818ab8..0b18ec80 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -2,32 +2,30 @@ package Common.UI;
 import Common.Current;
 import Common.Database.DataSet;
 import Common.Global;
-import Common.UI.Menus_2023.BugReportsMenuBar.BugReportsMenuBar;
-import Common.UI.Menus_2023.CompilersMenuBar.CompilersMenuBar;
-import Common.UI.Menus_2023.ConfigurationsMenuBar.ConfigurationsMenuBar;
+import Repository.BugReport.BugReportsMenuBar;
+import GlobalData.Compiler.CompilersMenuBar;
+import TestingSystem.DVM.Configuration.ConfigurationsMenuBar;
 import TestingSystem.DVM.DVMPackage.DVMPackagesBar;
-import Common.UI.Menus_2023.DVMParametersMenuBar.DVMParametersMenuBar;
+import GlobalData.DVMParameter.DVMParametersMenuBar;
 import Common.UI.Menus_2023.DataMenuBar;
-import Common.UI.Menus_2023.EnvironmentValuesMenuBar.EnvironmentValuesMenuBar;
+import GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
 import Common.UI.Menus_2023.FastAccessMenuBar.FastAccessMenuBar;
-import Common.UI.Menus_2023.GroupsMenuBar.GroupsMenuBar;
-import Common.UI.Menus_2023.MachinesMenuBar.MachinesMenuBar;
+import TestingSystem.Common.Group.GroupsMenuBar;
+import GlobalData.Machine.MachinesMenuBar;
 import Common.UI.Menus_2023.MainMenuBar.MainMenuBar;
 import Common.UI.Menus_2023.MainMenuBar.MainWindow;
-import Common.UI.Menus_2023.MakefilesMenuBar.MakefilesMenuBar;
-import Common.UI.Menus_2023.ModulesMenuBar.ModulesMenuBar;
-import Common.UI.Menus_2023.RunConfigurationsMenuBar.RunConfigurationsMenuBar;
-import Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar.SapforConfigurationCommandsMenuBar;
-import Common.UI.Menus_2023.SapforConfigurationsMenuBar.SapforConfigurationsMenuBar;
-import Common.UI.Menus_2023.SapforTasksBar.SapforTasksMenuBar;
-import Common.UI.Menus_2023.SapforTasksPackagesBar.SapforTasksPackagesBar;
-import Common.UI.Menus_2023.ServerSapforsBar.ServerSapforsBar;
-import Common.UI.Menus_2023.SubscriberWorkspacesMenuBar.SubscriberWorkspacesMenuBar;
-import Common.UI.Menus_2023.SubscribersMenuBar.SubscribersMenuBar;
+import GlobalData.Makefile.MakefilesMenuBar;
+import GlobalData.Module.ModulesMenuBar;
+import GlobalData.RunConfiguration.RunConfigurationsMenuBar;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsMenuBar;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
+import Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
+import Repository.Subscribes.SubscribersMenuBar;
 import Common.UI.Menus_2023.TestRunTasksMenuBar.TestRunTasksMenuBar;
 import Common.UI.Menus_2023.TestingBar.TestingBar;
-import Common.UI.Menus_2023.TestsMenuBar.TestsMenuBar;
-import Common.UI.Menus_2023.UsersMenuBar.UsersMenuBar;
+import TestingSystem.Common.Test.TestsMenuBar;
+import GlobalData.User.UsersMenuBar;
 import Common.UI.Menus_2023.VariantsMenuBar.VariantsMenuBar;
 import Common.UI.Menus_2023.VersionsMenuBar.VersionsMenuBar;
 import Common.UI.Tables.*;
@@ -76,8 +74,6 @@ import Repository.Component.UI.ComponentsForm;
 import Repository.Subscribes.SubsribersDBTable;
 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.ConfigurationDBTable;
 import TestingSystem.Common.Group.GroupsDBTable;
@@ -239,7 +235,6 @@ public class UI {
         //---->>
         menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
         menuBars.put(SapforConfigurationCommandsDBTable.class, new SapforConfigurationCommandsMenuBar());
-        menuBars.put(SapforTasksPackagesDBTable.class, new SapforTasksPackagesBar());
         //---->>
         menuBars.put(RegionsSet.class, new DataMenuBar("области распараллеливания"));
         menuBars.put(ArraysSet.class, new DataMenuBar("массивы"));
@@ -253,7 +248,6 @@ public class UI {
         menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
         menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode_2021.SaveProfile, PassCode_2021.EditProfile, PassCode_2021.ApplyProfile, PassCode_2021.DeleteProfile));
         menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
-        menuBars.put(SapforTasksDBTable.class, new SapforTasksMenuBar());
         //---->>
     }
     public static void CreateWindows() {
diff --git a/src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java b/src/GlobalData/Compiler/CompilersMenuBar.java
similarity index 90%
rename from src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java
rename to src/GlobalData/Compiler/CompilersMenuBar.java
index 96adb6d1..98950781 100644
--- a/src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java
+++ b/src/GlobalData/Compiler/CompilersMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.CompilersMenuBar;
+package GlobalData.Compiler;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class CompilersMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java b/src/GlobalData/DVMParameter/DVMParametersMenuBar.java
similarity index 87%
rename from src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java
rename to src/GlobalData/DVMParameter/DVMParametersMenuBar.java
index 142234aa..ca8316e3 100644
--- a/src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java
+++ b/src/GlobalData/DVMParameter/DVMParametersMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.DVMParametersMenuBar;
+package GlobalData.DVMParameter;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMParametersMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java b/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
similarity index 89%
rename from src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java
rename to src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
index 463c8c23..55ca38e6 100644
--- a/src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.EnvironmentValuesMenuBar;
+package GlobalData.EnvironmentValue;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EnvironmentValuesMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java b/src/GlobalData/Machine/MachinesMenuBar.java
similarity index 87%
rename from src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java
rename to src/GlobalData/Machine/MachinesMenuBar.java
index 1eadd19d..c4594d4a 100644
--- a/src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java
+++ b/src/GlobalData/Machine/MachinesMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.MachinesMenuBar;
+package GlobalData.Machine;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class MachinesMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java b/src/GlobalData/Makefile/MakefilesMenuBar.java
similarity index 91%
rename from src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java
rename to src/GlobalData/Makefile/MakefilesMenuBar.java
index 4dc80800..0f69b0e8 100644
--- a/src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java
+++ b/src/GlobalData/Makefile/MakefilesMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.MakefilesMenuBar;
+package GlobalData.Makefile;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class MakefilesMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java b/src/GlobalData/Module/ModulesMenuBar.java
similarity index 84%
rename from src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java
rename to src/GlobalData/Module/ModulesMenuBar.java
index bca2de3b..824fc450 100644
--- a/src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java
+++ b/src/GlobalData/Module/ModulesMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.ModulesMenuBar;
+package GlobalData.Module;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class ModulesMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java b/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
similarity index 90%
rename from src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java
rename to src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
index c8689e12..ce99790e 100644
--- a/src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java
+++ b/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.RunConfigurationsMenuBar;
+package GlobalData.RunConfiguration;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
diff --git a/src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java b/src/GlobalData/User/UsersMenuBar.java
similarity index 89%
rename from src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java
rename to src/GlobalData/User/UsersMenuBar.java
index d57fb2cf..6d95f6f4 100644
--- a/src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java
+++ b/src/GlobalData/User/UsersMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.UsersMenuBar;
+package GlobalData.User;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class UsersMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java b/src/Repository/BugReport/BugReportsMenuBar.java
similarity index 93%
rename from src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java
rename to src/Repository/BugReport/BugReportsMenuBar.java
index 74e69199..ff3bf2d6 100644
--- a/src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java
+++ b/src/Repository/BugReport/BugReportsMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.BugReportsMenuBar;
+package Repository.BugReport;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class BugReportsMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java b/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
similarity index 83%
rename from src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java
rename to src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
index 92de34bf..70038742 100644
--- a/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java
+++ b/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.SubscriberWorkspacesMenuBar;
+package Repository.SubscriberWorkspace;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SubscriberWorkspacesMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java b/src/Repository/Subscribes/SubscribersMenuBar.java
similarity index 90%
rename from src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java
rename to src/Repository/Subscribes/SubscribersMenuBar.java
index 0c0edb5e..e8dd7965 100644
--- a/src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java
+++ b/src/Repository/Subscribes/SubscribersMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.SubscribersMenuBar;
+package Repository.Subscribes;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SubscribersMenuBar extends DataMenuBar {
diff --git a/src/TestingSystem/Common/Group/GroupsDBTable.java b/src/TestingSystem/Common/Group/GroupsDBTable.java
index c6b09a2b..3c171fa9 100644
--- a/src/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/TestingSystem/Common/Group/GroupsDBTable.java
@@ -2,7 +2,6 @@ package TestingSystem.Common.Group;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
-import Common.UI.Menus_2023.GroupsMenuBar.GroupsMenuBar;
 import Common.UI.Menus_2023.VisualiserMenu;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.DBObjectDialog;
@@ -10,7 +9,6 @@ import ProjectData.LanguageName;
 import TestingSystem.Common.Group.UI.GroupFields;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.Test.TestType;
-import TestingSystem.DVM.Tasks.TestRunTask;
 
 import javax.swing.*;
 import java.util.LinkedHashMap;
diff --git a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java b/src/TestingSystem/Common/Group/GroupsMenuBar.java
similarity index 97%
rename from src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
rename to src/TestingSystem/Common/Group/GroupsMenuBar.java
index 7f65f410..cdc8dda0 100644
--- a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
+++ b/src/TestingSystem/Common/Group/GroupsMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.GroupsMenuBar;
+package TestingSystem.Common.Group;
 import Common.Global;
 import Common.UI.Menus_2023.DataMenuBar;
 import Common.UI.Menus_2023.MenuBarButton;
diff --git a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java b/src/TestingSystem/Common/Test/TestsMenuBar.java
similarity index 92%
rename from src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
rename to src/TestingSystem/Common/Test/TestsMenuBar.java
index d4e94745..9cf89d63 100644
--- a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
+++ b/src/TestingSystem/Common/Test/TestsMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.TestsMenuBar;
+package TestingSystem.Common.Test;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class TestsMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java b/src/TestingSystem/DVM/Configuration/ConfigurationsMenuBar.java
similarity index 89%
rename from src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
rename to src/TestingSystem/DVM/Configuration/ConfigurationsMenuBar.java
index 22b6a8df..f561a105 100644
--- a/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
+++ b/src/TestingSystem/DVM/Configuration/ConfigurationsMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.ConfigurationsMenuBar;
+package TestingSystem.DVM.Configuration;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class ConfigurationsMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
similarity index 79%
rename from src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java
rename to src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
index b480309f..a2a999f7 100644
--- a/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
@@ -1,10 +1,9 @@
-package Common.UI.Menus_2023.SapforConfigurationsMenuBar;
+package TestingSystem.SAPFOR.SapforConfiguration;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforConfigurationsMenuBar extends DataMenuBar {
     public SapforConfigurationsMenuBar() {
         super("конфигурации",
-                //PassCode_2021.StartSapforTests,
                 PassCode_2021.PublishSapforConfiguration,
                 PassCode_2021.EditSapforConfiguration,
                 PassCode_2021.DeleteSapforConfiguration
diff --git a/src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsMenuBar.java
similarity index 87%
rename from src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java
rename to src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsMenuBar.java
index ae1e7cd1..448378c8 100644
--- a/src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java
+++ b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar;
+package TestingSystem.SAPFOR.SapforConfigurationCommand;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforConfigurationCommandsMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
similarity index 85%
rename from src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java
rename to src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
index 727b6258..2e7b4a29 100644
--- a/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.ServerSapforsBar;
+package TestingSystem.SAPFOR.ServerSapfor;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class ServerSapforsBar extends DataMenuBar {