упорядочил папки с кодом.

src/Common/Constants.java

@@ -2,7 +2,7 @@ package Common;
 import GlobalData.Machine.Machine;
 import GlobalData.Machine.MachineType;
 import GlobalData.User.User;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Common.Passes.PassCode_2021;
 
 import java.util.regex.Pattern;
 public class Constants {

src/Common/Current.java

@@ -16,15 +16,15 @@ import ProjectData.Files.DBProjectFile;
 import ProjectData.Project.db_project_info;
 import ProjectData.SapforData.Functions.FuncInfo;
 import ProjectData.SapforData.Regions.ParallelRegion;
-import Repository.BugReport.BugReport;
-import Repository.Subscribes.Subscriber;
-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 Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Repository.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import Repository.TestingSystem.DVM.Configuration.Configuration;
+import Repository.TestingSystem.DVM.Tasks.TestCompilationTask;
+import Repository.TestingSystem.DVM.Tasks.TestRunTask;
+import Repository.TestingSystem.DVM.TasksPackage.TasksPackage;
+import Repository.TestingSystem.Common.Test.Test;
+import Common.Passes.UI.PassForm;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
@@ -167,10 +167,10 @@ public enum Current {
     public static DBProjectFile getFile() {
         return (DBProjectFile) get(File);
     }
-    public static Repository.Component.Component getComponent() {
-        return (Repository.Component.Component) get(Component);
+    public static Repository.ComponentsServer.Component.Component getComponent() {
+        return (Repository.ComponentsServer.Component.Component) get(Component);
     }
-    public static Repository.BugReport.BugReport getBugReport() {
+    public static Repository.ComponentsServer.Component.BugReport.BugReport getBugReport() {
         return (BugReport) get(BugReport);
     }
     public static db_project_info getRoot() {
@@ -188,7 +188,7 @@ public enum Current {
     public static boolean HasSubscriber() {
         return get(Current.Subscriber) != null;
     }
-    public static Repository.Subscribes.Subscriber getSubscriber() {
+    public static Repository.ComponentsServer.Subscribes.Subscriber getSubscriber() {
         return (Subscriber) get(Current.Subscriber);
     }
     public static Machine getMachine() {
@@ -218,28 +218,28 @@ public enum Current {
     public static RunConfiguration getRunConfiguration() {
         return (RunConfiguration) get(Current.RunConfiguration);
     }
-    public static Repository.Component.Sapfor.Sapfor getSapfor() {
-        return (Repository.Component.Sapfor.Sapfor) get(Current.Sapfor);
+    public static Repository.ComponentsServer.Component.Sapfor.Sapfor getSapfor() {
+        return (Repository.ComponentsServer.Component.Sapfor.Sapfor) get(Current.Sapfor);
     }
     public static boolean HasGroup() {
         return get(Current.Group) != null;
     }
-    public static TestingSystem.Common.Group.Group getGroup() {
-        return (TestingSystem.Common.Group.Group) get(Current.Group);
+    public static Repository.TestingSystem.Common.Group.Group getGroup() {
+        return (Repository.TestingSystem.Common.Group.Group) get(Current.Group);
     }
     //--
     public static boolean HasConfiguration() {
         return get(Current.Configuration) != null;
     }
-    public static TestingSystem.DVM.Configuration.Configuration getConfiguration() {
+    public static Repository.TestingSystem.DVM.Configuration.Configuration getConfiguration() {
         return (Configuration) get(Current.Configuration);
     }
     public static SapforConfiguration getSapforConfiguration() {
-        return (TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
+        return (Repository.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
     }
     //--
     public static Test getTest() {
-        return (TestingSystem.Common.Test.Test) get(Current.Test);
+        return (Repository.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.DVM.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
+        return (Repository.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.DVM.Tasks.TestRunTask) get(Current.TestRunTask);
+        return (Repository.TestingSystem.DVM.Tasks.TestRunTask) get(Current.TestRunTask);
     }
     public static RemoteFile getComponentServerBackup() {
         return (RemoteFile) get(Current.ComponentServerBackup);
@@ -287,7 +287,7 @@ public enum Current {
         return get(Current.BugReport) != null;
     }
     public static PassForm getPassForm() {
-        return (Visual_DVM_2021.Passes.UI.PassForm) get(Current.PassForm);
+        return (Common.Passes.UI.PassForm) get(Current.PassForm);
     }
     public static VisualiserTheme getTheme() {
         return (VisualiserTheme) get(Current.Theme);
@@ -332,8 +332,8 @@ public enum Current {
     public static boolean HasSapforTask() {
         return get(Current.SapforTask) != null;
     }
-    public static TestingSystem.SAPFOR.SapforTask.SapforTask getSapforTask() {
-        return (TestingSystem.SAPFOR.SapforTask.SapforTask) get(Current.SapforTask);
+    public static Repository.TestingSystem.SAPFOR.SapforTask.SapforTask getSapforTask() {
+        return (Repository.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 TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
-        return (TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
+    public static Repository.TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
+        return (Repository.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 TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
-        return (TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
+    public static Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
+        return (Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
     }
     //сапфоры установленные на тестовый сервер.
     public static boolean HasServerSapfor() {
         return get(Current.ServerSapfor) != null;
     }
-    public static TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
-        return (TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
+    public static Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
+        return (Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
     }
     //--------------------------------------------
     public String getDescription() {

src/Common/Database/DataSet.java

@@ -7,7 +7,7 @@ import Common.UI.UI;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.UI.Windows.Dialog.DialogFields;
 import Common.Utils.TextLog;
-import Visual_DVM_2021.UI.Interface.FilterWindow;
+import Common.UI.Windows.Interface.FilterWindow;
 
 import javax.swing.*;
 import java.awt.*;

src/Common/Database/Database.java

@@ -3,7 +3,7 @@ import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import Repository.RepositoryRefuseException;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Common.Passes.PassCode_2021;
 
 import java.io.File;
 import java.util.LinkedHashMap;

src/Common/Database/SQLITE/SQLiteDatabase.java

@@ -5,7 +5,7 @@ import Common.Database.DBTableColumn;
 import Common.Database.Database;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.PassException;
+import Common.Passes.PassException;
 import javafx.util.Pair;
 
 import java.io.File;

src/Common/Global.java

@@ -7,17 +7,17 @@ import GlobalData.GlobalDatabase;
 import GlobalData.Settings.DBSetting;
 import GlobalData.Settings.SettingName;
 import ProjectData.ProjectView;
-import Repository.Component.*;
-import Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
-import Repository.Component.Sapfor.MessagesServer;
-import Repository.Component.Sapfor.Sapfor_F;
-import Repository.Component.Sapfor.TransformationPermission;
-import Repository.Server.ComponentsServer;
-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;
+import Repository.ComponentsServer.Component.*;
+import Repository.ComponentsServer.Component.PerformanceAnalyzer.PerformanceAnalyzer;
+import Repository.ComponentsServer.Component.Sapfor.MessagesServer;
+import Repository.ComponentsServer.Component.Sapfor.Sapfor_F;
+import Repository.ComponentsServer.Component.Sapfor.TransformationPermission;
+import Repository.ComponentsServer.ComponentsServer;
+import Repository.TestingSystem.SAPFOR.PackageModeSupervisor;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
+import Common.UI.Windows.Interface.Loggable;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 

src/Common/Passes/AddObjectPass.java

@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes;
+package Common.Passes;
 import Common.Database.DBObject;
 public abstract class AddObjectPass<D extends DBObject> extends ObjectPass<D> {
     public AddObjectPass(Class<D> d_in) {

src/Common/Passes/All/AbortSapforTaskPackage.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import Repository.TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
+import Common.Passes.Server.TestingSystemPass;
 
 import java.util.Vector;
 public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage> {

src/Common/Passes/All/AbortSelectedPackages.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.DVM.TasksPackage.TasksPackage;
-import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.DVM.TasksPackage.TasksPackage;
+import Repository.TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
+import Common.Passes.Server.TestingSystemPass;
 
 import java.util.Vector;
 public class AbortSelectedPackages extends TestingSystemPass<Vector<TasksPackage>> {

src/Common/Passes/All/AddBugReport.java

@@ -1,16 +1,16 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import GlobalData.Account.AccountRole;
-import Repository.BugReport.BugReport;
-import Repository.BugReport.BugReportInterface;
-import Repository.BugReport.BugReportState;
-import Repository.Component.ComponentType;
-import Visual_DVM_2021.Passes.AddObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Component.BugReport.BugReportInterface;
+import Repository.ComponentsServer.Component.BugReport.BugReportState;
+import Repository.ComponentsServer.Component.ComponentType;
+import Common.Passes.AddObjectPass;
+import Common.Passes.PassCode_2021;
 
 import java.io.File;
 import java.nio.file.Files;

src/Common/Passes/All/AddCompiler.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.DBObject;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Machine.Machine;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
 public class AddCompiler extends AddObjectPass<Compiler> {
     public AddCompiler() {
         super(Compiler.class);

src/Common/Passes/All/AddDVMParameter.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.DBObject;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.DVMParameter.DVMParameter;
 import GlobalData.RunConfiguration.RunConfiguration;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
 public class AddDVMParameter extends AddObjectPass<DVMParameter> {
     public AddDVMParameter() {
         super(DVMParameter.class);

src/Common/Passes/All/AddDVMParameterForTesting.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Utils;
 import GlobalData.DVMParameter.DVMParameter;
 import GlobalData.DVMParameter.UI.DVMParameterFields;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
 public class AddDVMParameterForTesting extends Pass_2021<String> {
     @Override
     protected boolean canStart(Object... args) throws Exception {

src/Common/Passes/All/AddEnvironmentValue.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.EnvironmentValue.EnvironmentValue;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
 public class AddEnvironmentValue extends AddObjectPass<EnvironmentValue> {
     public AddEnvironmentValue() {
         super(EnvironmentValue.class);

src/Common/Passes/All/AddFile.java

@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Constants;
 import Common.Current;
 import Common.UI.UI;
@@ -6,7 +6,7 @@ import Common.UI.Windows.Dialog.Text.FileNameForm;
 import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
-import Visual_DVM_2021.Passes.ChangeFilePass;
+import Common.Passes.ChangeFilePass;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.tree.DefaultMutableTreeNode;

src/Common/Passes/All/AddMachine.java

@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.Compiler.Compiler;
@@ -6,7 +6,7 @@ import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.Machine;
 import GlobalData.Machine.MachineType;
 import GlobalData.User.User;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
 public class AddMachine extends AddObjectPass<Machine> {
     public AddMachine() {
         super(Machine.class);

src/Common/Passes/All/AddMakefile.java

@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.DBObject;
 import Common.Database.Database;
 import Common.Global;
@@ -6,7 +6,7 @@ import GlobalData.Machine.Machine;
 import GlobalData.Makefile.Makefile;
 import GlobalData.Module.Module;
 import ProjectData.LanguageName;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
 public class AddMakefile extends AddObjectPass<Makefile> {
     public AddMakefile() {
         super(Makefile.class);

src/Common/Passes/All/AddRunConfiguration.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.DBObject;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.Machine.Machine;
 import GlobalData.RunConfiguration.RunConfiguration;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
 public class AddRunConfiguration extends AddObjectPass<RunConfiguration> {
     public AddRunConfiguration() {
         super(RunConfiguration.class);

src/Common/Passes/All/AddSubscriber.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+package Common.Passes.All;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
 public class AddSubscriber extends ComponentsRepositoryPass<Subscriber> {
     @Override
     public String getIconPath() {

src/Common/Passes/All/AddUser.java

@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.Database;
@@ -6,7 +6,7 @@ import Common.Global;
 import GlobalData.Machine.Machine;
 import GlobalData.Machine.MachineType;
 import GlobalData.User.User;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
 public class AddUser extends AddObjectPass<User> {
     public AddUser() {
         super(User.class);

src/Common/Passes/All/AppendBugReportComment.java

@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 public class AppendBugReportComment extends AppendBugReportField {

src/Common/Passes/All/AppendBugReportDescription.java

@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.UI.UI;
 public class AppendBugReportDescription extends AppendBugReportField {
     @Override

src/Common/Passes/All/AppendBugReportField.java

@@ -1,14 +1,14 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import Repository.BugReport.BugReport;
-import Repository.BugReport.BugReportInterface;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Component.BugReport.BugReportInterface;
 import Repository.EmailMessage;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
 import javafx.util.Pair;
 
 import java.util.Date;

src/Common/Passes/All/ApplyBugReportSettings.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import GlobalData.Settings.SettingName;
-import Repository.BugReport.BugReport;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 
 import java.util.LinkedHashMap;
 public class ApplyBugReportSettings extends Pass_2021<BugReport> {

src/Common/Passes/All/ApplyCurrentFunction.java

@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.Text.ComboTextDialog;
 import Common.Utils.Utils;
 import ProjectData.SapforData.Functions.FuncInfo;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 
 import java.util.Comparator;
 import java.util.Vector;

src/Common/Passes/All/ApplyProfile.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import GlobalData.SapforProfile.SapforProfile;
 import GlobalData.SapforProfileSetting.SapforProfileSetting;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 
 import java.util.Vector;
 public class ApplyProfile extends Pass_2021<SapforProfile> {

src/Common/Passes/All/ArchivesBackupPass.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Machine.Machine;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.User.User;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
+import Common.Passes.SSH.ConnectionPass;
 import com.jcraft.jsch.ChannelSftp;
 
 import java.io.File;

src/Common/Passes/All/BuildComponent.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Utils.Utils;
-import Repository.Component.Component;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.ProcessPass;
+import Repository.ComponentsServer.Component.Component;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.ProcessPass;
 
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;

src/Common/Passes/All/CheckAccount.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.UI.UI;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 public class CheckAccount extends Pass_2021<Boolean> {
     @Override
     protected boolean canStart(Object... args) throws Exception {

src/Common/Passes/All/CheckRegistrationOnServer.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Common.Passes.Server.ComponentsRepositoryPass;
 public class CheckRegistrationOnServer extends ComponentsRepositoryPass<Subscriber> {
     @Override
     protected void ServerAction() throws Exception {

src/Common/Passes/All/CheckRemoteWorkspace.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.SubscriberWorkspace.SubscriberWorkspace;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
+import Common.Passes.Server.ComponentsRepositoryPass;
 public class CheckRemoteWorkspace extends ComponentsRepositoryPass<SubscriberWorkspace> {
     @Override
     protected boolean canStart(Object... args) throws Exception {

src/Common/Passes/All/CleanAnalyses.java

@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.UI.UI;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
 public class CleanAnalyses extends CurrentProjectPass {
     @Override
     protected boolean canStart(Object... args) throws Exception {

src/Common/Passes/All/CloseBugReport.java

@@ -1,5 +1,5 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.BugReport.BugReportState;
+package Common.Passes.All;
+import Repository.ComponentsServer.Component.BugReport.BugReportState;
 public class CloseBugReport extends UpdateBugReportField {
     @Override
     public String getIconPath() {

src/Common/Passes/All/CloseCurrentFile.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 
 import javax.swing.*;
 public class CloseCurrentFile extends Pass_2021<DBProjectFile> {

src/Common/Passes/All/CloseCurrentProject.java

@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 
 import javax.swing.*;
 import java.io.File;

src/Common/Passes/All/CloseProject.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
 
 import java.io.File;
 public class CloseProject extends Pass_2021<db_project_info> {

src/Common/Passes/All/CombineFiles.java

@@ -1,12 +1,12 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
 import Common.UI.Windows.Dialog.Text.ComboTextDialog;
 import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
-import Repository.Component.Sapfor.TransformationPermission;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Transformation;
-import Visual_DVM_2021.UI.Main.CombineFilesDialog;
+import Repository.ComponentsServer.Component.Sapfor.TransformationPermission;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Transformation;
+import Common.UI.Windows.Main.CombineFilesDialog;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/Common/Passes/All/Compile.java

@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
@@ -8,9 +8,9 @@ import GlobalData.Tasks.TaskState;
 import GlobalData.User.UserState;
 import ProjectData.LanguageName;
 import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.Pass_2021;
 public class Compile extends Pass_2021<db_project_info> {
     Pass_2021 subpass = null;
     CompilationTask compilationTask = null;

src/Common/Passes/All/ConvertCorrectnessTests.java

@@ -1,15 +1,15 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.Test.Test;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.Common.Group.Group;
+import Repository.TestingSystem.Common.Test.Test;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.TestingSystemPass;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/Common/Passes/All/CopyProject.java

@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.Dialog;
 import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.UI.CopyProjectFields;
+import Common.Passes.CurrentProjectPass;
+import Common.Passes.PassCode_2021;
+import Common.Passes.UI.CopyProjectFields;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/Common/Passes/All/CreateComponentBackUp.java

@@ -1,5 +1,5 @@
-package Visual_DVM_2021.Passes.All;
-import Visual_DVM_2021.Passes.CurrentComponentPass;
+package Common.Passes.All;
+import Common.Passes.CurrentComponentPass;
 
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;

src/Common/Passes/All/CreateEmptyDirectory.java

@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Constants;
 import Common.Current;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.Text.FileNameForm;
 import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.ChangeFilePass;
-import Visual_DVM_2021.Passes.PassException;
+import Common.Passes.ChangeFilePass;
+import Common.Passes.PassException;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;

src/Common/Passes/All/CreateEmptyProject.java

@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Constants;
 import Common.Global;
 import Common.UI.Windows.Dialog.Text.FileNameForm;
 import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.Pass_2021;
 
 import java.io.File;
 import java.nio.file.Paths;

src/Common/Passes/All/CreateParallelVariants.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.UI.UI;
 import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.VariantsMassPass;
+import Common.Passes.PassCode_2021;
+import Common.Passes.VariantsMassPass;
 public class CreateParallelVariants extends VariantsMassPass {
     @Override
     public String getIconPath() {

src/Common/Passes/All/CreateParallelVariantsCoverageForScenario.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import ProjectData.SapforData.Variants.ParallelVariant;
-import Repository.Component.Sapfor.Sapfor;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ComponentsServer.Component.Sapfor.Sapfor;
+import Common.Passes.CurrentProjectPass;
+import Common.Passes.PassCode_2021;
 public class CreateParallelVariantsCoverageForScenario extends CurrentProjectPass {
     @Override
     public void Interrupt() throws Exception {

src/Common/Passes/All/CreateTestsGroupFromSelectedVersions.java

@@ -1,14 +1,14 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
-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;
+import Repository.TestingSystem.Common.Group.Group;
+import Repository.TestingSystem.Common.Test.Test;
+import Repository.TestingSystem.Common.Test.TestType;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 
 import java.util.Vector;
 public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_project_info>> {

src/Common/Passes/All/DVMConvertProject.java

@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.Menus_2023.PassMenuItem;
@@ -7,10 +7,10 @@ import Common.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Project.db_project_info;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.*;

src/Common/Passes/All/DeleteBugReport.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
-import Repository.BugReport.BugReport;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Common.Passes.DeleteObjectPass;
+import Common.Passes.PassCode_2021;
 public class DeleteBugReport extends DeleteObjectPass<BugReport> {
     public DeleteBugReport() {
         super(BugReport.class);

src/Common/Passes/All/DeleteBugReportFromServer.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.BugReport.BugReport;
-import Repository.BugReport.BugReportState;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+package Common.Passes.All;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Component.BugReport.BugReportState;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
 public class DeleteBugReportFromServer extends ComponentsRepositoryPass<BugReport> {
     @Override
     protected boolean canStart(Object... args) {

src/Common/Passes/All/DeleteCompiler.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.Compiler.Compiler;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
 public class DeleteCompiler extends DeleteObjectPass<Compiler> {
     public DeleteCompiler() {
         super(Compiler.class);

src/Common/Passes/All/DeleteDVMParameter.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.DVMParameter.DVMParameter;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
 public class DeleteDVMParameter extends DeleteObjectPass<DVMParameter> {
     public DeleteDVMParameter() {
         super(DVMParameter.class);

src/Common/Passes/All/DeleteDebugResults.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.Task;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
 
 import java.util.Vector;
 import java.util.stream.Collectors;

src/Common/Passes/All/DeleteDirectory.java

@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.ChangeFilePass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
+import Common.Passes.ChangeFilePass;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/Common/Passes/All/DeleteDownloadedBugReports.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 
 import java.io.File;
 import java.util.Arrays;

src/Common/Passes/All/DeleteEnvironmentValue.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.EnvironmentValue.EnvironmentValue;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
 public class DeleteEnvironmentValue extends DeleteObjectPass<EnvironmentValue> {
     public DeleteEnvironmentValue() {
         super(EnvironmentValue.class);

src/Common/Passes/All/DeleteFile.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.ChangeFilePass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Common.Passes.ChangeFilePass;
+import Common.Passes.PassCode_2021;
 public class DeleteFile extends ChangeFilePass<DBProjectFile> {
     @Override
     public String getIconPath() {

src/Common/Passes/All/DeleteGroup.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+import Repository.TestingSystem.Common.Group.Group;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.DeleteServerObject;
 public class DeleteGroup extends DeleteServerObject<TestingServer, Group> {
     public DeleteGroup() {
         super(Global.testingServer, Group.class);

src/Common/Passes/All/DeleteLonelyM.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 
 import java.util.Vector;
 public class DeleteLonelyM extends Pass_2021<db_project_info> {

src/Common/Passes/All/DeleteMachine.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.Machine.Machine;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
 public class DeleteMachine extends DeleteObjectPass<Machine> {
     public DeleteMachine() {
         super(Machine.class);

src/Common/Passes/All/DeleteMakefile.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.Makefile.Makefile;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
 public class DeleteMakefile extends DeleteObjectPass<Makefile> {
     public DeleteMakefile() {
         super(Makefile.class);

src/Common/Passes/All/DeleteProfile.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.SapforProfile.SapforProfile;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
 public class DeleteProfile extends DeleteObjectPass<SapforProfile> {
     public DeleteProfile() {
         super(SapforProfile.class);

src/Common/Passes/All/DeleteRunConfiguration.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.RunConfiguration.RunConfiguration;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
 public class DeleteRunConfiguration extends DeleteObjectPass<RunConfiguration> {
     public DeleteRunConfiguration() {
         super(RunConfiguration.class);

src/Common/Passes/All/DeleteSapforConfiguration.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+import Repository.TestingSystem.Common.TestingServer;
+import Repository.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import Common.Passes.Server.DeleteServerObject;
 public class DeleteSapforConfiguration extends DeleteServerObject<TestingServer, SapforConfiguration> {
     public DeleteSapforConfiguration() {
         super(Global.testingServer, SapforConfiguration.class);

src/Common/Passes/All/DeleteSapforConfigurationCommand.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+import Repository.TestingSystem.Common.TestingServer;
+import Repository.TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
+import Common.Passes.Server.DeleteServerObject;
 public class DeleteSapforConfigurationCommand extends DeleteServerObject<TestingServer, SapforConfigurationCommand> {
     public DeleteSapforConfigurationCommand() {
         super(Global.testingServer, SapforConfigurationCommand.class);

src/Common/Passes/All/DeleteSapforTasksPackage.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import TestingSystem.DVM.TasksPackage.TasksPackageState;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-import Visual_DVM_2021.Passes.Server.DeleteServerAccountObject;
+import Repository.TestingSystem.DVM.TasksPackage.TasksPackageState;
+import Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import Common.Passes.Server.DeleteServerAccountObject;
 public class DeleteSapforTasksPackage extends DeleteServerAccountObject<SapforTasksPackage> {
     public DeleteSapforTasksPackage() {
         super(SapforTasksPackage.class);

src/Common/Passes/All/DeleteSelectedCompilationTasks.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
 import GlobalData.Tasks.RunTask.RunTask;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
 
 import java.util.Vector;
 public class DeleteSelectedCompilationTasks extends Pass_2021<Vector<CompilationTask>> {

src/Common/Passes/All/DeleteSelectedConfigurations.java

@@ -1,6 +1,6 @@
-package Visual_DVM_2021.Passes.All;
-import TestingSystem.DVM.Configuration.Configuration;
-import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
+package Common.Passes.All;
+import Repository.TestingSystem.DVM.Configuration.Configuration;
+import Common.Passes.DeleteSelectedServerObjects;
 public class DeleteSelectedConfigurations extends DeleteSelectedServerObjects {
     public DeleteSelectedConfigurations() {
         super(Configuration.class);

src/Common/Passes/All/DeleteSelectedFiles.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 public class DeleteSelectedFiles extends Pass_2021 {
     @Override
     public String getIconPath() {

src/Common/Passes/All/DeleteSelectedRunTasks.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.RunTask.RunTask;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
 
 import java.util.Vector;
 public class DeleteSelectedRunTasks extends Pass_2021<Vector<RunTask>> {

src/Common/Passes/All/DeleteSelectedVersions.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 
 import java.util.Vector;
 public class DeleteSelectedVersions extends Pass_2021<Vector<db_project_info>> {

src/Common/Passes/All/DeleteServerSapfor.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
-import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
-import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+import Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.DeleteServerObject;
 public class DeleteServerSapfor extends DeleteServerObject<TestingServer, ServerSapfor> {
     public DeleteServerSapfor() {
         super(Global.testingServer, ServerSapfor.class);

src/Common/Passes/All/DeleteSubscriber.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Common.Passes.DeleteObjectPass;
+import Common.Passes.PassCode_2021;
 public class DeleteSubscriber extends DeleteObjectPass<Subscriber> {
     public DeleteSubscriber() {
         super(Subscriber.class);

src/Common/Passes/All/DeleteSubscriberOnServer.java

@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+package Common.Passes.All;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
 public class DeleteSubscriberOnServer extends ComponentsRepositoryPass<Subscriber> {
     @Override
     protected boolean canStart(Object... args) throws Exception {

src/Common/Passes/All/DeleteSubversions.java

@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Common.Passes.CurrentProjectPass;
+import Common.Passes.PassCode_2021;
 
 import java.util.Vector;
 public class DeleteSubversions extends CurrentProjectPass {

src/Common/Passes/All/DeleteTest.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
-import TestingSystem.Common.Test.Test;
-import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+import Repository.TestingSystem.Common.Test.Test;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.DeleteServerObject;
 public class DeleteTest extends DeleteServerObject<TestingServer, Test> {
     public DeleteTest() {
         super(Global.testingServer, Test.class);

src/Common/Passes/All/DeleteUser.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.User.User;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
 public class DeleteUser extends DeleteObjectPass<User> {
     public DeleteUser() {
         super(User.class);

src/Common/Passes/All/DeleteVersion.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
 public class DeleteVersion extends Pass_2021<db_project_info> {
     db_project_info parent;
     boolean current;

src/Common/Passes/All/DownloadAllBugReportsArchives.java

@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.Utils.Utils;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/Common/Passes/All/DownloadBugReport.java

@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
-import Repository.BugReport.BugReport;
-import Repository.BugReport.BugReportInterface;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Component.BugReport.BugReportInterface;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
 public class DownloadBugReport extends ComponentsRepositoryPass<BugReport> {
     @Override
     protected boolean canStart(Object... args) {

src/Common/Passes/All/DownloadComponent.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Utils.Utils;
-import Repository.Component.Component;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ComponentsServer.Component.Component;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
 public class DownloadComponent extends ComponentsRepositoryPass<Component> {
     @Override
     protected void ServerAction() throws Exception {

src/Common/Passes/All/DownloadProject.java

@@ -1,12 +1,12 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.SSH.CurrentConnectionPass;
 
 import java.io.File;
 import java.nio.file.Paths;

src/Common/Passes/All/DownloadRepository.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.ProcessPass;
+import Common.Passes.ProcessPass;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/Common/Passes/All/DownloadSapforTasksPackage.java

@@ -1,12 +1,12 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Utils.Utils;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.DVM.TasksPackage.TasksPackageState;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import Repository.TestingSystem.DVM.TasksPackage.TasksPackageState;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.TestingSystemPass;
 
 import java.io.File;
 public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {

src/Common/Passes/All/DownloadTaskTest.java

@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
-import TestingSystem.DVM.Tasks.TestRunTask;
-import TestingSystem.Common.Test.Test;
+import Repository.TestingSystem.DVM.Tasks.TestRunTask;
+import Repository.TestingSystem.Common.Test.Test;
 public class DownloadTaskTest extends DownloadTest {
     @Override
     protected boolean canStart(Object... args) throws Exception {

src/Common/Passes/All/DownloadTest.java

@@ -1,13 +1,13 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Common.Test.Test;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.Common.Test.Test;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.TestingSystemPass;
 public class DownloadTest extends TestingSystemPass<Test> {
     @Override
     public String getIconPath() {

src/Common/Passes/All/DropAnalyses.java

@@ -1,7 +1,6 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
-import Common.UI.UI;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
 public class DropAnalyses extends CurrentProjectPass {
     @Override
     protected boolean canStart(Object... args) throws Exception {

src/Common/Passes/All/DropFastAccess.java

@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
 import Common.UI.UI;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
 public class DropFastAccess extends Pass_2021 {
     @Override
     public String getButtonText() {

src/Common/Passes/All/DropLastProjects.java

@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Global;
 import GlobalData.DBLastProject.DBLastProject;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
 public class DropLastProjects extends Pass_2021 {
     @Override
     protected void body() throws Exception {

src/Common/Passes/All/DropSavedArrays.java

@@ -1,6 +1,6 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import ProjectData.DBArray.DBArray;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
 public class DropSavedArrays extends CurrentProjectPass {
     @Override
     public String getButtonText() {

src/Common/Passes/All/EditAccount.java

@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import Repository.EmailMessage;
-import Repository.Subscribes.Subscriber;
-import Repository.Subscribes.UI.SubscriberForm;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Repository.ComponentsServer.Subscribes.UI.SubscriberForm;
 
 import javax.swing.*;
 import java.util.Vector;

src/Common/Passes/All/EditCompiler.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.Compiler.Compiler;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
 public class EditCompiler extends EditObjectPass<Compiler> {
     public EditCompiler() {
         super(Compiler.class);

src/Common/Passes/All/EditConfiguration.java

@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
-import TestingSystem.DVM.Configuration.Configuration;
-import Visual_DVM_2021.Passes.EditObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.TestingSystem.DVM.Configuration.Configuration;
+import Common.Passes.EditObjectPass;
+import Common.Passes.PassCode_2021;
 public class EditConfiguration extends EditObjectPass<Configuration> {
     public EditConfiguration() {
         super(Configuration.class);

src/Common/Passes/All/EditConfigurationOnServer.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.DVM.Configuration.Configuration;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+package Common.Passes.All;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.DVM.Configuration.Configuration;
+import Common.Passes.Server.TestingSystemPass;
 public class EditConfigurationOnServer extends TestingSystemPass<Configuration> {
     @Override
     protected boolean canStart(Object... args) throws Exception {

src/Common/Passes/All/EditDVMParameter.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.DVMParameter.DVMParameter;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
 public class EditDVMParameter extends EditObjectPass<DVMParameter> {
     public EditDVMParameter() {
         super(DVMParameter.class);

src/Common/Passes/All/EditEnvironmentValue.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.EnvironmentValue.EnvironmentValue;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
 public class EditEnvironmentValue extends EditObjectPass<EnvironmentValue> {
     public EditEnvironmentValue() {
         super(EnvironmentValue.class);

src/Common/Passes/All/EditGroup.java

@@ -0,0 +1,10 @@
+package Common.Passes.All;
+import Common.Global;
+import Repository.TestingSystem.Common.Group.Group;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.EditServerObject;
+public class EditGroup extends EditServerObject<TestingServer, Group> {
+    public EditGroup() {
+        super(Global.testingServer, Group.class);
+    }
+}

src/Common/Passes/All/EditMachine.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.Machine.Machine;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
 public class EditMachine extends EditObjectPass<Machine> {
     public EditMachine() {
         super(Machine.class);

src/Common/Passes/All/EditMakefile.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.Makefile.Makefile;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
 public class EditMakefile extends EditObjectPass<Makefile> {
     public EditMakefile() {
         super(Makefile.class);

src/Common/Passes/All/EditModule.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.Module.Module;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
 public class EditModule extends EditObjectPass<Module> {
     public EditModule() {
         super(Module.class);

src/Common/Passes/All/EditProfile.java

@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import GlobalData.SapforProfile.SapforProfile;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
 public class EditProfile extends EditObjectPass<SapforProfile> {
     public EditProfile() {
         super(SapforProfile.class);