diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ad18a5da..af1cde37 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,18 +8,188 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/DarkVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/DarkVisualiserTheme.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/FortranSPFTokenMaker.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/FreeFortranSPFTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/FreeFortranSPFTokenMaker.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightSPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/LightSPFEditorTheme.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/ProvidedTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/ProvidedTokenMaker.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/SPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/TokenProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/TokenProvider.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/dark_editor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/dark_editor.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/light_editor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/light_editor.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/ControlWithCurrentForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/ControlWithCurrentForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledTextComboBox.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataControl_OLD.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataControl_OLD.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Editor/CaretInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/CaretInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Editor/Viewer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/Viewer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Label/ShortLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Controls/ShortLabel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/List/HyperlinksStyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/HyperlinksStyledList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/List/StyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/AttachementsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/AttachementsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/FileStyleMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/FileStyleMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/GraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/GraphMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/MainEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/MainEditorMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/ProjectFilesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/ProjectFilesMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/StyledPopupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TableMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TestsCompilationFilterMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TestsCompilationFilterMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextComboBoxMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TextComboBoxMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TextEditorMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/VersionsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/VersionsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/VisualiserMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/PassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/PassMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StableMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StableMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/ProgressBar/StyledProgressBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/ColumnFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/ColumnInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/ConfigurationAutoRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ConfigurationAutoRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectSelectionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectSelectionRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectSelector.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectSelector.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/DataTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DataTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/DateRenderer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DateRenderer_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/EditableHeaderRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/EditableHeaderRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/EditorCell.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/EditorCell.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/Grid/GridAnchestor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/Grid/GridAnchestor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/HyperlinksRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HyperlinksRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/MaskedIntegerValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/MaskedIntegerValueRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/MultilineRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/MultilineRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/ProgressBarRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ProgressBarRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/RendererCell.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererCell.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledCellLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/TableEditors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/TableEditors.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/TableRenderers.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/TableRenderers.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/TopLeftRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/TopLeftRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/VectorEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/VectorEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/TextArea/StyledTextArea.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/TextArea/StyledTextArea.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/TextField/StyledPasswordField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/TextField/StyledPasswordField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/TextField/StyledTextField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/TextField/StyledTextField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/DataTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/DataTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/GraphTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/GraphTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectableTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectableTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/TreeRenderers.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeRenderers.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/GlobalData/Compiler/CompilersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.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/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/CompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/CompilerOptionsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParametersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParametersMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/DVMParameter/UI/DVMParameterFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/UI/DVMParameterFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosDataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Grid/TableVisualData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Grid/TableVisualData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/UI/MachineFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/UI/MachineFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/UI/MakefilePreviewForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/UI/MakefilePreviewForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModulesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfile/UI/SapforProfileFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfile/UI/SapforProfileFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UI/UserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UI/UserFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FileGraphTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/RulesTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineMenu2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineMenu2.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineTree2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineTree2.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/UI/IncludesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/UI/IncludesMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/UI/IncludesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/UI/IncludesTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/VariantsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/PublishFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PublishFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/SubscribersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubscribersMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/GroupFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/GroupFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/TestFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/TestFields.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/DVMConfiguration/DVMConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.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/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.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/SapforConfiguration/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.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/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ArraysForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FunctionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FunctionsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VariantsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/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" />
@@ -125,11 +295,11 @@
       <recent name="Common.Utils.CommonUtils" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Visual\Syntax" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Windows" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Syntax" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
-      <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" />
     </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="Visual_DVM_2021.Passes.UI" />
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index cac2f353..61b0c727 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -2,8 +2,8 @@ package Common.Database.Tables;
 import Common.CurrentAnchestor;
 import Common.Visual.DataSetFilter;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.DataMenuBar;
-import Common_old.UI.Tables.ColumnFilter;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.ColumnFilter;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Visual.Windows.Dialog.DialogFields;
 import Common.Utils.TextLog;
diff --git a/src/Common/Visual/CommonUI.java b/src/Common/Visual/CommonUI.java
index 691ddc5a..6704d250 100644
--- a/src/Common/Visual/CommonUI.java
+++ b/src/Common/Visual/CommonUI.java
@@ -1,11 +1,9 @@
 package Common.Visual;
 import Common.Database.Tables.DataSet;
-import Common.Mode;
 import Common.Utils.CommonUtils;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Themes.DefaultTheme;
-import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Themes.VisualiserTheme;
-import _VisualDVM.Global;
 
 import javax.swing.*;
 import javax.swing.event.ChangeListener;
diff --git a/src/Common/Visual/ControlWithCurrentForm.java b/src/Common/Visual/ControlWithCurrentForm.java
index 8650df00..6317e459 100644
--- a/src/Common/Visual/ControlWithCurrentForm.java
+++ b/src/Common/Visual/ControlWithCurrentForm.java
@@ -1,6 +1,5 @@
 package Common.Visual;
 import Common.CurrentAnchestor;
-import Common_old.Current;
 
 import java.awt.*;
 public class ControlWithCurrentForm<C extends Component> extends ControlForm<C> {
diff --git a/src/Common_old/UI/List/HyperlinksStyledList.java b/src/Common/Visual/Controls/HyperlinksStyledList.java
similarity index 89%
rename from src/Common_old/UI/List/HyperlinksStyledList.java
rename to src/Common/Visual/Controls/HyperlinksStyledList.java
index 46cecb9a..5fb3e258 100644
--- a/src/Common_old/UI/List/HyperlinksStyledList.java
+++ b/src/Common/Visual/Controls/HyperlinksStyledList.java
@@ -1,4 +1,4 @@
-package Common_old.UI.List;
+package Common.Visual.Controls;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
 public class HyperlinksStyledList extends StyledList {
diff --git a/src/Common_old/UI/List/StyledList.java b/src/Common/Visual/Controls/StyledList.java
similarity index 94%
rename from src/Common_old/UI/List/StyledList.java
rename to src/Common/Visual/Controls/StyledList.java
index a6addf43..1eb0cad6 100644
--- a/src/Common_old/UI/List/StyledList.java
+++ b/src/Common/Visual/Controls/StyledList.java
@@ -1,4 +1,4 @@
-package Common_old.UI.List;
+package Common.Visual.Controls;
 import Common.Visual.CommonUI;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Fonts.VisualiserFonts;
diff --git a/src/Common_old/UI/ProgressBar/StyledProgressBar.java b/src/Common/Visual/Controls/StyledProgressBar.java
similarity index 92%
rename from src/Common_old/UI/ProgressBar/StyledProgressBar.java
rename to src/Common/Visual/Controls/StyledProgressBar.java
index 448bd047..31855931 100644
--- a/src/Common_old/UI/ProgressBar/StyledProgressBar.java
+++ b/src/Common/Visual/Controls/StyledProgressBar.java
@@ -1,4 +1,4 @@
-package Common_old.UI.ProgressBar;
+package Common.Visual.Controls;
 import Common.Visual.CommonUI;
 import Common.Visual.Themes.ThemeElement;
 
diff --git a/src/Common/Visual/Controls/StyledTextComboBox.java b/src/Common/Visual/Controls/StyledTextComboBox.java
index d23b7f4a..2905c2b1 100644
--- a/src/Common/Visual/Controls/StyledTextComboBox.java
+++ b/src/Common/Visual/Controls/StyledTextComboBox.java
@@ -1,5 +1,5 @@
 package Common.Visual.Controls;
-import Common_old.UI.Menus.TextComboBoxMenu;
+import Common.Visual.Menus.TextComboBoxMenu;
 
 import javax.swing.*;
 public class StyledTextComboBox extends JComboBox<String> {
diff --git a/src/Common/Visual/DataControl_OLD.java b/src/Common/Visual/DataControl_OLD.java
index 22dad915..f96ec596 100644
--- a/src/Common/Visual/DataControl_OLD.java
+++ b/src/Common/Visual/DataControl_OLD.java
@@ -1,6 +1,5 @@
 package Common.Visual;
 import Common.CurrentAnchestor;
-import Common_old.Current;
 public interface DataControl_OLD {
     //todo скорее всего устареет.
     default CurrentAnchestor getCurrent() {
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index bf3667b1..ad79670e 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -7,10 +7,10 @@ import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DataSet;
 import Common.Database.Tables.FKBehaviour;
 import Common_old.UI.UI;
-import Common_old.UI.Menus.TableMenu;
-import Common_old.UI.Tables.ColumnInfo;
-import Common_old.UI.Tables.DataTable;
-import Common_old.UI.Tables.Grid.GridAnchestor;
+import Common.Visual.Menus.TableMenu;
+import Common.Visual.Tables.ColumnInfo;
+import Common.Visual.Tables.DataTable;
+import Common.Visual.Tables.Grid.GridAnchestor;
 import GlobalData.Grid.TableVisualData;
 
 import javax.swing.*;
@@ -23,8 +23,8 @@ import java.util.Vector;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static Common_old.UI.Tables.TableEditors.EditorSelect;
-import static Common_old.UI.Tables.TableRenderers.RendererSelect;
+import static Common.Visual.Tables.TableEditors.EditorSelect;
+import static Common.Visual.Tables.TableRenderers.RendererSelect;
 public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
     protected JPanel dataPanel;
     protected DataSet dataSource;
diff --git a/src/Common/Visual/DataMenuBar.java b/src/Common/Visual/Menus/DataMenuBar.java
similarity index 98%
rename from src/Common/Visual/DataMenuBar.java
rename to src/Common/Visual/Menus/DataMenuBar.java
index 5cbc6b58..ca67e043 100644
--- a/src/Common/Visual/DataMenuBar.java
+++ b/src/Common/Visual/Menus/DataMenuBar.java
@@ -1,4 +1,4 @@
-package Common.Visual;
+package Common.Visual.Menus;
 import Common.Database.Tables.DataSet;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Common_old.UI.Menus_2023.VisualiserMenuBar;
diff --git a/src/Common_old/UI/Menus/StyledPopupMenu.java b/src/Common/Visual/Menus/StyledPopupMenu.java
similarity index 97%
rename from src/Common_old/UI/Menus/StyledPopupMenu.java
rename to src/Common/Visual/Menus/StyledPopupMenu.java
index 4078734d..88b1a534 100644
--- a/src/Common_old/UI/Menus/StyledPopupMenu.java
+++ b/src/Common/Visual/Menus/StyledPopupMenu.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus;
+package Common.Visual.Menus;
 import Common.Visual.CommonUI;
 import Common.Visual.Themes.ThemeElement;
 
diff --git a/src/Common_old/UI/Menus/TableMenu.java b/src/Common/Visual/Menus/TableMenu.java
similarity index 89%
rename from src/Common_old/UI/Menus/TableMenu.java
rename to src/Common/Visual/Menus/TableMenu.java
index e2a583e0..4e98299d 100644
--- a/src/Common_old/UI/Menus/TableMenu.java
+++ b/src/Common/Visual/Menus/TableMenu.java
@@ -1,6 +1,8 @@
-package Common_old.UI.Menus;
+package Common.Visual.Menus;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
+import Common.Visual.Menus.StyledPopupMenu;
+import Common.Visual.Menus.VisualiserMenuItem;
 
 import javax.swing.*;
 public class TableMenu extends StyledPopupMenu {
diff --git a/src/Common_old/UI/Menus/TextComboBoxMenu.java b/src/Common/Visual/Menus/TextComboBoxMenu.java
similarity index 92%
rename from src/Common_old/UI/Menus/TextComboBoxMenu.java
rename to src/Common/Visual/Menus/TextComboBoxMenu.java
index be57330d..d080741d 100644
--- a/src/Common_old/UI/Menus/TextComboBoxMenu.java
+++ b/src/Common/Visual/Menus/TextComboBoxMenu.java
@@ -1,6 +1,8 @@
-package Common_old.UI.Menus;
+package Common.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
+import Common.Visual.Menus.StyledPopupMenu;
+import Common.Visual.Menus.VisualiserMenuItem;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/Common_old/UI/Menus/TextEditorMenu.java b/src/Common/Visual/Menus/TextEditorMenu.java
similarity index 96%
rename from src/Common_old/UI/Menus/TextEditorMenu.java
rename to src/Common/Visual/Menus/TextEditorMenu.java
index 26cfc8e2..ccd82341 100644
--- a/src/Common_old/UI/Menus/TextEditorMenu.java
+++ b/src/Common/Visual/Menus/TextEditorMenu.java
@@ -1,5 +1,7 @@
-package Common_old.UI.Menus;
+package Common.Visual.Menus;
 import Common.Utils.CommonUtils;
+import Common.Visual.Menus.StyledPopupMenu;
+import Common.Visual.Menus.VisualiserMenuItem;
 
 import javax.swing.*;
 import javax.swing.text.JTextComponent;
diff --git a/src/Common_old/UI/Menus/VisualiserMenuItem.java b/src/Common/Visual/Menus/VisualiserMenuItem.java
similarity index 95%
rename from src/Common_old/UI/Menus/VisualiserMenuItem.java
rename to src/Common/Visual/Menus/VisualiserMenuItem.java
index e4d0f18c..b6a39cdc 100644
--- a/src/Common_old/UI/Menus/VisualiserMenuItem.java
+++ b/src/Common/Visual/Menus/VisualiserMenuItem.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus;
+package Common.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
diff --git a/src/Common_old/UI/Tables/ColumnFilter.java b/src/Common/Visual/Tables/ColumnFilter.java
similarity index 97%
rename from src/Common_old/UI/Tables/ColumnFilter.java
rename to src/Common/Visual/Tables/ColumnFilter.java
index 7b275b7f..cab422b0 100644
--- a/src/Common_old/UI/Tables/ColumnFilter.java
+++ b/src/Common/Visual/Tables/ColumnFilter.java
@@ -1,7 +1,7 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Database.Tables.DataSet;
 import Common.Utils.CommonUtils;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 
 import javax.swing.*;
 import javax.swing.border.MatteBorder;
diff --git a/src/Common_old/UI/Tables/ColumnInfo.java b/src/Common/Visual/Tables/ColumnInfo.java
similarity index 98%
rename from src/Common_old/UI/Tables/ColumnInfo.java
rename to src/Common/Visual/Tables/ColumnInfo.java
index adaa0015..52fac39b 100644
--- a/src/Common_old/UI/Tables/ColumnInfo.java
+++ b/src/Common/Visual/Tables/ColumnInfo.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.CommonConstants;
 public class ColumnInfo {
     private String Name = "?";
diff --git a/src/Common_old/UI/Tables/ConfigurationAutoRenderer.java b/src/Common/Visual/Tables/ConfigurationAutoRenderer.java
similarity index 90%
rename from src/Common_old/UI/Tables/ConfigurationAutoRenderer.java
rename to src/Common/Visual/Tables/ConfigurationAutoRenderer.java
index 014f0f40..1164f231 100644
--- a/src/Common_old/UI/Tables/ConfigurationAutoRenderer.java
+++ b/src/Common/Visual/Tables/ConfigurationAutoRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import TestingSystem.Common.Configuration.Configuration;
 public class ConfigurationAutoRenderer extends DBObjectRenderer {
     @Override
diff --git a/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java b/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java
similarity index 97%
rename from src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java
rename to src/Common/Visual/Tables/ConfigurationAutoSwitcher.java
index d8d38782..3ae7aa0f 100644
--- a/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java
+++ b/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import _VisualDVM.Global;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import TestingSystem.Common.Configuration.Configuration;
diff --git a/src/Common_old/UI/Tables/DBObjectEditor.java b/src/Common/Visual/Tables/DBObjectEditor.java
similarity index 99%
rename from src/Common_old/UI/Tables/DBObjectEditor.java
rename to src/Common/Visual/Tables/DBObjectEditor.java
index 41db0d4e..5bff3346 100644
--- a/src/Common_old/UI/Tables/DBObjectEditor.java
+++ b/src/Common/Visual/Tables/DBObjectEditor.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Database.Objects.DBObject;
 import Common.Visual.DataControl;
 
diff --git a/src/Common_old/UI/Tables/DBObjectRenderer.java b/src/Common/Visual/Tables/DBObjectRenderer.java
similarity index 91%
rename from src/Common_old/UI/Tables/DBObjectRenderer.java
rename to src/Common/Visual/Tables/DBObjectRenderer.java
index 1be4a23a..8a3fc9ad 100644
--- a/src/Common_old/UI/Tables/DBObjectRenderer.java
+++ b/src/Common/Visual/Tables/DBObjectRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Database.Objects.DBObject;
 import Common.Visual.DataControl;
 
diff --git a/src/Common_old/UI/Tables/DBObjectSelectionRenderer.java b/src/Common/Visual/Tables/DBObjectSelectionRenderer.java
similarity index 90%
rename from src/Common_old/UI/Tables/DBObjectSelectionRenderer.java
rename to src/Common/Visual/Tables/DBObjectSelectionRenderer.java
index fc78da2f..69764f93 100644
--- a/src/Common_old/UI/Tables/DBObjectSelectionRenderer.java
+++ b/src/Common/Visual/Tables/DBObjectSelectionRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 public class DBObjectSelectionRenderer extends DBObjectRenderer {
     /*
     @Override
diff --git a/src/Common_old/UI/Tables/DBObjectSelector.java b/src/Common/Visual/Tables/DBObjectSelector.java
similarity index 91%
rename from src/Common_old/UI/Tables/DBObjectSelector.java
rename to src/Common/Visual/Tables/DBObjectSelector.java
index 589d680f..a23aa632 100644
--- a/src/Common_old/UI/Tables/DBObjectSelector.java
+++ b/src/Common/Visual/Tables/DBObjectSelector.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Database.Objects.DBObject;
 public class DBObjectSelector<T extends DBObject> extends DBObjectEditor<T> {
     @Override
diff --git a/src/Common_old/UI/Tables/DataTable.java b/src/Common/Visual/Tables/DataTable.java
similarity index 98%
rename from src/Common_old/UI/Tables/DataTable.java
rename to src/Common/Visual/Tables/DataTable.java
index 69f5deb6..2e7e675b 100644
--- a/src/Common_old/UI/Tables/DataTable.java
+++ b/src/Common/Visual/Tables/DataTable.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Database.Objects.DBObject;
 import Common.Visual.DataControl;
 
diff --git a/src/Common_old/UI/Tables/DateRenderer_.java b/src/Common/Visual/Tables/DateRenderer_.java
similarity index 95%
rename from src/Common_old/UI/Tables/DateRenderer_.java
rename to src/Common/Visual/Tables/DateRenderer_.java
index fd638503..288fa70b 100644
--- a/src/Common_old/UI/Tables/DateRenderer_.java
+++ b/src/Common/Visual/Tables/DateRenderer_.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Utils.CommonUtils;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Tables/EditableHeaderRenderer.java b/src/Common/Visual/Tables/EditableHeaderRenderer.java
similarity index 99%
rename from src/Common_old/UI/Tables/EditableHeaderRenderer.java
rename to src/Common/Visual/Tables/EditableHeaderRenderer.java
index 1a314732..5930560a 100644
--- a/src/Common_old/UI/Tables/EditableHeaderRenderer.java
+++ b/src/Common/Visual/Tables/EditableHeaderRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import javax.swing.*;
 import javax.swing.table.JTableHeader;
 import javax.swing.table.TableCellRenderer;
diff --git a/src/Common_old/UI/Tables/EditorCell.java b/src/Common/Visual/Tables/EditorCell.java
similarity index 85%
rename from src/Common_old/UI/Tables/EditorCell.java
rename to src/Common/Visual/Tables/EditorCell.java
index 6fb70732..7f15bad9 100644
--- a/src/Common_old/UI/Tables/EditorCell.java
+++ b/src/Common/Visual/Tables/EditorCell.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import java.awt.*;
 public class EditorCell extends StyledCellLabel {
     public EditorCell() {
diff --git a/src/Common_old/UI/Tables/Grid/GridAnchestor.java b/src/Common/Visual/Tables/Grid/GridAnchestor.java
similarity index 96%
rename from src/Common_old/UI/Tables/Grid/GridAnchestor.java
rename to src/Common/Visual/Tables/Grid/GridAnchestor.java
index 8ccdcf85..996b0e82 100644
--- a/src/Common_old/UI/Tables/Grid/GridAnchestor.java
+++ b/src/Common/Visual/Tables/Grid/GridAnchestor.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables.Grid;
+package Common.Visual.Tables.Grid;
 import javax.swing.table.AbstractTableModel;
 import java.util.Collection;
 import java.util.Vector;
diff --git a/src/Common_old/UI/Tables/HiddenListRenderer.java b/src/Common/Visual/Tables/HiddenListRenderer.java
similarity index 94%
rename from src/Common_old/UI/Tables/HiddenListRenderer.java
rename to src/Common/Visual/Tables/HiddenListRenderer.java
index f84e317c..97aeb039 100644
--- a/src/Common_old/UI/Tables/HiddenListRenderer.java
+++ b/src/Common/Visual/Tables/HiddenListRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
 
diff --git a/src/Common_old/UI/Tables/HyperlinksRenderer.java b/src/Common/Visual/Tables/HyperlinksRenderer.java
similarity index 86%
rename from src/Common_old/UI/Tables/HyperlinksRenderer.java
rename to src/Common/Visual/Tables/HyperlinksRenderer.java
index 7c88e224..ce9360b9 100644
--- a/src/Common_old/UI/Tables/HyperlinksRenderer.java
+++ b/src/Common/Visual/Tables/HyperlinksRenderer.java
@@ -1,5 +1,5 @@
-package Common_old.UI.Tables;
-import Common_old.UI.List.HyperlinksStyledList;
+package Common.Visual.Tables;
+import Common.Visual.Controls.HyperlinksStyledList;
 
 import javax.swing.*;
 import javax.swing.table.TableCellRenderer;
diff --git a/src/Common_old/UI/Tables/MaskedIntegerValueRenderer.java b/src/Common/Visual/Tables/MaskedIntegerValueRenderer.java
similarity index 94%
rename from src/Common_old/UI/Tables/MaskedIntegerValueRenderer.java
rename to src/Common/Visual/Tables/MaskedIntegerValueRenderer.java
index f53d3c5d..fb5de590 100644
--- a/src/Common_old/UI/Tables/MaskedIntegerValueRenderer.java
+++ b/src/Common/Visual/Tables/MaskedIntegerValueRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import javax.swing.*;
 public class MaskedIntegerValueRenderer extends RendererCell<Long> {
     @Override
diff --git a/src/Common_old/UI/Tables/MultilineRenderer.java b/src/Common/Visual/Tables/MultilineRenderer.java
similarity index 87%
rename from src/Common_old/UI/Tables/MultilineRenderer.java
rename to src/Common/Visual/Tables/MultilineRenderer.java
index 9d8f1127..c272efe6 100644
--- a/src/Common_old/UI/Tables/MultilineRenderer.java
+++ b/src/Common/Visual/Tables/MultilineRenderer.java
@@ -1,5 +1,5 @@
-package Common_old.UI.Tables;
-import Common_old.UI.List.StyledList;
+package Common.Visual.Tables;
+import Common.Visual.Controls.StyledList;
 
 import javax.swing.*;
 import javax.swing.table.TableCellRenderer;
diff --git a/src/Common_old/UI/Tables/ProgressBarRenderer.java b/src/Common/Visual/Tables/ProgressBarRenderer.java
similarity index 85%
rename from src/Common_old/UI/Tables/ProgressBarRenderer.java
rename to src/Common/Visual/Tables/ProgressBarRenderer.java
index 22fb2b1c..c6c49b21 100644
--- a/src/Common_old/UI/Tables/ProgressBarRenderer.java
+++ b/src/Common/Visual/Tables/ProgressBarRenderer.java
@@ -1,5 +1,5 @@
-package Common_old.UI.Tables;
-import Common_old.UI.ProgressBar.StyledProgressBar;
+package Common.Visual.Tables;
+import Common.Visual.Controls.StyledProgressBar;
 
 import javax.swing.*;
 import javax.swing.table.TableCellRenderer;
diff --git a/src/Common_old/UI/Tables/RendererCell.java b/src/Common/Visual/Tables/RendererCell.java
similarity index 96%
rename from src/Common_old/UI/Tables/RendererCell.java
rename to src/Common/Visual/Tables/RendererCell.java
index 4d4e59ce..561070c6 100644
--- a/src/Common_old/UI/Tables/RendererCell.java
+++ b/src/Common/Visual/Tables/RendererCell.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import javax.swing.*;
 import javax.swing.table.TableCellRenderer;
 import java.awt.*;
diff --git a/src/Common_old/UI/Tables/StatusEnumRenderer.java b/src/Common/Visual/Tables/StatusEnumRenderer.java
similarity index 94%
rename from src/Common_old/UI/Tables/StatusEnumRenderer.java
rename to src/Common/Visual/Tables/StatusEnumRenderer.java
index ff1ae225..f59ef8fc 100644
--- a/src/Common_old/UI/Tables/StatusEnumRenderer.java
+++ b/src/Common/Visual/Tables/StatusEnumRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Visual.CommonUI;
 import Common.Visual.StatusEnum;
 
diff --git a/src/Common_old/UI/Tables/StyledCellLabel.java b/src/Common/Visual/Tables/StyledCellLabel.java
similarity index 96%
rename from src/Common_old/UI/Tables/StyledCellLabel.java
rename to src/Common/Visual/Tables/StyledCellLabel.java
index b5fd30da..4973dd55 100644
--- a/src/Common_old/UI/Tables/StyledCellLabel.java
+++ b/src/Common/Visual/Tables/StyledCellLabel.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Visual.CommonUI;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Fonts.VisualiserFonts;
diff --git a/src/Common_old/UI/Tables/StyledTable.java b/src/Common/Visual/Tables/StyledTable.java
similarity index 98%
rename from src/Common_old/UI/Tables/StyledTable.java
rename to src/Common/Visual/Tables/StyledTable.java
index e2f06704..74cc32af 100644
--- a/src/Common_old/UI/Tables/StyledTable.java
+++ b/src/Common/Visual/Tables/StyledTable.java
@@ -1,6 +1,6 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Visual.CommonUI;
-import Common_old.UI.Menus.TableMenu;
+import Common.Visual.Menus.TableMenu;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Fonts.VisualiserFonts;
 
diff --git a/src/Common_old/UI/Tables/TableEditors.java b/src/Common/Visual/Tables/TableEditors.java
similarity index 87%
rename from src/Common_old/UI/Tables/TableEditors.java
rename to src/Common/Visual/Tables/TableEditors.java
index 4f0bdf0f..ea1878cd 100644
--- a/src/Common_old/UI/Tables/TableEditors.java
+++ b/src/Common/Visual/Tables/TableEditors.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 public enum TableEditors {
     EditorDefault,
     EditorSelect,
diff --git a/src/Common_old/UI/Tables/TableRenderers.java b/src/Common/Visual/Tables/TableRenderers.java
similarity index 94%
rename from src/Common_old/UI/Tables/TableRenderers.java
rename to src/Common/Visual/Tables/TableRenderers.java
index 7ac47782..19cd07ce 100644
--- a/src/Common_old/UI/Tables/TableRenderers.java
+++ b/src/Common/Visual/Tables/TableRenderers.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 public enum TableRenderers {
     RendererDefault,
     RendererDate,
diff --git a/src/Common_old/UI/Tables/TopLeftRenderer.java b/src/Common/Visual/Tables/TopLeftRenderer.java
similarity index 91%
rename from src/Common_old/UI/Tables/TopLeftRenderer.java
rename to src/Common/Visual/Tables/TopLeftRenderer.java
index a4412c23..3537d18e 100644
--- a/src/Common_old/UI/Tables/TopLeftRenderer.java
+++ b/src/Common/Visual/Tables/TopLeftRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import javax.swing.*;
 public class TopLeftRenderer extends RendererCell {
     @Override
diff --git a/src/Common_old/UI/Tables/VectorEditor.java b/src/Common/Visual/Tables/VectorEditor.java
similarity index 99%
rename from src/Common_old/UI/Tables/VectorEditor.java
rename to src/Common/Visual/Tables/VectorEditor.java
index fa685b39..6dd549ad 100644
--- a/src/Common_old/UI/Tables/VectorEditor.java
+++ b/src/Common/Visual/Tables/VectorEditor.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import ProjectData.Files.UI.FilesHyperlinksPanel;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Tables/WrapTextRenderer.java b/src/Common/Visual/Tables/WrapTextRenderer.java
similarity index 97%
rename from src/Common_old/UI/Tables/WrapTextRenderer.java
rename to src/Common/Visual/Tables/WrapTextRenderer.java
index d55f252a..6247b30d 100644
--- a/src/Common_old/UI/Tables/WrapTextRenderer.java
+++ b/src/Common/Visual/Tables/WrapTextRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Tables;
+package Common.Visual.Tables;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
 
diff --git a/src/Common_old/UI/TextArea/StyledTextArea.java b/src/Common/Visual/TextArea/StyledTextArea.java
similarity index 68%
rename from src/Common_old/UI/TextArea/StyledTextArea.java
rename to src/Common/Visual/TextArea/StyledTextArea.java
index c158cb2b..c2bbffae 100644
--- a/src/Common_old/UI/TextArea/StyledTextArea.java
+++ b/src/Common/Visual/TextArea/StyledTextArea.java
@@ -1,5 +1,5 @@
-package Common_old.UI.TextArea;
-import Common_old.UI.Menus.TextEditorMenu;
+package Common.Visual.TextArea;
+import Common.Visual.Menus.TextEditorMenu;
 
 import javax.swing.*;
 public class StyledTextArea extends JTextArea {
diff --git a/src/Common_old/UI/TextField/StyledPasswordField.java b/src/Common/Visual/TextField/StyledPasswordField.java
similarity index 64%
rename from src/Common_old/UI/TextField/StyledPasswordField.java
rename to src/Common/Visual/TextField/StyledPasswordField.java
index 25c61911..62ff2622 100644
--- a/src/Common_old/UI/TextField/StyledPasswordField.java
+++ b/src/Common/Visual/TextField/StyledPasswordField.java
@@ -1,6 +1,6 @@
-package Common_old.UI.TextField;
-import Common_old.UI.Menus.StyledPopupMenu;
-import Common_old.UI.Menus.TextEditorMenu;
+package Common.Visual.TextField;
+import Common.Visual.Menus.StyledPopupMenu;
+import Common.Visual.Menus.TextEditorMenu;
 
 import javax.swing.*;
 public class StyledPasswordField extends JPasswordField {
diff --git a/src/Common_old/UI/TextField/StyledTextField.java b/src/Common/Visual/TextField/StyledTextField.java
similarity index 62%
rename from src/Common_old/UI/TextField/StyledTextField.java
rename to src/Common/Visual/TextField/StyledTextField.java
index d6d6d11e..98ca447f 100644
--- a/src/Common_old/UI/TextField/StyledTextField.java
+++ b/src/Common/Visual/TextField/StyledTextField.java
@@ -1,6 +1,6 @@
-package Common_old.UI.TextField;
-import Common_old.UI.Menus.StyledPopupMenu;
-import Common_old.UI.Menus.TextEditorMenu;
+package Common.Visual.TextField;
+import Common.Visual.Menus.StyledPopupMenu;
+import Common.Visual.Menus.TextEditorMenu;
 
 import javax.swing.*;
 public class StyledTextField extends JTextField {
diff --git a/src/Common_old/UI/Trees/DataTree.java b/src/Common/Visual/Trees/DataTree.java
similarity index 95%
rename from src/Common_old/UI/Trees/DataTree.java
rename to src/Common/Visual/Trees/DataTree.java
index 5c42b851..a5cb71c6 100644
--- a/src/Common_old/UI/Trees/DataTree.java
+++ b/src/Common/Visual/Trees/DataTree.java
@@ -1,7 +1,6 @@
-package Common_old.UI.Trees;
+package Common.Visual.Trees;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
 import Common.Visual.DataControl_OLD;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/Common_old/UI/Trees/GraphTreeCellRenderer.java b/src/Common/Visual/Trees/GraphTreeCellRenderer.java
similarity index 97%
rename from src/Common_old/UI/Trees/GraphTreeCellRenderer.java
rename to src/Common/Visual/Trees/GraphTreeCellRenderer.java
index cc799c48..64b3ece0 100644
--- a/src/Common_old/UI/Trees/GraphTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/GraphTreeCellRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Trees;
+package Common.Visual.Trees;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
diff --git a/src/Common_old/UI/Trees/SelectableTree.java b/src/Common/Visual/Trees/SelectableTree.java
similarity index 90%
rename from src/Common_old/UI/Trees/SelectableTree.java
rename to src/Common/Visual/Trees/SelectableTree.java
index e996f0fa..fa21b33c 100644
--- a/src/Common_old/UI/Trees/SelectableTree.java
+++ b/src/Common/Visual/Trees/SelectableTree.java
@@ -1,6 +1,5 @@
-package Common_old.UI.Trees;
+package Common.Visual.Trees;
 import Common.CurrentAnchestor;
-import Common_old.Current;
 import Common.Visual.Selectable;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java b/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
similarity index 97%
rename from src/Common_old/UI/Trees/SelectionTreeCellRenderer.java
rename to src/Common/Visual/Trees/SelectionTreeCellRenderer.java
index 25d2421e..0e03f2d3 100644
--- a/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Trees;
+package Common.Visual.Trees;
 import Common.Visual.CommonUI;
 import Common.Visual.Selectable;
 import Common.Visual.Fonts.VisualiserFonts;
diff --git a/src/Common_old/UI/Trees/StyledTree.java b/src/Common/Visual/Trees/StyledTree.java
similarity index 99%
rename from src/Common_old/UI/Trees/StyledTree.java
rename to src/Common/Visual/Trees/StyledTree.java
index 179945e9..cd6d9550 100644
--- a/src/Common_old/UI/Trees/StyledTree.java
+++ b/src/Common/Visual/Trees/StyledTree.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Trees;
+package Common.Visual.Trees;
 import Common.Visual.CommonUI;
 import Common_old.UI.Menus.GraphMenu;
 import Common.Visual.Themes.ThemeElement;
diff --git a/src/Common_old/UI/Trees/StyledTreeCellRenderer.java b/src/Common/Visual/Trees/StyledTreeCellRenderer.java
similarity index 94%
rename from src/Common_old/UI/Trees/StyledTreeCellRenderer.java
rename to src/Common/Visual/Trees/StyledTreeCellRenderer.java
index d291d6e6..1f043684 100644
--- a/src/Common_old/UI/Trees/StyledTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/StyledTreeCellRenderer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Trees;
+package Common.Visual.Trees;
 import Common.Visual.CommonUI;
 import Common.Visual.Themes.ThemeElement;
 
diff --git a/src/Common_old/UI/Trees/TreeForm.java b/src/Common/Visual/Trees/TreeForm.java
similarity index 96%
rename from src/Common_old/UI/Trees/TreeForm.java
rename to src/Common/Visual/Trees/TreeForm.java
index 4617cf82..d3fbbe96 100644
--- a/src/Common_old/UI/Trees/TreeForm.java
+++ b/src/Common/Visual/Trees/TreeForm.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Trees;
+package Common.Visual.Trees;
 import Common.Visual.CommonUI;
 import Common.Visual.ControlForm;
 
diff --git a/src/Common_old/UI/Trees/TreeRenderers.java b/src/Common/Visual/Trees/TreeRenderers.java
similarity index 89%
rename from src/Common_old/UI/Trees/TreeRenderers.java
rename to src/Common/Visual/Trees/TreeRenderers.java
index 3ff03211..098a470c 100644
--- a/src/Common_old/UI/Trees/TreeRenderers.java
+++ b/src/Common/Visual/Trees/TreeRenderers.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Trees;
+package Common.Visual.Trees;
 public enum TreeRenderers {
     RendererUndefined,
     //-
diff --git a/src/Common/Visual/Windows/Dialog/DialogTextField.java b/src/Common/Visual/Windows/Dialog/DialogTextField.java
index 2905aee0..68b78414 100644
--- a/src/Common/Visual/Windows/Dialog/DialogTextField.java
+++ b/src/Common/Visual/Windows/Dialog/DialogTextField.java
@@ -1,5 +1,5 @@
 package Common.Visual.Windows.Dialog;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 
 import java.awt.*;
 public class DialogTextField extends StyledTextField implements DialogFields {
diff --git a/src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java b/src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java
index 6f6c4b71..5783341b 100644
--- a/src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java
+++ b/src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java
@@ -1,5 +1,5 @@
 package Common.Visual.Windows.Dialog.Text;
-import Common_old.UI.Editor.BaseEditor;
+import _VisualDVM.Visual.Editor.BaseEditor;
 public class MultilineTextForm extends TextDialog<BaseEditor> {
     public MultilineTextForm() {
         super(BaseEditor.class);
diff --git a/src/Common_old/UI/Menus/AttachementsMenu.java b/src/Common_old/UI/Menus/AttachementsMenu.java
index b4685c4b..a2fafd76 100644
--- a/src/Common_old/UI/Menus/AttachementsMenu.java
+++ b/src/Common_old/UI/Menus/AttachementsMenu.java
@@ -1,5 +1,7 @@
 package Common_old.UI.Menus;
 import Common.Utils.CommonUtils;
+import Common.Visual.Menus.StyledPopupMenu;
+import Common.Visual.Menus.VisualiserMenuItem;
 import Common_old.Current;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Common_old/UI/Menus/FileStyleMenu.java b/src/Common_old/UI/Menus/FileStyleMenu.java
index 4bdf9217..622e5863 100644
--- a/src/Common_old/UI/Menus/FileStyleMenu.java
+++ b/src/Common_old/UI/Menus/FileStyleMenu.java
@@ -1,4 +1,6 @@
 package Common_old.UI.Menus;
+import Common.Visual.Menus.StyledPopupMenu;
+import Common.Visual.Menus.VisualiserMenuItem;
 import Common_old.Current;
 import ProjectData.Files.LanguageStyle;
 
diff --git a/src/Common_old/UI/Menus/GraphMenu.java b/src/Common_old/UI/Menus/GraphMenu.java
index f9f8b470..b81c411f 100644
--- a/src/Common_old/UI/Menus/GraphMenu.java
+++ b/src/Common_old/UI/Menus/GraphMenu.java
@@ -1,5 +1,7 @@
 package Common_old.UI.Menus;
-import Common_old.UI.Trees.StyledTree;
+import Common.Visual.Menus.StyledPopupMenu;
+import Common.Visual.Menus.VisualiserMenuItem;
+import Common.Visual.Trees.StyledTree;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/Common_old/UI/Menus/MainEditorMenu.java b/src/Common_old/UI/Menus/MainEditorMenu.java
index dde06b26..63d053ef 100644
--- a/src/Common_old/UI/Menus/MainEditorMenu.java
+++ b/src/Common_old/UI/Menus/MainEditorMenu.java
@@ -1,7 +1,9 @@
 package Common_old.UI.Menus;
 import Common.Utils.CommonUtils;
+import Common.Visual.Menus.TextEditorMenu;
+import Common.Visual.Menus.VisualiserMenuItem;
 import Common_old.Current;
-import Common_old.UI.Editor.CaretInfo;
+import _VisualDVM.Visual.Editor.CaretInfo;
 import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.UI.Editor.SPFEditor;
diff --git a/src/Common_old/UI/Menus/ProjectFilesMenu.java b/src/Common_old/UI/Menus/ProjectFilesMenu.java
index aa8846b2..cdd41fe7 100644
--- a/src/Common_old/UI/Menus/ProjectFilesMenu.java
+++ b/src/Common_old/UI/Menus/ProjectFilesMenu.java
@@ -1,12 +1,13 @@
 package Common_old.UI.Menus;
 import Common.Utils.CommonUtils;
+import Common.Visual.Menus.VisualiserMenuItem;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.LanguagesSubmenu;
 import Common_old.UI.Menus_2023.StableMenuItem;
 import Common_old.UI.Menus_2023.StylesSubmenu;
 import Common_old.UI.Menus_2023.TypesSubmenu;
-import Common_old.UI.Trees.StyledTree;
+import Common.Visual.Trees.StyledTree;
 import Common_old.UI.UI;
 import ProjectData.Files.FileType;
 import ProjectData.Files.LanguageStyle;
diff --git a/src/Common_old/UI/Menus/SelectionTreeMenu.java b/src/Common_old/UI/Menus/SelectionTreeMenu.java
index a208e65e..5a54c62e 100644
--- a/src/Common_old/UI/Menus/SelectionTreeMenu.java
+++ b/src/Common_old/UI/Menus/SelectionTreeMenu.java
@@ -1,11 +1,11 @@
 package Common_old.UI.Menus;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import Common.Visual.Menus.VisualiserMenuItem;
 import Common_old.UI.Menus_2023.StableMenuItem;
 import Common.Visual.Selectable;
-import Common_old.UI.Trees.DataTree;
-import Common_old.UI.Trees.SelectableTree;
+import Common.Visual.Trees.DataTree;
+import Common.Visual.Trees.SelectableTree;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/Common_old/UI/Menus/TestsCompilationFilterMenu.java b/src/Common_old/UI/Menus/TestsCompilationFilterMenu.java
index bcc86770..76273f7c 100644
--- a/src/Common_old/UI/Menus/TestsCompilationFilterMenu.java
+++ b/src/Common_old/UI/Menus/TestsCompilationFilterMenu.java
@@ -1,9 +1,11 @@
 package Common_old.UI.Menus;
+import Common.Visual.Menus.StyledPopupMenu;
+import Common.Visual.Menus.VisualiserMenuItem;
 import GlobalData.Tasks.TaskState;
 
 import javax.swing.*;
 import java.awt.event.ActionListener;
-public class TestsCompilationFilterMenu extends StyledPopupMenu{
+public class TestsCompilationFilterMenu extends StyledPopupMenu {
     public void CreateStateItem(TaskState state, ActionListener listener){
         JMenuItem m = new VisualiserMenuItem(state.getDescription());
         m.addActionListener(listener);
diff --git a/src/Common_old/UI/Menus/VersionsMenu.java b/src/Common_old/UI/Menus/VersionsMenu.java
index 1b265b6a..81353261 100644
--- a/src/Common_old/UI/Menus/VersionsMenu.java
+++ b/src/Common_old/UI/Menus/VersionsMenu.java
@@ -1,9 +1,10 @@
 package Common_old.UI.Menus;
 import Common.Utils.CommonUtils;
+import Common.Visual.Menus.VisualiserMenuItem;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.StableMenuItem;
-import Common_old.UI.Trees.DataTree;
+import Common.Visual.Trees.DataTree;
 import Common_old.UI.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java b/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java
index 53213a29..3c5473d4 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java
+++ b/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Menus_2023.MainMenuBar;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Menus.VisualiserMenuItem;
+import Common.Visual.Menus.VisualiserMenuItem;
 import Common_old.UI.Menus_2023.VisualiserMenu;
 import GlobalData.DBLastProject.DBLastProject;
 import GlobalData.GlobalDatabase;
diff --git a/src/Common_old/UI/Menus_2023/PassMenuItem.java b/src/Common_old/UI/Menus_2023/PassMenuItem.java
index c51d8992..0190be39 100644
--- a/src/Common_old/UI/Menus_2023/PassMenuItem.java
+++ b/src/Common_old/UI/Menus_2023/PassMenuItem.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Menus_2023;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Menus.VisualiserMenuItem;
+import Common.Visual.Menus.VisualiserMenuItem;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class PassMenuItem extends VisualiserMenuItem implements PassControl {
     @Override
diff --git a/src/Common_old/UI/Menus_2023/StableMenuItem.java b/src/Common_old/UI/Menus_2023/StableMenuItem.java
index 5e4dd44f..658a1bce 100644
--- a/src/Common_old/UI/Menus_2023/StableMenuItem.java
+++ b/src/Common_old/UI/Menus_2023/StableMenuItem.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Menus_2023;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Menus.VisualiserMenuItem;
+import Common.Visual.Menus.VisualiserMenuItem;
 import Common_old.UI.UI;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java b/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
index 96270623..5514b6e0 100644
--- a/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
+++ b/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
@@ -1,5 +1,5 @@
 package Common_old.UI.Menus_2023.VariantsMenuBar;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class VariantsMenuBar extends DataMenuBar {
     public VariantsMenuBar() {
diff --git a/src/Common_old/UI/UI.java b/src/Common_old/UI/UI.java
index ff48704d..52ffad80 100644
--- a/src/Common_old/UI/UI.java
+++ b/src/Common_old/UI/UI.java
@@ -2,7 +2,7 @@ package Common_old.UI;
 import Common.Database.Tables.DataSet;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.CredentialsBar.CredentialsBar;
 import Common_old.UI.Menus_2023.FastAccessMenuBar.FastAccessMenuBar;
@@ -11,9 +11,9 @@ import Common_old.UI.Menus_2023.MainMenuBar.MainMenuBar;
 import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
 import Common_old.UI.Menus_2023.VariantsMenuBar.VariantsMenuBar;
 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 Common.Visual.Tables.*;
+import Common.Visual.Trees.GraphTreeCellRenderer;
+import Common.Visual.Trees.SelectionTreeCellRenderer;
 import _VisualDVM.Visual.Windows.SearchReplaceForm;
 import GlobalData.Compiler.CompilersDBTable;
 import GlobalData.Compiler.CompilersMenuBar;
@@ -101,9 +101,9 @@ import javax.swing.tree.TreeCellRenderer;
 import java.awt.*;
 import java.util.LinkedHashMap;
 
-import static Common_old.UI.Tables.TableEditors.*;
-import static Common_old.UI.Tables.TableRenderers.*;
-import static Common_old.UI.Trees.TreeRenderers.*;
+import static Common.Visual.Tables.TableEditors.*;
+import static Common.Visual.Tables.TableRenderers.*;
+import static Common.Visual.Trees.TreeRenderers.*;
 public class UI {
     public static MenuElement[] last_menu_path;
     public static MainMenuBar mainMenuBar = null;
@@ -123,9 +123,9 @@ public class UI {
     //------------
     public static final Highlighter.HighlightPainter GoodLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
     public static final Highlighter.HighlightPainter BadLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
-    public static LinkedHashMap<Common_old.UI.Tables.TableRenderers, TableCellRenderer> TableRenderers = new LinkedHashMap<>();
-    public static LinkedHashMap<Common_old.UI.Tables.TableEditors, TableCellEditor> TableEditors = new LinkedHashMap<>();
-    public static LinkedHashMap<Common_old.UI.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>();
+    public static LinkedHashMap<Common.Visual.Tables.TableRenderers, TableCellRenderer> TableRenderers = new LinkedHashMap<>();
+    public static LinkedHashMap<Common.Visual.Tables.TableEditors, TableCellEditor> TableEditors = new LinkedHashMap<>();
+    public static LinkedHashMap<Common.Visual.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>();
     public static boolean HasMainWindow() {
         return mainWindow != null;
     }
diff --git a/src/GlobalData/Compiler/CompilersMenuBar.java b/src/GlobalData/Compiler/CompilersMenuBar.java
index 92f2566d..ca590f97 100644
--- a/src/GlobalData/Compiler/CompilersMenuBar.java
+++ b/src/GlobalData/Compiler/CompilersMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.Compiler;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class CompilersMenuBar extends DataMenuBar {
     public CompilersMenuBar() {
diff --git a/src/GlobalData/Compiler/UI/CompilerFields.java b/src/GlobalData/Compiler/UI/CompilerFields.java
index a5e0bdd2..7d68d1ca 100644
--- a/src/GlobalData/Compiler/UI/CompilerFields.java
+++ b/src/GlobalData/Compiler/UI/CompilerFields.java
@@ -1,7 +1,7 @@
 package GlobalData.Compiler.UI;
 import Common.Visual.CommonUI;
 import Common_old.Current;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import GlobalData.Compiler.CompilerType;
diff --git a/src/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java b/src/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
index fb5120e8..84713c02 100644
--- a/src/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
+++ b/src/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
@@ -1,10 +1,10 @@
 package GlobalData.CompilerEnvironment;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Tables.TableEditors;
-import Common_old.UI.Tables.TableRenderers;
+import Common.Visual.Tables.TableEditors;
+import Common.Visual.Tables.TableRenderers;
 
-import static Common_old.UI.Tables.TableRenderers.RendererMultiline;
+import static Common.Visual.Tables.TableRenderers.RendererMultiline;
 public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
     public CompilerEnvironmentsSet() {
         super(String.class, CompilerEnvironment.class);
diff --git a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
index 52044dc5..4e0a539c 100644
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
@@ -1,6 +1,6 @@
 package GlobalData.CompilerEnvironment.UI;
 import Common.Visual.CommonUI;
-import Common_old.UI.Tables.DBObjectEditor;
+import Common.Visual.Tables.DBObjectEditor;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
diff --git a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
index fccaa29c..ad4590a8 100644
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
@@ -1,6 +1,6 @@
 package GlobalData.CompilerEnvironment.UI;
 import Common.Visual.CommonUI;
-import Common_old.UI.Tables.DBObjectRenderer;
+import Common.Visual.Tables.DBObjectRenderer;
 import Common.Visual.Fonts.VisualiserFonts;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
 public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
diff --git a/src/GlobalData/CompilerOption/CompilerOptionsSet.java b/src/GlobalData/CompilerOption/CompilerOptionsSet.java
index 760b13ff..8a2ab009 100644
--- a/src/GlobalData/CompilerOption/CompilerOptionsSet.java
+++ b/src/GlobalData/CompilerOption/CompilerOptionsSet.java
@@ -1,10 +1,10 @@
 package GlobalData.CompilerOption;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Tables.TableEditors;
-import Common_old.UI.Tables.TableRenderers;
+import Common.Visual.Tables.TableEditors;
+import Common.Visual.Tables.TableRenderers;
 
-import static Common_old.UI.Tables.TableRenderers.RendererMultiline;
+import static Common.Visual.Tables.TableRenderers.RendererMultiline;
 public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
     public CompilerOptionsSet() {
         super(String.class, CompilerOption.class);
diff --git a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
index 9b624ae6..7a59670b 100644
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
@@ -1,6 +1,6 @@
 package GlobalData.CompilerOption.UI;
 import Common.Visual.CommonUI;
-import Common_old.UI.Tables.DBObjectRenderer;
+import Common.Visual.Tables.DBObjectRenderer;
 import Common.Visual.Fonts.VisualiserFonts;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
diff --git a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
index 071ad873..a0464565 100644
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
@@ -1,6 +1,6 @@
 package GlobalData.CompilerOption.UI;
 import Common.Visual.CommonUI;
-import Common_old.UI.Tables.DBObjectEditor;
+import Common.Visual.Tables.DBObjectEditor;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import GlobalData.CompilerOption.CompilerOption;
diff --git a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
index 035eb898..75fafd27 100644
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
@@ -1,6 +1,6 @@
 package GlobalData.CompilerOption.UI;
 import Common.Visual.CommonUI;
-import Common_old.UI.Tables.DBObjectRenderer;
+import Common.Visual.Tables.DBObjectRenderer;
 import Common.Visual.Fonts.VisualiserFonts;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
diff --git a/src/GlobalData/DVMParameter/DVMParametersMenuBar.java b/src/GlobalData/DVMParameter/DVMParametersMenuBar.java
index b99a6ba1..127a4b2d 100644
--- a/src/GlobalData/DVMParameter/DVMParametersMenuBar.java
+++ b/src/GlobalData/DVMParameter/DVMParametersMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.DVMParameter;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMParametersMenuBar extends DataMenuBar {
     public DVMParametersMenuBar() {
diff --git a/src/GlobalData/DVMParameter/UI/DVMParameterFields.java b/src/GlobalData/DVMParameter/UI/DVMParameterFields.java
index 9f3e7ddf..a4176ad4 100644
--- a/src/GlobalData/DVMParameter/UI/DVMParameterFields.java
+++ b/src/GlobalData/DVMParameter/UI/DVMParameterFields.java
@@ -1,6 +1,6 @@
 package GlobalData.DVMParameter.UI;
 import Common.Visual.Controls.StyledTextComboBox;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java b/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
index 20f9d586..ab0819ef 100644
--- a/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.EnvironmentValue;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EnvironmentValuesMenuBar extends DataMenuBar {
     public EnvironmentValuesMenuBar() {
diff --git a/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java b/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java
index f28615e3..f94c4243 100644
--- a/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java
+++ b/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java
@@ -1,5 +1,5 @@
 package GlobalData.EnvironmentValue.UI;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/GlobalData/FileObject/DirInfosDataSet.java b/src/GlobalData/FileObject/DirInfosDataSet.java
index 2ffcc56b..3e74cc28 100644
--- a/src/GlobalData/FileObject/DirInfosDataSet.java
+++ b/src/GlobalData/FileObject/DirInfosDataSet.java
@@ -2,7 +2,7 @@ package GlobalData.FileObject;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 
-import static Common_old.UI.Tables.TableRenderers.*;
+import static Common.Visual.Tables.TableRenderers.*;
 public class DirInfosDataSet extends DataSet<String, DirInfo> {
     public DirInfosDataSet() {
         super(String.class, DirInfo.class);
diff --git a/src/GlobalData/Grid/TableVisualData.java b/src/GlobalData/Grid/TableVisualData.java
index e244586a..c178fe77 100644
--- a/src/GlobalData/Grid/TableVisualData.java
+++ b/src/GlobalData/Grid/TableVisualData.java
@@ -1,5 +1,4 @@
 package GlobalData.Grid;
-import Common.CurrentAnchestor;
 import Common.Database.Objects.DBObject;
 import com.sun.org.glassfish.gmbal.Description;
 
diff --git a/src/GlobalData/Machine/MachinesMenuBar.java b/src/GlobalData/Machine/MachinesMenuBar.java
index 84da5faf..ef9384ec 100644
--- a/src/GlobalData/Machine/MachinesMenuBar.java
+++ b/src/GlobalData/Machine/MachinesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.Machine;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/GlobalData/Machine/UI/MachineFields.java b/src/GlobalData/Machine/UI/MachineFields.java
index 2e448b8a..ceba9f75 100644
--- a/src/GlobalData/Machine/UI/MachineFields.java
+++ b/src/GlobalData/Machine/UI/MachineFields.java
@@ -1,5 +1,5 @@
 package GlobalData.Machine.UI;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import GlobalData.Machine.MachineType;
 
diff --git a/src/GlobalData/Makefile/MakefilesMenuBar.java b/src/GlobalData/Makefile/MakefilesMenuBar.java
index 17a990df..24046678 100644
--- a/src/GlobalData/Makefile/MakefilesMenuBar.java
+++ b/src/GlobalData/Makefile/MakefilesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.Makefile;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class MakefilesMenuBar extends DataMenuBar {
     public MakefilesMenuBar() {
diff --git a/src/GlobalData/Makefile/UI/MakefilePreviewForm.java b/src/GlobalData/Makefile/UI/MakefilePreviewForm.java
index ade8abb3..d5b8a8c3 100644
--- a/src/GlobalData/Makefile/UI/MakefilePreviewForm.java
+++ b/src/GlobalData/Makefile/UI/MakefilePreviewForm.java
@@ -1,5 +1,5 @@
 package GlobalData.Makefile.UI;
-import Common_old.UI.Editor.Viewer;
+import _VisualDVM.Visual.Editor.Viewer;
 import Common.Visual.Windows.Dialog.Text.TextDialog;
 public class MakefilePreviewForm extends TextDialog<Viewer> {
     public MakefilePreviewForm() {
diff --git a/src/GlobalData/Module/ModulesMenuBar.java b/src/GlobalData/Module/ModulesMenuBar.java
index 5c21899c..5f161d93 100644
--- a/src/GlobalData/Module/ModulesMenuBar.java
+++ b/src/GlobalData/Module/ModulesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.Module;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class ModulesMenuBar extends DataMenuBar {
     public ModulesMenuBar() {
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java b/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
index d5a9234f..13366057 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
@@ -1,5 +1,5 @@
 package GlobalData.RemoteFile.UI;
-import Common_old.UI.Trees.TreeForm;
+import Common.Visual.Trees.TreeForm;
 import Common_old.UI.UI;
 import Common.Visual.Windows.Dialog.DialogFields;
 
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java b/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
index 4c477178..3ab23fd7 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
@@ -1,7 +1,7 @@
 package GlobalData.RemoteFile.UI;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common_old.UI.Trees.StyledTreeCellRenderer;
+import Common.Visual.Trees.StyledTreeCellRenderer;
 import GlobalData.RemoteFile.RemoteFile;
 
 import javax.swing.*;
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java b/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java
index 59c7e09a..65b6310a 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java
@@ -1,7 +1,7 @@
 package GlobalData.RemoteFile.UI;
 import Common_old.Current;
-import Common_old.UI.Trees.DataTree;
-import Common_old.UI.Trees.TreeRenderers;
+import Common.Visual.Trees.DataTree;
+import Common.Visual.Trees.TreeRenderers;
 import Common_old.UI.UI;
 public class RemoteFilesTree extends DataTree {
     public RemoteFilesTree() {
diff --git a/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java b/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
index 733b2ac5..76884385 100644
--- a/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
+++ b/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.RunConfiguration;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
diff --git a/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java b/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java
index 1bc46ba5..efec77b4 100644
--- a/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java
+++ b/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java
@@ -1,5 +1,5 @@
 package GlobalData.RunConfiguration.UI;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/GlobalData/SapforProfile/UI/SapforProfileFields.java b/src/GlobalData/SapforProfile/UI/SapforProfileFields.java
index e916f280..7ed811fe 100644
--- a/src/GlobalData/SapforProfile/UI/SapforProfileFields.java
+++ b/src/GlobalData/SapforProfile/UI/SapforProfileFields.java
@@ -1,5 +1,5 @@
 package GlobalData.SapforProfile.UI;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
index aa5535cc..d25fc947 100644
--- a/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -1,7 +1,7 @@
 package GlobalData.Tasks.CompilationTask;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Menus.TableMenu;
+import Common.Visual.Menus.TableMenu;
 import Common_old.UI.UI;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
@@ -14,8 +14,8 @@ import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.util.LinkedHashMap;
 
-import static Common_old.UI.Tables.TableRenderers.RendererDate;
-import static Common_old.UI.Tables.TableRenderers.RendererStatusEnum;
+import static Common.Visual.Tables.TableRenderers.RendererDate;
+import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
 public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
     public CompilationTasksDBTable() {
         super(CompilationTask.class);
diff --git a/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
index 1e8b15a7..8962c3fc 100644
--- a/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -2,13 +2,13 @@ package GlobalData.Tasks.RunTask;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Menus.TableMenu;
+import Common.Visual.Menus.TableMenu;
 import Common_old.UI.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
-import static Common_old.UI.Tables.TableRenderers.RendererDate;
-import static Common_old.UI.Tables.TableRenderers.RendererStatusEnum;
+import static Common.Visual.Tables.TableRenderers.RendererDate;
+import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
 public class RunTasksDBTable extends iDBTable<RunTask> {
     public RunTasksDBTable() {
         super(RunTask.class);
diff --git a/src/GlobalData/User/UI/UserFields.java b/src/GlobalData/User/UI/UserFields.java
index ede8d2f0..bc70e60e 100644
--- a/src/GlobalData/User/UI/UserFields.java
+++ b/src/GlobalData/User/UI/UserFields.java
@@ -1,8 +1,8 @@
 package GlobalData.User.UI;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Menus.TextEditorMenu;
-import Common_old.UI.TextField.StyledPasswordField;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.Menus.TextEditorMenu;
+import Common.Visual.TextField.StyledPasswordField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/GlobalData/User/UsersDBTable.java b/src/GlobalData/User/UsersDBTable.java
index 8467ccfe..a713ae79 100644
--- a/src/GlobalData/User/UsersDBTable.java
+++ b/src/GlobalData/User/UsersDBTable.java
@@ -1,7 +1,7 @@
 package GlobalData.User;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Tables.TableRenderers;
+import Common.Visual.Tables.TableRenderers;
 import Common_old.UI.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
diff --git a/src/GlobalData/User/UsersMenuBar.java b/src/GlobalData/User/UsersMenuBar.java
index ad2aa86f..7608213b 100644
--- a/src/GlobalData/User/UsersMenuBar.java
+++ b/src/GlobalData/User/UsersMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.User;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class UsersMenuBar extends DataMenuBar {
     public UsersMenuBar() {
diff --git a/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java b/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
index 3ccf119d..4535a286 100644
--- a/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
+++ b/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
@@ -1,6 +1,6 @@
 package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Editor.CaretInfo;
+import _VisualDVM.Visual.Editor.CaretInfo;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
 import org.fife.ui.autocomplete.BasicCompletion;
diff --git a/src/ProjectData/Files/UI/Editor/SPFEditor.java b/src/ProjectData/Files/UI/Editor/SPFEditor.java
index c24e9653..b21e4698 100644
--- a/src/ProjectData/Files/UI/Editor/SPFEditor.java
+++ b/src/ProjectData/Files/UI/Editor/SPFEditor.java
@@ -3,9 +3,9 @@ import Common.Utils.CommonUtils;
 import Common_old.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.Editor.BaseEditor;
-import Common_old.UI.Editor.CaretInfo;
-import Common_old.UI.Menus.StyledPopupMenu;
+import _VisualDVM.Visual.Editor.BaseEditor;
+import _VisualDVM.Visual.Editor.CaretInfo;
+import Common.Visual.Menus.StyledPopupMenu;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
diff --git a/src/ProjectData/Files/UI/FileGraphTree.java b/src/ProjectData/Files/UI/FileGraphTree.java
index 16c7a13b..84cc0468 100644
--- a/src/ProjectData/Files/UI/FileGraphTree.java
+++ b/src/ProjectData/Files/UI/FileGraphTree.java
@@ -1,8 +1,8 @@
 package ProjectData.Files.UI;
 import Common.CurrentAnchestor;
 import Common_old.Current;
-import Common_old.UI.Trees.DataTree;
-import Common_old.UI.Trees.TreeRenderers;
+import Common.Visual.Trees.DataTree;
+import Common.Visual.Trees.TreeRenderers;
 import ProjectData.SapforData.FileObject;
 import ProjectData.SapforData.FileObjectWithMessages;
 
diff --git a/src/ProjectData/Files/UI/FilesTree.java b/src/ProjectData/Files/UI/FilesTree.java
index 1bc182fd..a8e8dfb6 100644
--- a/src/ProjectData/Files/UI/FilesTree.java
+++ b/src/ProjectData/Files/UI/FilesTree.java
@@ -6,8 +6,8 @@ import Common.Visual.DragDrop.FileDrop;
 import Common_old.UI.Menus.GraphMenu;
 import Common_old.UI.Menus.ProjectFilesMenu;
 import Common_old.UI.UI;
-import Common_old.UI.Trees.StyledTree;
-import Common_old.UI.Trees.TreeRenderers;
+import Common.Visual.Trees.StyledTree;
+import Common.Visual.Trees.TreeRenderers;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/ProjectData/Files/UI/FilesTreeCellRenderer.java b/src/ProjectData/Files/UI/FilesTreeCellRenderer.java
index 44658a5a..b42843bd 100644
--- a/src/ProjectData/Files/UI/FilesTreeCellRenderer.java
+++ b/src/ProjectData/Files/UI/FilesTreeCellRenderer.java
@@ -2,7 +2,7 @@ package ProjectData.Files.UI;
 import Common.Visual.CommonUI;
 import _VisualDVM.Global;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common_old.UI.Trees.StyledTreeCellRenderer;
+import Common.Visual.Trees.StyledTreeCellRenderer;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileState;
 
diff --git a/src/ProjectData/Messages/MessagesDBTable.java b/src/ProjectData/Messages/MessagesDBTable.java
index 00802b27..2f2694d6 100644
--- a/src/ProjectData/Messages/MessagesDBTable.java
+++ b/src/ProjectData/Messages/MessagesDBTable.java
@@ -3,8 +3,8 @@ import Common_old.Current;
 import Common.Database.Tables.DataSet;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Tables.ColumnFilter;
-import Common_old.UI.Tables.TableRenderers;
+import Common.Visual.Tables.ColumnFilter;
+import Common.Visual.Tables.TableRenderers;
 
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
diff --git a/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java b/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
index f3fc314c..2c1d53d1 100644
--- a/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
+++ b/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
@@ -2,7 +2,7 @@ package ProjectData.Messages.Recommendations;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Tables.TableRenderers;
+import Common.Visual.Tables.TableRenderers;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
diff --git a/src/ProjectData/Project/UI/VersionsTree.java b/src/ProjectData/Project/UI/VersionsTree.java
index 37b7e5ce..62ed2285 100644
--- a/src/ProjectData/Project/UI/VersionsTree.java
+++ b/src/ProjectData/Project/UI/VersionsTree.java
@@ -5,8 +5,8 @@ import _VisualDVM.Global;
 import Common_old.UI.Menus.GraphMenu;
 import Common_old.UI.Menus.VersionsMenu;
 import Common.Visual.Selectable;
-import Common_old.UI.Trees.DataTree;
-import Common_old.UI.Trees.TreeRenderers;
+import Common.Visual.Trees.DataTree;
+import Common.Visual.Trees.TreeRenderers;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java b/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
index d5865c36..0a4c342e 100644
--- a/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
+++ b/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
@@ -4,7 +4,7 @@ import Common_old.Current;
 import _VisualDVM.Global;
 import Common.Visual.Selectable;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common_old.UI.Trees.StyledTreeCellRenderer;
+import Common.Visual.Trees.StyledTreeCellRenderer;
 import ProjectData.Project.db_project_info;
 
 import javax.swing.*;
diff --git a/src/ProjectData/SapforData/Arrays/ArraysSet.java b/src/ProjectData/SapforData/Arrays/ArraysSet.java
index d1e73390..ab09a72a 100644
--- a/src/ProjectData/SapforData/Arrays/ArraysSet.java
+++ b/src/ProjectData/SapforData/Arrays/ArraysSet.java
@@ -10,9 +10,9 @@ import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.util.Vector;
 
-import static Common_old.UI.Tables.TableEditors.EditorHyperlinks;
-import static Common_old.UI.Tables.TableRenderers.RendererHiddenList;
-import static Common_old.UI.Tables.TableRenderers.RendererHyperlinks;
+import static Common.Visual.Tables.TableEditors.EditorHyperlinks;
+import static Common.Visual.Tables.TableRenderers.RendererHiddenList;
+import static Common.Visual.Tables.TableRenderers.RendererHyperlinks;
 public class ArraysSet extends DataSet<Long, ProjectArray> {
     public ArraysSet() {
         super(Long.class, ProjectArray.class);
diff --git a/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java b/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
index 05f9e9b8..d44089b8 100644
--- a/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Arrays.UI;
 import Common.Visual.CommonUI;
-import Common_old.UI.Tables.RendererCell;
+import Common.Visual.Tables.RendererCell;
 import Common.Visual.Fonts.VisualiserFonts;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
diff --git a/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java b/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
index b18f9ca8..c84ff977 100644
--- a/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Arrays.UI;
 import Common.Visual.CommonUI;
-import Common_old.UI.Tables.DBObjectEditor;
+import Common.Visual.Tables.DBObjectEditor;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common_old.UI.UI;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
diff --git a/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java b/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
index 11950c8f..d520ff26 100644
--- a/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
@@ -2,8 +2,8 @@ package ProjectData.SapforData.Arrays.UI;
 import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Visual.ControlForm;
-import Common_old.UI.Tables.Grid.GridAnchestor;
-import Common_old.UI.Tables.StyledTable;
+import Common.Visual.Tables.Grid.GridAnchestor;
+import Common.Visual.Tables.StyledTable;
 import Common_old.UI.UI;
 import ProjectData.SapforData.Arrays.ProjectArray;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
@@ -11,8 +11,8 @@ import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 import java.awt.*;
 import java.util.Vector;
 
-import static Common_old.UI.Tables.TableEditors.EditorDimension;
-import static Common_old.UI.Tables.TableRenderers.RendererDimension;
+import static Common.Visual.Tables.TableEditors.EditorDimension;
+import static Common.Visual.Tables.TableRenderers.RendererDimension;
 public class DimensionsTableForm extends ControlForm<StyledTable> {
     public DimensionsTableForm() {
         super(StyledTable.class);
diff --git a/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java b/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
index 5526027d..9b27bb1d 100644
--- a/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Arrays.UI;
 import Common_old.UI.Menus.GraphMenu;
-import Common_old.UI.Trees.StyledTree;
+import Common.Visual.Trees.StyledTree;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/ProjectData/SapforData/Arrays/UI/RulesTree.java b/src/ProjectData/SapforData/Arrays/UI/RulesTree.java
index f923d77d..17158cd4 100644
--- a/src/ProjectData/SapforData/Arrays/UI/RulesTree.java
+++ b/src/ProjectData/SapforData/Arrays/UI/RulesTree.java
@@ -2,14 +2,14 @@ package ProjectData.SapforData.Arrays.UI;
 import Common.CurrentAnchestor;
 import Common_old.Current;
 import Common_old.UI.Menus.GraphMenu;
-import Common_old.UI.Trees.StyledTree;
-import Common_old.UI.Trees.TreeRenderers;
+import Common.Visual.Trees.StyledTree;
+import Common.Visual.Trees.TreeRenderers;
 import ProjectData.SapforData.Regions.ParallelRegion;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
 
-import static Common_old.UI.Trees.TreeRenderers.RendererRule;
+import static Common.Visual.Trees.TreeRenderers.RendererRule;
 public class RulesTree extends StyledTree {
     public RulesTree() {
         super(Current.getProject().align_rules_root);
diff --git a/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java b/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
index d221b0ea..db206d4f 100644
--- a/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
+++ b/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Arrays.UI;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common_old.UI.Trees.StyledTreeCellRenderer;
+import Common.Visual.Trees.StyledTreeCellRenderer;
 import ProjectData.SapforData.Regions.ParallelRegion;
 
 import javax.swing.*;
diff --git a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
index c35d5a01..bed84a76 100644
--- a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
@@ -2,8 +2,8 @@ package ProjectData.SapforData.Functions.UI.Graph;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
-import Common_old.UI.Menus.VisualiserMenuItem;
-import Common_old.UI.Menus.StyledPopupMenu;
+import Common.Visual.Menus.VisualiserMenuItem;
+import Common.Visual.Menus.StyledPopupMenu;
 import Common_old.UI.UI;
 import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/ProjectData/SapforData/Functions/UI/InlineMenu.java b/src/ProjectData/SapforData/Functions/UI/InlineMenu.java
index 3ff44811..9383bba8 100644
--- a/src/ProjectData/SapforData/Functions/UI/InlineMenu.java
+++ b/src/ProjectData/SapforData/Functions/UI/InlineMenu.java
@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Functions.UI;
 import Common_old.Current;
 import Common_old.UI.Menus.SelectionTreeMenu;
-import Common_old.UI.Trees.SelectableTree;
+import Common.Visual.Trees.SelectableTree;
 import ProjectData.SapforData.Functions.FuncInfo;
 public class InlineMenu extends SelectionTreeMenu {
     public InlineMenu(SelectableTree tree_in) {
diff --git a/src/ProjectData/SapforData/Functions/UI/InlineMenu2.java b/src/ProjectData/SapforData/Functions/UI/InlineMenu2.java
index db6513f3..75c6546c 100644
--- a/src/ProjectData/SapforData/Functions/UI/InlineMenu2.java
+++ b/src/ProjectData/SapforData/Functions/UI/InlineMenu2.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions.UI;
 import Common_old.UI.Menus.SelectionTreeMenu;
-import Common_old.UI.Trees.SelectableTree;
+import Common.Visual.Trees.SelectableTree;
 import ProjectData.SapforData.Functions.FuncCallH;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/ProjectData/SapforData/Functions/UI/InlineTree.java b/src/ProjectData/SapforData/Functions/UI/InlineTree.java
index 13c42fdd..60422dd4 100644
--- a/src/ProjectData/SapforData/Functions/UI/InlineTree.java
+++ b/src/ProjectData/SapforData/Functions/UI/InlineTree.java
@@ -2,8 +2,8 @@ package ProjectData.SapforData.Functions.UI;
 import Common.CurrentAnchestor;
 import Common_old.Current;
 import Common_old.UI.Menus.GraphMenu;
-import Common_old.UI.Trees.SelectableTree;
-import Common_old.UI.Trees.TreeRenderers;
+import Common.Visual.Trees.SelectableTree;
+import Common.Visual.Trees.TreeRenderers;
 import ProjectData.SapforData.FileObject;
 public class InlineTree extends SelectableTree {
     public InlineTree() {
diff --git a/src/ProjectData/SapforData/Functions/UI/InlineTree2.java b/src/ProjectData/SapforData/Functions/UI/InlineTree2.java
index f5e8dfa9..8c3b0116 100644
--- a/src/ProjectData/SapforData/Functions/UI/InlineTree2.java
+++ b/src/ProjectData/SapforData/Functions/UI/InlineTree2.java
@@ -2,8 +2,8 @@ package ProjectData.SapforData.Functions.UI;
 import Common.CurrentAnchestor;
 import Common_old.Current;
 import Common_old.UI.Menus.GraphMenu;
-import Common_old.UI.Trees.SelectableTree;
-import Common_old.UI.Trees.TreeRenderers;
+import Common.Visual.Trees.SelectableTree;
+import Common.Visual.Trees.TreeRenderers;
 import ProjectData.SapforData.FileObject;
 public class InlineTree2 extends SelectableTree {
     public InlineTree2() {
diff --git a/src/ProjectData/SapforData/Includes/UI/IncludesMenu.java b/src/ProjectData/SapforData/Includes/UI/IncludesMenu.java
index 0cebad39..1438187d 100644
--- a/src/ProjectData/SapforData/Includes/UI/IncludesMenu.java
+++ b/src/ProjectData/SapforData/Includes/UI/IncludesMenu.java
@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Includes.UI;
 import Common_old.Current;
 import Common_old.UI.Menus.SelectionTreeMenu;
-import Common_old.UI.Trees.SelectableTree;
+import Common.Visual.Trees.SelectableTree;
 import ProjectData.SapforData.Includes.FileInfo;
 public class IncludesMenu extends SelectionTreeMenu {
     public IncludesMenu(SelectableTree tree_in) {
diff --git a/src/ProjectData/SapforData/Includes/UI/IncludesTree.java b/src/ProjectData/SapforData/Includes/UI/IncludesTree.java
index 369a1be8..6719acba 100644
--- a/src/ProjectData/SapforData/Includes/UI/IncludesTree.java
+++ b/src/ProjectData/SapforData/Includes/UI/IncludesTree.java
@@ -1,8 +1,8 @@
 package ProjectData.SapforData.Includes.UI;
 import Common_old.Current;
 import Common_old.UI.Menus.GraphMenu;
-import Common_old.UI.Trees.SelectableTree;
-import Common_old.UI.Trees.TreeRenderers;
+import Common.Visual.Trees.SelectableTree;
+import Common.Visual.Trees.TreeRenderers;
 public class IncludesTree extends SelectableTree {
     public IncludesTree() {
         super(Current.getProject().includes_root);
diff --git a/src/ProjectData/SapforData/Regions/RegionsSet.java b/src/ProjectData/SapforData/Regions/RegionsSet.java
index 59cc1607..43402c35 100644
--- a/src/ProjectData/SapforData/Regions/RegionsSet.java
+++ b/src/ProjectData/SapforData/Regions/RegionsSet.java
@@ -5,8 +5,8 @@ import Common.Visual.DataSetControlForm;
 
 import java.math.BigInteger;
 
-import static Common_old.UI.Tables.TableRenderers.RendererMultiline;
-import static Common_old.UI.Tables.TableRenderers.RendererTopLeft;
+import static Common.Visual.Tables.TableRenderers.RendererMultiline;
+import static Common.Visual.Tables.TableRenderers.RendererTopLeft;
 public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
     //суррогат. нужен только для сохры столбцов. во всяком случае пока.
     public RegionsSet() {
diff --git a/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java b/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
index 735bbaf7..206fa2e4 100644
--- a/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
+++ b/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Regions.UI;
 import Common_old.Current;
-import Common_old.UI.Tables.StyledCellLabel;
+import Common.Visual.Tables.StyledCellLabel;
 import ProjectData.SapforData.Arrays.ProjectArray;
 import javafx.util.Pair;
 
diff --git a/src/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java b/src/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java
index 74f330dd..4f43d5a5 100644
--- a/src/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java
+++ b/src/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Variants.UI;
-import Common_old.UI.Tables.MaskedIntegerValueRenderer;
+import Common.Visual.Tables.MaskedIntegerValueRenderer;
 public class VariantRankRenderer extends MaskedIntegerValueRenderer {
     @Override
     public long getMask() {
diff --git a/src/ProjectData/SapforData/Variants/VariantsSet.java b/src/ProjectData/SapforData/Variants/VariantsSet.java
index 33f57013..14947126 100644
--- a/src/ProjectData/SapforData/Variants/VariantsSet.java
+++ b/src/ProjectData/SapforData/Variants/VariantsSet.java
@@ -3,7 +3,7 @@ import Common_old.Current;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 
-import static Common_old.UI.Tables.TableRenderers.*;
+import static Common.Visual.Tables.TableRenderers.*;
 public class VariantsSet extends DataSet<String, ParallelVariant> {
     public VariantsSet() {
         super(String.class, ParallelVariant.class);
diff --git a/src/Repository/BugReport/BugReportsDBTable.java b/src/Repository/BugReport/BugReportsDBTable.java
index d07f673b..25210cfe 100644
--- a/src/Repository/BugReport/BugReportsDBTable.java
+++ b/src/Repository/BugReport/BugReportsDBTable.java
@@ -13,7 +13,7 @@ import java.util.Comparator;
 import java.util.Vector;
 import java.util.stream.Collectors;
 
-import static Common_old.UI.Tables.TableRenderers.*;
+import static Common.Visual.Tables.TableRenderers.*;
 public class BugReportsDBTable extends DBTable<String, BugReport> {
     public BugReportsDBTable() {
         super(String.class, BugReport.class);
diff --git a/src/Repository/BugReport/BugReportsMenuBar.java b/src/Repository/BugReport/BugReportsMenuBar.java
index cc43dd29..873b37c3 100644
--- a/src/Repository/BugReport/BugReportsMenuBar.java
+++ b/src/Repository/BugReport/BugReportsMenuBar.java
@@ -1,5 +1,5 @@
 package Repository.BugReport;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class BugReportsMenuBar extends DataMenuBar {
     public BugReportsMenuBar() {
diff --git a/src/Repository/Component/ComponentsMenuBar.java b/src/Repository/Component/ComponentsMenuBar.java
index a1c240f6..3b4f8337 100644
--- a/src/Repository/Component/ComponentsMenuBar.java
+++ b/src/Repository/Component/ComponentsMenuBar.java
@@ -1,6 +1,6 @@
 package Repository.Component;
 import Common.Visual.CommonUI;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Common_old.UI.Menus_2023.VisualiserMenu;
 import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Repository/Component/ComponentsSet.java b/src/Repository/Component/ComponentsSet.java
index aea4e321..ffd3dd9d 100644
--- a/src/Repository/Component/ComponentsSet.java
+++ b/src/Repository/Component/ComponentsSet.java
@@ -5,8 +5,8 @@ import Common.Visual.DataSetControlForm;
 
 import java.util.Vector;
 
-import static Common_old.UI.Tables.TableRenderers.RendererMaskedInt;
-import static Common_old.UI.Tables.TableRenderers.RendererStatusEnum;
+import static Common.Visual.Tables.TableRenderers.RendererMaskedInt;
+import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
 public class ComponentsSet extends DataSet<ComponentType, Component> {
     public ComponentsSet() {
         super(ComponentType.class, Component.class);
diff --git a/src/Repository/Component/UI/PublishFields.java b/src/Repository/Component/UI/PublishFields.java
index 0a2f2409..441fb941 100644
--- a/src/Repository/Component/UI/PublishFields.java
+++ b/src/Repository/Component/UI/PublishFields.java
@@ -1,5 +1,5 @@
 package Repository.Component.UI;
-import Common_old.UI.Editor.BaseEditor;
+import _VisualDVM.Visual.Editor.BaseEditor;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java b/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
index 7587f980..242da594 100644
--- a/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
+++ b/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
@@ -1,5 +1,5 @@
 package Repository.SubscriberWorkspace;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SubscriberWorkspacesMenuBar extends DataMenuBar {
     public SubscriberWorkspacesMenuBar() {
diff --git a/src/Repository/Subscribes/SubscribersMenuBar.java b/src/Repository/Subscribes/SubscribersMenuBar.java
index cc9d323c..71c275e4 100644
--- a/src/Repository/Subscribes/SubscribersMenuBar.java
+++ b/src/Repository/Subscribes/SubscribersMenuBar.java
@@ -1,5 +1,5 @@
 package Repository.Subscribes;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SubscribersMenuBar extends DataMenuBar {
     public SubscribersMenuBar() {
diff --git a/src/Repository/Subscribes/UI/SubscriberFields.java b/src/Repository/Subscribes/UI/SubscriberFields.java
index 998d8b29..2b65dc85 100644
--- a/src/Repository/Subscribes/UI/SubscriberFields.java
+++ b/src/Repository/Subscribes/UI/SubscriberFields.java
@@ -1,5 +1,5 @@
 package Repository.Subscribes.UI;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import GlobalData.Account.AccountRole;
 
diff --git a/src/TestingSystem/Common/Group/GroupsMenuBar.java b/src/TestingSystem/Common/Group/GroupsMenuBar.java
index 2a9822d3..516074db 100644
--- a/src/TestingSystem/Common/Group/GroupsMenuBar.java
+++ b/src/TestingSystem/Common/Group/GroupsMenuBar.java
@@ -1,7 +1,7 @@
 package TestingSystem.Common.Group;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import TestingSystem.Common.Group.UI.AddGroupMenu;
 import TestingSystem.Common.Group.UI.EditGroupMenu;
diff --git a/src/TestingSystem/Common/Group/UI/GroupFields.java b/src/TestingSystem/Common/Group/UI/GroupFields.java
index dcd8ac06..98ba2c53 100644
--- a/src/TestingSystem/Common/Group/UI/GroupFields.java
+++ b/src/TestingSystem/Common/Group/UI/GroupFields.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common.Group.UI;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import ProjectData.LanguageName;
 import TestingSystem.Common.Test.TestType;
diff --git a/src/TestingSystem/Common/Test/TestsMenuBar.java b/src/TestingSystem/Common/Test/TestsMenuBar.java
index e548ad2b..8a291626 100644
--- a/src/TestingSystem/Common/Test/TestsMenuBar.java
+++ b/src/TestingSystem/Common/Test/TestsMenuBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common.Test;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import TestingSystem.Common.Test.UI.AddTestMenu;
 import TestingSystem.Common.Test.UI.EditTestMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/Common/Test/UI/TestFields.java b/src/TestingSystem/Common/Test/UI/TestFields.java
index 87a22252..5694f9ad 100644
--- a/src/TestingSystem/Common/Test/UI/TestFields.java
+++ b/src/TestingSystem/Common/Test/UI/TestFields.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common.Test.UI;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index 98c54b3b..1620f724 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -3,7 +3,7 @@ import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Tables.TableRenderers;
+import Common.Visual.Tables.TableRenderers;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
diff --git a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
index d5398f39..ec4364bf 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMConfiguration;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMConfigurationsMenuBar extends DataMenuBar {
     public DVMConfigurationsMenuBar() {
diff --git a/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java b/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
index 78915c2a..a83a1460 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
@@ -1,6 +1,6 @@
 package TestingSystem.DVM.DVMConfiguration.UI;
 import Common_old.Constants;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 36725886..94417d4d 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -12,7 +12,7 @@ import Visual_DVM_2021.Passes.Pass_2021;
 import java.util.Comparator;
 import java.util.Date;
 
-import static Common_old.UI.Tables.TableRenderers.*;
+import static Common.Visual.Tables.TableRenderers.*;
 public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     public static boolean filterMyOnly = false;
     public static boolean filterActive = false;
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
index bff0cefa..ccdec79e 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
@@ -1,7 +1,7 @@
 package TestingSystem.DVM.DVMPackage;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
diff --git a/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java b/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java
index 64b6e280..276ff629 100644
--- a/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java
+++ b/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMSettings.UI;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMSettingsBar extends DataMenuBar {
     public DVMSettingsBar() {
diff --git a/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java b/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
index 70eb9793..73d0c631 100644
--- a/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
+++ b/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
@@ -1,6 +1,6 @@
 package TestingSystem.DVM.DVMSettings.UI;
 import Common_old.Current;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java
index ff155472..d60579f5 100644
--- a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMTasks;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMRunTasksBar extends DataMenuBar {
     public DVMRunTasksBar() {
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index 7354375d..df373fec 100644
--- a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
@@ -9,8 +9,8 @@ import TestingSystem.DVM.DVMPackage.DVMPackage;
 
 import java.util.Comparator;
 
-import static Common_old.UI.Tables.TableRenderers.RendererProgress;
-import static Common_old.UI.Tables.TableRenderers.RendererStatusEnum;
+import static Common.Visual.Tables.TableRenderers.RendererProgress;
+import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
 public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
     //todo обобщить бы наличие фильтров для всех таблиц.
     DVMPackage target;
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 9ea4063c..3261f7ed 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -1,8 +1,8 @@
 package TestingSystem.SAPFOR.SapforConfiguration;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Tables.TableEditors;
-import Common_old.UI.Tables.TableRenderers;
+import Common.Visual.Tables.TableEditors;
+import Common.Visual.Tables.TableRenderers;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
index df9341bb..031e44eb 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforConfiguration;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforConfigurationsMenuBar extends DataMenuBar {
     public SapforConfigurationsMenuBar() {
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
index cb385753..31a0ec3c 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
@@ -1,6 +1,6 @@
 package TestingSystem.SAPFOR.SapforConfiguration.UI;
 import Common_old.Constants;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index 862cdf54..d7791db3 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -10,7 +10,7 @@ import Visual_DVM_2021.Passes.Pass_2021;
 import java.util.Comparator;
 import java.util.Date;
 
-import static Common_old.UI.Tables.TableRenderers.*;
+import static Common.Visual.Tables.TableRenderers.*;
 public class SapforPackageDBTable extends iDBTable<SapforPackage> {
     public static boolean filterMyOnly = false;
     public static boolean filterActive = false;
diff --git a/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java b/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java
index caceed41..f73d5c26 100644
--- a/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java
+++ b/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforSettings;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforSettingsBar extends DataMenuBar {
     public SapforSettingsBar() {
diff --git a/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java b/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
index e4501e58..a539f58f 100644
--- a/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
+++ b/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
@@ -1,6 +1,6 @@
 package TestingSystem.SAPFOR.SapforSettings.UI;
 import Common.Visual.CommonUI;
-import Common_old.UI.Tables.StyledCellLabel;
+import Common.Visual.Tables.StyledCellLabel;
 import Common.Visual.Windows.Dialog.DialogFields;
 import Repository.Component.Sapfor.Sapfor;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java b/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java
index 19105ac9..e4632dff 100644
--- a/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java
+++ b/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforSettings.UI;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java
index 72bfedf7..82235ca4 100644
--- a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java
+++ b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforSettingsCommand;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforSettingsCommandsBar extends DataMenuBar {
     public SapforSettingsCommandsBar() {
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
index ee56aa6d..5b469590 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
@@ -1,7 +1,7 @@
 package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
index 62999786..e0f21c94 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
@@ -1,8 +1,8 @@
 package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.CurrentAnchestor;
 import Common_old.Current;
-import Common_old.UI.Trees.DataTree;
-import Common_old.UI.Trees.TreeRenderers;
+import Common.Visual.Trees.DataTree;
+import Common.Visual.Trees.TreeRenderers;
 import Common_old.UI.UI;
 import TestingSystem.SAPFOR.Json.SapforVersion_json;
 
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
index 330060d9..9347570c 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforTasksPackage.UI;
-import Common_old.UI.Trees.StyledTreeCellRenderer;
+import Common.Visual.Trees.StyledTreeCellRenderer;
 
 import javax.swing.*;
 public class SapforVersionsTreeCellRenderer extends StyledTreeCellRenderer {
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
index 0057f1ee..9f86629b 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.ServerSapfor;
-import Common.Visual.DataMenuBar;
+import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class ServerSapforsBar extends DataMenuBar {
     public ServerSapforsBar() {
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index cd48bb64..bb517b19 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -2,7 +2,7 @@ package TestingSystem.SAPFOR.ServerSapfor;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Tables.TableRenderers;
+import Common.Visual.Tables.TableRenderers;
 import Common_old.UI.UI;
 
 import java.util.Comparator;
diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java b/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
index 8f1e77fe..df2a1301 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
@@ -9,7 +9,6 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import javax.swing.*;
-import java.io.File;
 public class CloseCurrentProject extends Pass_2021<db_project_info> {
     @Override
     public String getButtonText() {
diff --git a/src/Visual_DVM_2021/Passes/All/CloseProject.java b/src/Visual_DVM_2021/Passes/All/CloseProject.java
index e57f3238..59f040dd 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CloseProject.java
@@ -4,8 +4,6 @@ import Common.Utils.CommonUtils;
 import Common_old.Current;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.Pass_2021;
-
-import java.io.File;
 public class CloseProject extends Pass_2021<db_project_info> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java b/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
index fc7ccdb9..e19b06af 100644
--- a/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
+++ b/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
@@ -3,7 +3,7 @@ import Common.CurrentAnchestor;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.PassMenuItem;
-import Common_old.UI.Trees.DataTree;
+import Common.Visual.Trees.DataTree;
 import Common.Visual.Windows.Dialog.Dialog;
 import Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
diff --git a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
index 5c3f1cd9..69eb7fd1 100644
--- a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
+++ b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
@@ -3,7 +3,6 @@ import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
 import GlobalData.GlobalDatabase;
-import _VisualDVM.Global;
 import GlobalData.Settings.SettingName;
 import TestingSystem.SAPFOR.Json.SapforVersion_json;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
diff --git a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java b/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
index a9ba9147..1a0073c5 100644
--- a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
+++ b/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.UI;
 import Common_old.Current;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
 
diff --git a/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java b/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java
index 521b27cc..bcd13fe7 100644
--- a/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Interface;
-import Common_old.UI.Trees.TreeForm;
+import Common.Visual.Trees.TreeForm;
 import Common_old.UI.UI;
 public interface ProjectWindow {
     //-
diff --git a/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java b/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java
index 1f7a869e..1deffa65 100644
--- a/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Interface;
-import Common_old.UI.Trees.TreeForm;
+import Common.Visual.Trees.TreeForm;
 import ProjectData.Project.db_project_info;
 public interface VersionsWindow extends VisualizerForm {
     VariantsWindow getVariantsWindow();
diff --git a/src/Visual_DVM_2021/UI/Main/ArraysForm.java b/src/Visual_DVM_2021/UI/Main/ArraysForm.java
index 461d5114..3e987970 100644
--- a/src/Visual_DVM_2021/UI/Main/ArraysForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ArraysForm.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common_old.Current;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import ProjectData.SapforData.Arrays.ProjectArray;
 import Visual_DVM_2021.UI.Interface.ArraysWindow;
 
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
index 255a633b..a2fa66ba 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -4,10 +4,10 @@ import Common.Visual.CommonUI;
 import Common_old.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.Editor.BaseEditor;
-import Common_old.UI.Editor.Viewer;
+import _VisualDVM.Visual.Editor.BaseEditor;
+import _VisualDVM.Visual.Editor.Viewer;
 import Common_old.UI.Menus_2023.VisualiserMenuBar;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common_old.UI.UI;
 import GlobalData.Settings.SettingName;
 import Repository.BugReport.BugReport;
diff --git a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
index 2efdc074..d9bcf996 100644
--- a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
@@ -5,8 +5,8 @@ import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
-import Common_old.UI.Editor.BaseEditor;
-import Common_old.UI.Label.ShortLabel;
+import _VisualDVM.Visual.Editor.BaseEditor;
+import _VisualDVM.Visual.Controls.ShortLabel;
 import Common_old.UI.Menus_2023.VisualiserMenuBar;
 import Common_old.UI.UI;
 import Common.Utils.TextLog;
diff --git a/src/Visual_DVM_2021/UI/Main/FileForm.java b/src/Visual_DVM_2021/UI/Main/FileForm.java
index ae8eb26b..2f4a6649 100644
--- a/src/Visual_DVM_2021/UI/Main/FileForm.java
+++ b/src/Visual_DVM_2021/UI/Main/FileForm.java
@@ -4,9 +4,9 @@ import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.Editor.Viewer;
+import _VisualDVM.Visual.Editor.Viewer;
 import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
-import Common_old.UI.Trees.TreeForm;
+import Common.Visual.Trees.TreeForm;
 import Common_old.UI.UI;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
diff --git a/src/Visual_DVM_2021/UI/Main/FunctionsForm.java b/src/Visual_DVM_2021/UI/Main/FunctionsForm.java
index 2f7334e7..a30eb6cd 100644
--- a/src/Visual_DVM_2021/UI/Main/FunctionsForm.java
+++ b/src/Visual_DVM_2021/UI/Main/FunctionsForm.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Visual.CommonUI;
 import Common_old.Current;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
 import ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphUI;
 import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
diff --git a/src/Visual_DVM_2021/UI/Main/ProjectForm.java b/src/Visual_DVM_2021/UI/Main/ProjectForm.java
index 7a9bc337..6807bb80 100644
--- a/src/Visual_DVM_2021/UI/Main/ProjectForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ProjectForm.java
@@ -4,9 +4,9 @@ import Common.Visual.CommonUI;
 import Common_old.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.Editor.Viewer;
+import _VisualDVM.Visual.Editor.Viewer;
 import Common_old.UI.Menus_2023.ProjectMenuBar.ProjectMenuBar;
-import Common_old.UI.Trees.TreeForm;
+import Common.Visual.Trees.TreeForm;
 import Common_old.UI.UI;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index c5dfefe5..cd980028 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -3,7 +3,7 @@ import Common.CurrentAnchestor;
 import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
-import Common_old.UI.Label.ShortLabel;
+import _VisualDVM.Visual.Controls.ShortLabel;
 import Common_old.UI.Menus_2023.VisualiserMenuBar;
 import Common_old.UI.UI;
 import Common.Utils.TextLog;
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index e4d6b6bc..7b8280de 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -6,7 +6,7 @@ import Common.Visual.CommonUI;
 import Common_old.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.TextField.StyledTextField;
+import Common.Visual.TextField.StyledTextField;
 import Common_old.UI.UI;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Credentials.Credentials;
diff --git a/src/Visual_DVM_2021/UI/Main/VariantsForm.java b/src/Visual_DVM_2021/UI/Main/VariantsForm.java
index 57aab3c4..1b37561d 100644
--- a/src/Visual_DVM_2021/UI/Main/VariantsForm.java
+++ b/src/Visual_DVM_2021/UI/Main/VariantsForm.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
-import Common_old.UI.Trees.TreeForm;
+import Common.Visual.Trees.TreeForm;
 import ProjectData.SapforData.Arrays.UI.DimensionsTableForm;
 import ProjectData.SapforData.Arrays.UI.RulesTree;
 import Visual_DVM_2021.UI.Interface.VariantsWindow;
diff --git a/src/Visual_DVM_2021/UI/Main/VersionsForm.java b/src/Visual_DVM_2021/UI/Main/VersionsForm.java
index 50641934..e15c51d1 100644
--- a/src/Visual_DVM_2021/UI/Main/VersionsForm.java
+++ b/src/Visual_DVM_2021/UI/Main/VersionsForm.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Visual.CommonUI;
-import Common_old.UI.Trees.TreeForm;
+import Common.Visual.Trees.TreeForm;
 import Common_old.UI.UI;
 import ProjectData.Project.UI.VersionsTree;
 import ProjectData.Project.db_project_info;
diff --git a/src/Common_old/UI/Label/ShortLabel.java b/src/_VisualDVM/Visual/Controls/ShortLabel.java
similarity index 91%
rename from src/Common_old/UI/Label/ShortLabel.java
rename to src/_VisualDVM/Visual/Controls/ShortLabel.java
index 487f190c..08afa8d5 100644
--- a/src/Common_old/UI/Label/ShortLabel.java
+++ b/src/_VisualDVM/Visual/Controls/ShortLabel.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Label;
+package _VisualDVM.Visual.Controls;
 import javax.swing.*;
 public class ShortLabel extends JLabel {
     int max = 0;
diff --git a/src/Common_old/UI/Editor/BaseEditor.java b/src/_VisualDVM/Visual/Editor/BaseEditor.java
similarity index 97%
rename from src/Common_old/UI/Editor/BaseEditor.java
rename to src/_VisualDVM/Visual/Editor/BaseEditor.java
index fb5f70e6..af57d1a6 100644
--- a/src/Common_old/UI/Editor/BaseEditor.java
+++ b/src/_VisualDVM/Visual/Editor/BaseEditor.java
@@ -1,8 +1,8 @@
-package Common_old.UI.Editor;
+package _VisualDVM.Visual.Editor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.UI.Menus.StyledPopupMenu;
-import Common_old.UI.Menus.TextEditorMenu;
+import Common.Visual.Menus.StyledPopupMenu;
+import Common.Visual.Menus.TextEditorMenu;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Visual.Syntax.SPFEditorTheme;
diff --git a/src/Common_old/UI/Editor/CaretInfo.java b/src/_VisualDVM/Visual/Editor/CaretInfo.java
similarity index 97%
rename from src/Common_old/UI/Editor/CaretInfo.java
rename to src/_VisualDVM/Visual/Editor/CaretInfo.java
index 2b1d2494..7ed80884 100644
--- a/src/Common_old/UI/Editor/CaretInfo.java
+++ b/src/_VisualDVM/Visual/Editor/CaretInfo.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Editor;
+package _VisualDVM.Visual.Editor;
 import Common.Utils.CommonUtils;
 import ProjectData.Files.UI.Editor.SPFEditor;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
diff --git a/src/Common_old/UI/Editor/Viewer.java b/src/_VisualDVM/Visual/Editor/Viewer.java
similarity index 82%
rename from src/Common_old/UI/Editor/Viewer.java
rename to src/_VisualDVM/Visual/Editor/Viewer.java
index 1b692cac..e1e744f0 100644
--- a/src/Common_old/UI/Editor/Viewer.java
+++ b/src/_VisualDVM/Visual/Editor/Viewer.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Editor;
+package _VisualDVM.Visual.Editor;
 public class Viewer extends BaseEditor {
     public Viewer() {
         setLineWrap(true);
diff --git a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
index a3c70705..c2d925a3 100644
--- a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
+++ b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
@@ -3,8 +3,8 @@ import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common.Visual.Windows.Form;
 import Common_old.Current;
-import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Trees.StyledTree;
+import Common.Visual.TextField.StyledTextField;
+import Common.Visual.Trees.StyledTree;
 import Common_old.UI.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;