diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6687f04d..602ddf41 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/1.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/DebugPrintLevel.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Windows/SearchReplaceForm.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Windows/SearchReplaceForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/DVMConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/SapforConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/VisualCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/ProjectsChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectsChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/VDirectoryChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/VFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VFileChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/VFileChooser_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VFileChooser_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/UI/CompilerFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/UI/CompilerFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Component.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ImportFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ImportFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/DarkVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/DarkVisualiserTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightSPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightSPFEditorTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/SPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/SPFEditorTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Windows/SearchReplaceForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common_old/Utils/Files/VDirectoryChooser.java b/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java
similarity index 94%
rename from src/Common_old/Utils/Files/VDirectoryChooser.java
rename to src/Common/Visual/Windows/Dialog/VDirectoryChooser.java
index 4ea33398..25f03ae1 100644
--- a/src/Common_old/Utils/Files/VDirectoryChooser.java
+++ b/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Files;
+package Common.Visual.Windows.Dialog;
 import Common.Utils.CommonUtils;
 
 import javax.swing.*;
diff --git a/src/Common_old/Utils/Files/VFileChooser.java b/src/Common/Visual/Windows/Dialog/VFileChooser.java
similarity index 97%
rename from src/Common_old/Utils/Files/VFileChooser.java
rename to src/Common/Visual/Windows/Dialog/VFileChooser.java
index f8a81b07..a963103d 100644
--- a/src/Common_old/Utils/Files/VFileChooser.java
+++ b/src/Common/Visual/Windows/Dialog/VFileChooser.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Files;
+package Common.Visual.Windows.Dialog;
 import Common.Utils.CommonUtils;
 
 import javax.swing.*;
diff --git a/src/Common_old/Utils/Files/VFileChooser_.java b/src/Common/Visual/Windows/Dialog/VFileChooser_.java
similarity index 97%
rename from src/Common_old/Utils/Files/VFileChooser_.java
rename to src/Common/Visual/Windows/Dialog/VFileChooser_.java
index 4bb7be0e..6f1cef7e 100644
--- a/src/Common_old/Utils/Files/VFileChooser_.java
+++ b/src/Common/Visual/Windows/Dialog/VFileChooser_.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Files;
+package Common.Visual.Windows.Dialog;
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
 import java.awt.*;
diff --git a/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java b/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java
index b8c30427..d8d38782 100644
--- a/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java
+++ b/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Tables;
 import _VisualDVM.Global;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import TestingSystem.Common.Configuration.Configuration;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
diff --git a/src/Common_old/UI/UI.java b/src/Common_old/UI/UI.java
index 0ea4324e..ff48704d 100644
--- a/src/Common_old/UI/UI.java
+++ b/src/Common_old/UI/UI.java
@@ -14,7 +14,7 @@ import Common_old.UI.Menus_2023.VersionsMenuBar.VersionsMenuBar;
 import Common_old.UI.Tables.*;
 import Common_old.UI.Trees.GraphTreeCellRenderer;
 import Common_old.UI.Trees.SelectionTreeCellRenderer;
-import _VisualDVM.Windows.SearchReplaceForm;
+import _VisualDVM.Visual.Windows.SearchReplaceForm;
 import GlobalData.Compiler.CompilersDBTable;
 import GlobalData.Compiler.CompilersMenuBar;
 import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
diff --git a/src/Common_old/UI/VisualCache/VisualCache.java b/src/Common_old/UI/VisualCache/VisualCache.java
deleted file mode 100644
index b7990802..00000000
--- a/src/Common_old/UI/VisualCache/VisualCache.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package Common_old.UI.VisualCache;
-public class VisualCache {
-}
diff --git a/src/Common_old/Utils/Utils.java b/src/Common_old/Utils/Utils.java
index 0a258de7..6783893a 100644
--- a/src/Common_old/Utils/Utils.java
+++ b/src/Common_old/Utils/Utils.java
@@ -7,8 +7,7 @@ import Common.Visual.CommonUI;
 import Common_old.Constants;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
-import Common_old.Utils.Files.VFileChooser_;
+import Common.Visual.Windows.Dialog.VFileChooser_;
 import GlobalData.Settings.SettingName;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Files.DBProjectFile;
diff --git a/src/GlobalData/Compiler/UI/CompilerFields.java b/src/GlobalData/Compiler/UI/CompilerFields.java
index efa7b1a2..a5e0bdd2 100644
--- a/src/GlobalData/Compiler/UI/CompilerFields.java
+++ b/src/GlobalData/Compiler/UI/CompilerFields.java
@@ -3,7 +3,7 @@ import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
-import Common_old.Utils.Files.VDirectoryChooser;
+import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.MachineType;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Repository/Component/Component.java b/src/Repository/Component/Component.java
index 8504a0b6..29becdc2 100644
--- a/src/Repository/Component/Component.java
+++ b/src/Repository/Component/Component.java
@@ -4,7 +4,7 @@ import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
-import Common_old.Utils.Files.VFileChooser;
+import Common.Visual.Windows.Dialog.VFileChooser;
 import Common.Utils.TextLog;
 import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassException;
diff --git a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index e696ef54..98c54b3b 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -4,8 +4,8 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import Common_old.UI.Tables.TableRenderers;
-import Common_old.UI.VisualCache.ConfigurationCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.ConfigurationCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
 public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
index d3eeb88a..7a831ae1 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -3,8 +3,8 @@ import Common.CommonConstants;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
-import Common_old.UI.VisualCache.DVMConfigurationCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import GlobalData.Account.Account;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Machine.Machine;
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 6bb84b1f..36725886 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -4,8 +4,8 @@ import Common.Database.Tables.iDBTable;
 import _VisualDVM.Global;
 import Common.Visual.DataSetControlForm;
 import Common_old.UI.UI;
-import Common_old.UI.VisualCache.PackageCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.PackageCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java b/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
index 6a2d8966..2cd7b6a7 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
@@ -1,7 +1,7 @@
 package TestingSystem.SAPFOR.Json;
 import Common.CommonConstants;
-import Common_old.UI.VisualCache.SapforConfigurationCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
index 2f3c0f72..e76ab3e6 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -1,6 +1,6 @@
 package TestingSystem.SAPFOR.SapforConfiguration;
-import Common_old.UI.VisualCache.ConfigurationCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.ConfigurationCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Common.Utils.TextLog;
 import ProjectData.LanguageName;
 import TestingSystem.Common.Configuration.Configuration;
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 0a173646..9ea4063c 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -3,8 +3,8 @@ import Common_old.Current;
 import Common.Visual.DataSetControlForm;
 import Common_old.UI.Tables.TableEditors;
 import Common_old.UI.Tables.TableRenderers;
-import Common_old.UI.VisualCache.ConfigurationCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.ConfigurationCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Vector_;
 import Common.Database.Tables.iDBTable;
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
index eda77f32..1be0f468 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
@@ -3,8 +3,8 @@ import Common.CommonConstants;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
-import Common_old.UI.VisualCache.ConfigurationCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.ConfigurationCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Common.Utils.TextLog;
 import Common_old.Utils.Utils;
 import GlobalData.Account.Account;
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index c0dc4667..862cdf54 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -2,8 +2,8 @@ package TestingSystem.SAPFOR.SapforPackage;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.VisualCache.PackageCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.PackageCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
index 5f5fc04e..ce1fa460 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
-import Common_old.Utils.Files.VDirectoryChooser;
+import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
index 9bf4429e..ced23644 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
-import Common_old.Utils.Files.VFileChooser;
+import Common.Visual.Windows.Dialog.VFileChooser;
 import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import TestingSystem.Common.Group.Group;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
index f44ef841..f23a8fc6 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
@@ -3,7 +3,7 @@ import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
-import Common_old.Utils.Files.VDirectoryChooser;
+import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.ProjectFile;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
index f7516afb..e49fad6a 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Utils.Files.VFileChooser;
+import Common.Visual.Windows.Dialog.VFileChooser;
 import Common_old.Utils.Utils;
 
 import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
index 4f3308aa..68886c5f 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common_old.Current;
-import Common_old.Utils.Files.VFileChooser;
+import Common.Visual.Windows.Dialog.VFileChooser;
 import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
index 79ee3881..32840850 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
@@ -5,7 +5,7 @@ import Common.Visual.CommonUI;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.Utils.Files.VDirectoryChooser;
+import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import Common.Utils.Index;
 import Common_old.Utils.Utils;
 import GlobalData.Tasks.TaskState;
diff --git a/src/Visual_DVM_2021/Passes/All/ImportFiles.java b/src/Visual_DVM_2021/Passes/All/ImportFiles.java
index f5428a27..e3dffab3 100644
--- a/src/Visual_DVM_2021/Passes/All/ImportFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/ImportFiles.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Utils.Files.VFileChooser;
+import Common.Visual.Windows.Dialog.VFileChooser;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java b/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java
index b1ac2a25..ac3b00a1 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java
+++ b/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import _VisualDVM.Global;
 import Common_old.GlobalProperties;
-import Common_old.Utils.Files.VFileChooser;
+import Common.Visual.Windows.Dialog.VFileChooser;
 import Visual_DVM_2021.Passes.CurrentComponentPass;
 
 import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
index 7caa31c1..ab65801a 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
@@ -4,7 +4,7 @@ import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import Common_old.UI.UI;
-import Common_old.Utils.Files.VDirectoryChooser;
+import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import Common_old.Utils.Utils;
 import GlobalData.DBLastProject.DBLastProject;
 import GlobalData.GlobalDatabase;
diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
index 6a3edd9c..adc70c01 100644
--- a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
@@ -4,7 +4,7 @@ import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common_old.Constants;
 import Common_old.Current;
-import Common_old.Utils.Files.VFileChooser;
+import Common.Visual.Windows.Dialog.VFileChooser;
 import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import Repository.Server.ServerCode;
diff --git a/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java b/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java
index 630da2b2..a08ba933 100644
--- a/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.PassMenuItem;
-import Common_old.Utils.Files.VFileChooser;
+import Common.Visual.Windows.Dialog.VFileChooser;
 import Visual_DVM_2021.Passes.CurrentComponentPass;
 
 import javax.swing.*;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java b/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java
index f863ff73..14f475f2 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.VisualCache.DVMConfigurationCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import TestingSystem.DVM.DVMSettings.DVMSettings;
 import Visual_DVM_2021.Passes.ShowCurrentConfigurationTests;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java b/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java
index a642f3b6..62415cfa 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.VisualCache.SapforConfigurationCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import Visual_DVM_2021.Passes.ShowCurrentConfigurationTests;
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
index 98ec91c7..288e4021 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
@@ -8,8 +8,8 @@ import Common.Visual.Windows.Dialog.PercentsForm;
 import Common.Visual.Windows.Dialog.SliderNumberForm;
 import Common.Visual.Windows.Dialog.SpinnerNumberForm;
 import Common.Visual.Windows.Dialog.Text.TextFieldDialog;
-import Common_old.Utils.Files.VDirectoryChooser;
-import Common_old.Utils.Files.VFileChooser;
+import Common.Visual.Windows.Dialog.VDirectoryChooser;
+import Common.Visual.Windows.Dialog.VFileChooser;
 import Common_old.Utils.Utils;
 import GlobalData.Settings.DBSetting;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java b/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
index 69aeb210..654997f4 100644
--- a/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.Database.Objects.DBObject;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Repository.RepositoryServer;
 public class DeleteServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java b/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
index bfe6173d..01ffcf13 100644
--- a/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
+++ b/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
@@ -4,7 +4,7 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Database;
 import Common.Visual.CommonUI;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Repository.RepositoryServer;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java b/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
index c8ae960c..3fae5f24 100644
--- a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.Database.Objects.DBObject;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Repository.RepositoryServer;
 public class EditServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
     //--
diff --git a/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java b/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java
index 4b41dc57..4d4e6c92 100644
--- a/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java
+++ b/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java
@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.VisualCache.ConfigurationCache;
-import Common_old.UI.VisualCache.VisualCaches;
+import _VisualDVM.ServerObjectsCache.ConfigurationCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import TestingSystem.Common.Configuration.Configuration;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
diff --git a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java b/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
index 944aa8b8..a9ba9147 100644
--- a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
+++ b/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.UI;
 import Common_old.Current;
 import Common_old.UI.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
-import Common_old.Utils.Files.VDirectoryChooser;
+import Common.Visual.Windows.Dialog.VDirectoryChooser;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Common_old/UI/VisualCache/ConfigurationCache.java b/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
similarity index 99%
rename from src/Common_old/UI/VisualCache/ConfigurationCache.java
rename to src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
index 8d3fe616..5690adbb 100644
--- a/src/Common_old/UI/VisualCache/ConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
@@ -1,4 +1,4 @@
-package Common_old.UI.VisualCache;
+package _VisualDVM.ServerObjectsCache;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import TestingSystem.Common.Configuration.Configuration;
diff --git a/src/Common_old/UI/VisualCache/DVMConfigurationCache.java b/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java
similarity index 94%
rename from src/Common_old/UI/VisualCache/DVMConfigurationCache.java
rename to src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java
index 66d0c351..7928e1a1 100644
--- a/src/Common_old/UI/VisualCache/DVMConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java
@@ -1,4 +1,4 @@
-package Common_old.UI.VisualCache;
+package _VisualDVM.ServerObjectsCache;
 import _VisualDVM.Global;
 import TestingSystem.Common.Configuration.Configuration;
 import TestingSystem.Common.Settings.Json.SettingsJson;
diff --git a/src/Common_old/UI/VisualCache/PackageCache.java b/src/_VisualDVM/ServerObjectsCache/PackageCache.java
similarity index 96%
rename from src/Common_old/UI/VisualCache/PackageCache.java
rename to src/_VisualDVM/ServerObjectsCache/PackageCache.java
index 9dca7e82..90767e65 100644
--- a/src/Common_old/UI/VisualCache/PackageCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/PackageCache.java
@@ -1,4 +1,4 @@
-package Common_old.UI.VisualCache;
+package _VisualDVM.ServerObjectsCache;
 import Common.Utils.CommonUtils;
 import TestingSystem.Common.Configuration.Json.ConfigurationJson;
 import TestingSystem.Common.Configuration.Json.ConfigurationsJson;
diff --git a/src/Common_old/UI/VisualCache/SapforConfigurationCache.java b/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java
similarity index 95%
rename from src/Common_old/UI/VisualCache/SapforConfigurationCache.java
rename to src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java
index 34078e52..97d9e738 100644
--- a/src/Common_old/UI/VisualCache/SapforConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java
@@ -1,4 +1,4 @@
-package Common_old.UI.VisualCache;
+package _VisualDVM.ServerObjectsCache;
 import _VisualDVM.Global;
 import TestingSystem.Common.Configuration.Configuration;
 import TestingSystem.Common.Settings.Json.SettingsJson;
diff --git a/src/_VisualDVM/ServerObjectsCache/VisualCache.java b/src/_VisualDVM/ServerObjectsCache/VisualCache.java
new file mode 100644
index 00000000..03948526
--- /dev/null
+++ b/src/_VisualDVM/ServerObjectsCache/VisualCache.java
@@ -0,0 +1,3 @@
+package _VisualDVM.ServerObjectsCache;
+public class VisualCache {
+}
diff --git a/src/Common_old/UI/VisualCache/VisualCaches.java b/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
similarity index 98%
rename from src/Common_old/UI/VisualCache/VisualCaches.java
rename to src/_VisualDVM/ServerObjectsCache/VisualCaches.java
index ec92003a..6e4276ee 100644
--- a/src/Common_old/UI/VisualCache/VisualCaches.java
+++ b/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
@@ -1,4 +1,4 @@
-package Common_old.UI.VisualCache;
+package _VisualDVM.ServerObjectsCache;
 import Common.Database.Objects.DBObject;
 import TestingSystem.Common.Configuration.Configuration;
 import TestingSystem.Common.TestingPackage.TestingPackage;
diff --git a/src/_VisualDVM/Syntax/DarkVisualiserTheme.java b/src/_VisualDVM/Syntax/DarkVisualiserTheme.java
index 83c4606c..1b8dda65 100644
--- a/src/_VisualDVM/Syntax/DarkVisualiserTheme.java
+++ b/src/_VisualDVM/Syntax/DarkVisualiserTheme.java
@@ -1,6 +1,4 @@
 package _VisualDVM.Syntax;
-import Common.Visual.Themes.VisualiserTheme;
-
 import java.awt.*;
 public class DarkVisualiserTheme extends SPFEditorTheme {
     @Override
diff --git a/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java b/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java
index 03187d57..381735ab 100644
--- a/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java
+++ b/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java
@@ -405,4 +405,5 @@ public class FortranSPFTokenMaker extends ProvidedTokenMaker {
                 break;
         }
     }
+    //_VisualDVM.
 }
diff --git a/src/_VisualDVM/Syntax/LightSPFEditorTheme.java b/src/_VisualDVM/Syntax/LightSPFEditorTheme.java
index 8a4fe626..9b7633c5 100644
--- a/src/_VisualDVM/Syntax/LightSPFEditorTheme.java
+++ b/src/_VisualDVM/Syntax/LightSPFEditorTheme.java
@@ -1,6 +1,4 @@
 package _VisualDVM.Syntax;
-import Common.Visual.Themes.VisualiserTheme;
-
 import java.awt.*;
 public class LightSPFEditorTheme extends SPFEditorTheme {
     @Override
diff --git a/src/_VisualDVM/Syntax/SPFEditorTheme.java b/src/_VisualDVM/Syntax/SPFEditorTheme.java
index ecc4557b..1780c5f0 100644
--- a/src/_VisualDVM/Syntax/SPFEditorTheme.java
+++ b/src/_VisualDVM/Syntax/SPFEditorTheme.java
@@ -2,8 +2,6 @@ package _VisualDVM.Syntax;
 import Common.Utils.CommonUtils;
 import Common.Visual.Themes.VisualiserTheme;
 import org.fife.ui.rsyntaxtextarea.Theme;
-
-import java.awt.*;
 public abstract class SPFEditorTheme extends VisualiserTheme {
     protected abstract String getEditorThemePath();    //-
     //если использовать один и тот же объект на все едиторы пявляются странности
diff --git a/src/_VisualDVM/Visual/1.txt b/src/_VisualDVM/Visual/1.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/src/Common_old/Utils/Files/ProjectsChooser.java b/src/_VisualDVM/Visual/Windows/ProjectsChooser.java
similarity index 90%
rename from src/Common_old/Utils/Files/ProjectsChooser.java
rename to src/_VisualDVM/Visual/Windows/ProjectsChooser.java
index 1a826d97..81d6fc3a 100644
--- a/src/Common_old/Utils/Files/ProjectsChooser.java
+++ b/src/_VisualDVM/Visual/Windows/ProjectsChooser.java
@@ -1,5 +1,6 @@
-package Common_old.Utils.Files;
+package _VisualDVM.Visual.Windows;
 import Common.Utils.CommonUtils;
+import Common.Visual.Windows.Dialog.VFileChooser_;
 import Common_old.Constants;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/Windows/SearchReplaceForm.form b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.form
similarity index 99%
rename from src/_VisualDVM/Windows/SearchReplaceForm.form
rename to src/_VisualDVM/Visual/Windows/SearchReplaceForm.form
index a5bc77c4..6aa2aa88 100644
--- a/src/_VisualDVM/Windows/SearchReplaceForm.form
+++ b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Windows.SearchReplaceForm">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Visual.Windows.SearchReplaceForm">
   <grid id="cbd77" binding="MainPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
diff --git a/src/_VisualDVM/Windows/SearchReplaceForm.java b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
similarity index 99%
rename from src/_VisualDVM/Windows/SearchReplaceForm.java
rename to src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
index c2cdb357..a3c70705 100644
--- a/src/_VisualDVM/Windows/SearchReplaceForm.java
+++ b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Windows;
+package _VisualDVM.Visual.Windows;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common.Visual.Windows.Form;