diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index af1cde37..2b00319e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,188 +7,456 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Common/icons/CollapseUp.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/icons/ExpandDown.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/icons/SilwerArrowLeft.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/icons/SilwerArrowRight.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/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/DBObjectFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DBObjectFilter.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/Common/Visual/DataSetFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFilter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/FileNameForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/FileNameForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Current.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/AttachementsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/AttachementsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/FileStyleMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileStyleMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/GraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/GraphMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/MainEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainEditorMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/PassesSubMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/ProjectFilesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/PropertiesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TestsCompilationFilterMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/TestsCompilationFilterMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/VersionsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ECButtonPosition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/ECButtonPosition.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ExpandCollapseButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/ExpandCollapseButton.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FileMenuBar/FileMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FileMenuBar/FileSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/LanguagesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/AnalysesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/PassButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Controls/PassButton.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/PassControl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Controls/PassControl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/PassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/FilesOperationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/SettingsSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StableMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StableMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StablePassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StylesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StylesSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/TypesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/TypesSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/DVMHelpParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/DVMHelpParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/EnvironmentState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/EnvironmentState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/HelpParserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/HelpParserState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/OptionState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/OptionState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/PathValidator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/PathValidator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/PathValidatorState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/PathValidatorState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/ShellParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/ShellParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/ShellParserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/ShellParserState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/StatementsChecker.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/Validator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/Validator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Account/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Account/Account.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/Compiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/Compiler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.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/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValue.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.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/Makefile/Makefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/Makefile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.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/RunConfiguration/RunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/DBSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/DBSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTask.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/Passes/TaskLocalPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Passes/TaskLocalPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/GlobalData/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/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Task.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/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/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.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/FilesHyperlinksPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesHyperlinksPanel.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/Errors/ErrorsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Errors/ErrorsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.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/Notes/NotesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Notes/NotesDBTable.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/Messages/Warnings/WarningsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Warnings/WarningsDBTable.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/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.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/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.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/FileArraysTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/FileArraysTree.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/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/FileObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.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/Graph/FunctionsGraphUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.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/Loops/LoopState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/LoopState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/UI/FileLoopsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/UI/FileLoopsTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/ParallelRegion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/ParallelRegion.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/ParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/ParallelVariant.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/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportInterface.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/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Component.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/Repository/Component/Instruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Instruction.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/MessagesServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/MessagesServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualizer_2.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspace.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
       <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/Common/Group/UI/AddGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/AddGroupMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/EditGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/EditGroupMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/AddTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/AddTestMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/EditTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/EditTestMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.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/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/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/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.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/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.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/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.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/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/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/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.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/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.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/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AbortTestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyProfile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/BuildComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/BuildComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.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/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CombineFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CopyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CopyProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteVersion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropAnalyses.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropAnalyses.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropFastAccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropFastAccess.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExcludeFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExcludeFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GCOV.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GCOV.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/IncludeFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/IncludeFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyRegions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyRegions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Save.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Save.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveBugReportComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveBugReportComment.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveBugReportDescription.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveBugReportDescription.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveGraph.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SendBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateProperty.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ChangeFilePass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ChangeFilePass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/CurrentComponentPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/CurrentComponentPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/CurrentProjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/CurrentProjectPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/FilesMassPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/FilesMassPass.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProjectPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforFilesModification.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforFilesModification.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforTransformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforTransformation.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/StartTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/StartTestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.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/Passes/VariantsMassPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/VariantsMassPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/AnalysisWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/AnalysisWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/ArraysWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ArraysWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/CallbackWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CallbackWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/CommentInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CommentInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/DebugWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/DebugWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/DescriptionInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/DescriptionInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/FileWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FileWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/FormWithSplitters.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FormWithSplitters.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/FunctionsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FunctionsWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ProjectWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/SPFEditorInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/SPFEditorInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/ScenariosWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ScenariosWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/StatisticsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/StatisticsWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestsWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/VariantsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/VariantsWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/VersionsWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/VisualizerForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/VisualizerForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/AnalysisForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/AnalysisForm.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/CombineFilesDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CommentFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CommentFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CommentTabs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CommentTabs.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/CompilationTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CompilationTasksComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DVMRunTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DVMRunTasksComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DescriptionFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DescriptionFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DescriptionTabs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DescriptionTabs.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/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesFields.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/RunTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/RunTasksComparisonForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TabToolBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TabToolBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TasksComparisonForm.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/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestsForm.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/VersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.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/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/1.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectsChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectsChooser.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" />
@@ -295,11 +563,11 @@
       <recent name="Common.Utils.CommonUtils" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />
       <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" />
     </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="Visual_DVM_2021.Passes.UI" />
diff --git a/src/Common/Utils/InterruptThread.java b/src/Common/Utils/InterruptThread.java
index 76f1f239..784c190e 100644
--- a/src/Common/Utils/InterruptThread.java
+++ b/src/Common/Utils/InterruptThread.java
@@ -1,5 +1,5 @@
 package Common.Utils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
diff --git a/src/Common/Utils/Loggable.java b/src/Common/Utils/Loggable.java
index 1687d4c3..0b181851 100644
--- a/src/Common/Utils/Loggable.java
+++ b/src/Common/Utils/Loggable.java
@@ -1,6 +1,6 @@
 package Common.Utils;
 import Common.Visual.CommonUI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/src/Common/Visual/CommonUI.java b/src/Common/Visual/CommonUI.java
index 6704d250..80c83a31 100644
--- a/src/Common/Visual/CommonUI.java
+++ b/src/Common/Visual/CommonUI.java
@@ -13,6 +13,7 @@ import java.util.LinkedHashMap;
 import java.util.Stack;
 public class CommonUI {
     public static boolean active=true; //есть ли интерфейс. в консольных версиях не нужен.
+    public static MenuElement[] last_menu_path; //для меню
     public static boolean isActive() {
         return active;
     }
diff --git a/src/Common_old/UI/Menus_2023/ECButtonPosition.java b/src/Common/Visual/Controls/ECButtonPosition.java
similarity index 67%
rename from src/Common_old/UI/Menus_2023/ECButtonPosition.java
rename to src/Common/Visual/Controls/ECButtonPosition.java
index b30c63bf..7afb9d2e 100644
--- a/src/Common_old/UI/Menus_2023/ECButtonPosition.java
+++ b/src/Common/Visual/Controls/ECButtonPosition.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023;
+package Common.Visual.Controls;
 public enum ECButtonPosition {
     Up,
     Down,
diff --git a/src/Common_old/UI/Menus_2023/ExpandCollapseButton.java b/src/Common/Visual/Controls/ExpandCollapseButton.java
similarity index 94%
rename from src/Common_old/UI/Menus_2023/ExpandCollapseButton.java
rename to src/Common/Visual/Controls/ExpandCollapseButton.java
index c11ee226..ea2d3e6a 100644
--- a/src/Common_old/UI/Menus_2023/ExpandCollapseButton.java
+++ b/src/Common/Visual/Controls/ExpandCollapseButton.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023;
+package Common.Visual.Controls;
 public class ExpandCollapseButton extends MenuBarButton {
     protected String description;
     protected ECButtonPosition position;
@@ -44,7 +44,7 @@ public class ExpandCollapseButton extends MenuBarButton {
             }
         }
         setToolTipText(prefix + " " + description);
-        setIcon("/icons/" + icon_name + ".png");
+        setIcon("/Common/icons/" + icon_name + ".png");
         revalidate();
         repaint();
     }
diff --git a/src/Common_old/UI/Menus_2023/MenuBarButton.java b/src/Common/Visual/Controls/MenuBarButton.java
similarity index 96%
rename from src/Common_old/UI/Menus_2023/MenuBarButton.java
rename to src/Common/Visual/Controls/MenuBarButton.java
index 26fffbec..e5a0e885 100644
--- a/src/Common_old/UI/Menus_2023/MenuBarButton.java
+++ b/src/Common/Visual/Controls/MenuBarButton.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023;
+package Common.Visual.Controls;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
diff --git a/src/Common/Visual/DBObjectFilter.java b/src/Common/Visual/DBObjectFilter.java
index b508bd72..c32d4906 100644
--- a/src/Common/Visual/DBObjectFilter.java
+++ b/src/Common/Visual/DBObjectFilter.java
@@ -1,6 +1,6 @@
 package Common.Visual;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Menus_2023.StableMenuItem;
+import _VisualDVM.Visual.Menus.StableMenuItem;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DataSet;
 
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index ad79670e..c632d03a 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -6,7 +6,7 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DataSet;
 import Common.Database.Tables.FKBehaviour;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Menus.TableMenu;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.DataTable;
diff --git a/src/Common/Visual/DataSetFilter.java b/src/Common/Visual/DataSetFilter.java
index 828590c6..b40cb6a9 100644
--- a/src/Common/Visual/DataSetFilter.java
+++ b/src/Common/Visual/DataSetFilter.java
@@ -1,6 +1,6 @@
 package Common.Visual;
-import Common_old.UI.Menus_2023.StableMenuItem;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Visual.Menus.StableMenuItem;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DataSet;
 
diff --git a/src/Common/Visual/Menus/DataMenuBar.java b/src/Common/Visual/Menus/DataMenuBar.java
index ca67e043..97875313 100644
--- a/src/Common/Visual/Menus/DataMenuBar.java
+++ b/src/Common/Visual/Menus/DataMenuBar.java
@@ -1,7 +1,7 @@
 package Common.Visual.Menus;
 import Common.Database.Tables.DataSet;
-import Common_old.UI.Menus_2023.MenuBarButton;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import Common.Visual.Controls.MenuBarButton;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
diff --git a/src/Common/Visual/Trees/StyledTree.java b/src/Common/Visual/Trees/StyledTree.java
index cd6d9550..8d60804f 100644
--- a/src/Common/Visual/Trees/StyledTree.java
+++ b/src/Common/Visual/Trees/StyledTree.java
@@ -1,9 +1,9 @@
 package Common.Visual.Trees;
 import Common.Visual.CommonUI;
-import Common_old.UI.Menus.GraphMenu;
+import _VisualDVM.Visual.Menus.GraphMenu;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/Common/Visual/Windows/Dialog/Text/FileNameForm.java b/src/Common/Visual/Windows/Dialog/Text/FileNameForm.java
index 5112b767..f960fc96 100644
--- a/src/Common/Visual/Windows/Dialog/Text/FileNameForm.java
+++ b/src/Common/Visual/Windows/Dialog/Text/FileNameForm.java
@@ -1,5 +1,5 @@
 package Common.Visual.Windows.Dialog.Text;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 public class FileNameForm extends TextFieldDialog {
     public FileNameForm() {
     }
diff --git a/src/Common/icons/CollapseUp.png b/src/Common/icons/CollapseUp.png
new file mode 100644
index 00000000..fae3cebc
Binary files /dev/null and b/src/Common/icons/CollapseUp.png differ
diff --git a/src/Common/icons/ExpandDown.png b/src/Common/icons/ExpandDown.png
new file mode 100644
index 00000000..2077df97
Binary files /dev/null and b/src/Common/icons/ExpandDown.png differ
diff --git a/src/Common/icons/SilwerArrowLeft.png b/src/Common/icons/SilwerArrowLeft.png
new file mode 100644
index 00000000..64dda160
Binary files /dev/null and b/src/Common/icons/SilwerArrowLeft.png differ
diff --git a/src/Common/icons/SilwerArrowRight.png b/src/Common/icons/SilwerArrowRight.png
new file mode 100644
index 00000000..9bb7ee27
Binary files /dev/null and b/src/Common/icons/SilwerArrowRight.png differ
diff --git a/src/Common_old/Utils/Validators/StatementsChecker.java b/src/Common_old/Utils/Validators/StatementsChecker.java
deleted file mode 100644
index 0c013175..00000000
--- a/src/Common_old/Utils/Validators/StatementsChecker.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package Common_old.Utils.Validators;
-import Common.Utils.TextLog;
-public class StatementsChecker {
-    public static boolean Check(TextLog Log, boolean drop_on_first, Object... args) {
-        if (args.length % 2 != 0) return false;
-        for (int i = 0; i < args.length; i += 2) {
-            if ((boolean) args[i]) {
-                Log.Writeln((String) args[i + 1]);
-                if (drop_on_first) return false;
-            }
-        }
-        return true;
-    }
-}
diff --git a/src/GlobalData/Account/Account.java b/src/GlobalData/Account/Account.java
index e19777c9..7a366f0c 100644
--- a/src/GlobalData/Account/Account.java
+++ b/src/GlobalData/Account/Account.java
@@ -1,6 +1,6 @@
 package GlobalData.Account;
 import Common.Database.Objects.DBObject;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Common.Utils.TextLog;
 import Repository.BugReport.BugReport;
 import com.sun.org.glassfish.gmbal.Description;
diff --git a/src/GlobalData/Compiler/Compiler.java b/src/GlobalData/Compiler/Compiler.java
index 55e3519d..f537c0f2 100644
--- a/src/GlobalData/Compiler/Compiler.java
+++ b/src/GlobalData/Compiler/Compiler.java
@@ -1,8 +1,8 @@
 package GlobalData.Compiler;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
-import Common_old.Utils.Validators.DVMHelpParser;
+import _VisualDVM.Validators.DVMHelpParser;
 import GlobalData.CompilerEnvironment.CompilerEnvironmentsSet;
 import GlobalData.CompilerOption.CompilerOptionsSet;
 import GlobalData.Machine.Machine;
diff --git a/src/GlobalData/Compiler/CompilersDBTable.java b/src/GlobalData/Compiler/CompilersDBTable.java
index ac0d6b58..a0cc39c0 100644
--- a/src/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/GlobalData/Compiler/CompilersDBTable.java
@@ -1,12 +1,12 @@
 package GlobalData.Compiler;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
-import Common_old.Utils.Utils;
-import Common_old.Utils.Validators.PathValidator;
+import _VisualDVM.Utils;
+import _VisualDVM.Validators.PathValidator;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
diff --git a/src/GlobalData/Compiler/UI/CompilerFields.java b/src/GlobalData/Compiler/UI/CompilerFields.java
index 7d68d1ca..e04866d1 100644
--- a/src/GlobalData/Compiler/UI/CompilerFields.java
+++ b/src/GlobalData/Compiler/UI/CompilerFields.java
@@ -1,6 +1,6 @@
 package GlobalData.Compiler.UI;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
diff --git a/src/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/GlobalData/DVMParameter/DVMParameterDBTable.java
index 5487036e..b34d3124 100644
--- a/src/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -1,11 +1,11 @@
 package GlobalData.DVMParameter;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.DVMParameter.UI.DVMParameterFields;
 import GlobalData.GlobalDatabase;
 public class DVMParameterDBTable extends iDBTable<DVMParameter> {
diff --git a/src/GlobalData/EnvironmentValue/EnvironmentValue.java b/src/GlobalData/EnvironmentValue/EnvironmentValue.java
index ba54c3d8..6841bcba 100644
--- a/src/GlobalData/EnvironmentValue/EnvironmentValue.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValue.java
@@ -1,7 +1,7 @@
 package GlobalData.EnvironmentValue;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
 public class EnvironmentValue extends iDBObject {
     public String name = "";
diff --git a/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
index add43596..8079b5bf 100644
--- a/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -1,11 +1,11 @@
 package GlobalData.EnvironmentValue;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
 import GlobalData.GlobalDatabase;
 public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
diff --git a/src/GlobalData/GlobalDatabase.java b/src/GlobalData/GlobalDatabase.java
index 5ea4836b..27d962e6 100644
--- a/src/GlobalData/GlobalDatabase.java
+++ b/src/GlobalData/GlobalDatabase.java
@@ -2,7 +2,7 @@ package GlobalData;
 import Common.CurrentAnchestor;
 import Common.Database.VisualiserDatabase;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
 import GlobalData.Account.Account;
diff --git a/src/GlobalData/Machine/MachinesDBTable.java b/src/GlobalData/Machine/MachinesDBTable.java
index 678e42b6..31aec472 100644
--- a/src/GlobalData/Machine/MachinesDBTable.java
+++ b/src/GlobalData/Machine/MachinesDBTable.java
@@ -1,8 +1,8 @@
 package GlobalData.Machine;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
diff --git a/src/GlobalData/Machine/MachinesMenuBar.java b/src/GlobalData/Machine/MachinesMenuBar.java
index ef9384ec..d5ed8e51 100644
--- a/src/GlobalData/Machine/MachinesMenuBar.java
+++ b/src/GlobalData/Machine/MachinesMenuBar.java
@@ -1,6 +1,6 @@
 package GlobalData.Machine;
 import Common.Visual.Menus.DataMenuBar;
-import Common_old.UI.Menus_2023.MenuBarButton;
+import Common.Visual.Controls.MenuBarButton;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/GlobalData/Makefile/Makefile.java b/src/GlobalData/Makefile/Makefile.java
index c1fe0fd2..61331b62 100644
--- a/src/GlobalData/Makefile/Makefile.java
+++ b/src/GlobalData/Makefile/Makefile.java
@@ -1,8 +1,8 @@
 package GlobalData.Makefile;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Utils.TextLog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.Machine;
diff --git a/src/GlobalData/Makefile/MakefilesDBTable.java b/src/GlobalData/Makefile/MakefilesDBTable.java
index 9aa86217..11832450 100644
--- a/src/GlobalData/Makefile/MakefilesDBTable.java
+++ b/src/GlobalData/Makefile/MakefilesDBTable.java
@@ -1,5 +1,5 @@
 package GlobalData.Makefile;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
diff --git a/src/GlobalData/Module/Module.java b/src/GlobalData/Module/Module.java
index 4c2b21ca..617f45df 100644
--- a/src/GlobalData/Module/Module.java
+++ b/src/GlobalData/Module/Module.java
@@ -1,7 +1,7 @@
 package GlobalData.Module;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.Makefile.Makefile;
 import ProjectData.LanguageName;
 public class Module extends ModuleAnchestor {
diff --git a/src/GlobalData/Module/ModulesDBTable.java b/src/GlobalData/Module/ModulesDBTable.java
index 801692b4..35deffca 100644
--- a/src/GlobalData/Module/ModulesDBTable.java
+++ b/src/GlobalData/Module/ModulesDBTable.java
@@ -1,5 +1,5 @@
 package GlobalData.Module;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
diff --git a/src/GlobalData/Module/UI/ModuleAnchestorFields.java b/src/GlobalData/Module/UI/ModuleAnchestorFields.java
index bcf41f52..0c619d84 100644
--- a/src/GlobalData/Module/UI/ModuleAnchestorFields.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorFields.java
@@ -1,6 +1,6 @@
 package GlobalData.Module.UI;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Controls.StyledTextComboBox;
 import Common.Visual.Windows.Dialog.DialogFields;
 import GlobalData.Compiler.Compiler;
diff --git a/src/GlobalData/Module/UI/ModuleAnchestorForm.java b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
index 55f765e2..81bd3cb1 100644
--- a/src/GlobalData/Module/UI/ModuleAnchestorForm.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
@@ -1,7 +1,7 @@
 package GlobalData.Module.UI;
 import Common.CommonConstants;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java b/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
index 9f40e9ad..c5db89f2 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
@@ -2,7 +2,7 @@ package GlobalData.RemoteFile.UI;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Dialog;
 import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java b/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
index 13366057..e90c9cef 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
@@ -1,6 +1,6 @@
 package GlobalData.RemoteFile.UI;
 import Common.Visual.Trees.TreeForm;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java b/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java
index 65b6310a..3d22705e 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java
@@ -1,8 +1,8 @@
 package GlobalData.RemoteFile.UI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Trees.DataTree;
 import Common.Visual.Trees.TreeRenderers;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 public class RemoteFilesTree extends DataTree {
     public RemoteFilesTree() {
         super(UI.getRemoteFileChooser().root);
diff --git a/src/GlobalData/RunConfiguration/RunConfiguration.java b/src/GlobalData/RunConfiguration/RunConfiguration.java
index 919a4ded..0f60988b 100644
--- a/src/GlobalData/RunConfiguration/RunConfiguration.java
+++ b/src/GlobalData/RunConfiguration/RunConfiguration.java
@@ -1,7 +1,7 @@
 package GlobalData.RunConfiguration;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
 import Common.Utils.TextLog;
 import GlobalData.Compiler.Compiler;
diff --git a/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index f881bee0..fc904bcf 100644
--- a/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -2,7 +2,7 @@ package GlobalData.RunConfiguration;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
diff --git a/src/GlobalData/SapforProfile/SapforProfilesDBTable.java b/src/GlobalData/SapforProfile/SapforProfilesDBTable.java
index b505c67c..fee4b475 100644
--- a/src/GlobalData/SapforProfile/SapforProfilesDBTable.java
+++ b/src/GlobalData/SapforProfile/SapforProfilesDBTable.java
@@ -1,5 +1,5 @@
 package GlobalData.SapforProfile;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
diff --git a/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java b/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
index b222e72a..d6a6f01c 100644
--- a/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
+++ b/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
@@ -1,6 +1,6 @@
 package GlobalData.SapforProfileSetting;
 import Common.CommonConstants;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
 import GlobalData.Settings.SettingName;
 import com.sun.org.glassfish.gmbal.Description;
diff --git a/src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java b/src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
index 05d178d0..a9c9cf06 100644
--- a/src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
+++ b/src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
@@ -1,5 +1,5 @@
 package GlobalData.SapforProfileSetting;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting> {
diff --git a/src/GlobalData/Settings/DBSetting.java b/src/GlobalData/Settings/DBSetting.java
index 5492e877..9f87405a 100644
--- a/src/GlobalData/Settings/DBSetting.java
+++ b/src/GlobalData/Settings/DBSetting.java
@@ -1,7 +1,7 @@
 package GlobalData.Settings;
 import Common.Database.Objects.DBObject;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Menus_2023.StableMenuItem;
+import _VisualDVM.Visual.Menus.StableMenuItem;
 import Repository.Component.ComponentType;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/GlobalData/Settings/SettingsDBTable.java b/src/GlobalData/Settings/SettingsDBTable.java
index c038b470..543bc228 100644
--- a/src/GlobalData/Settings/SettingsDBTable.java
+++ b/src/GlobalData/Settings/SettingsDBTable.java
@@ -1,7 +1,7 @@
 package GlobalData.Settings;
 import Common.Database.Tables.DBTable;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Repository.Component.ComponentType;
 
 import java.util.Vector;
diff --git a/src/GlobalData/Tasks/CompilationTask/CompilationTask.java b/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
index 2ba9502f..4ca3d743 100644
--- a/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
+++ b/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
@@ -2,7 +2,7 @@ package GlobalData.Tasks.CompilationTask;
 import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import GlobalData.Makefile.Makefile;
diff --git a/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
index d25fc947..4bcbc17c 100644
--- a/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -1,8 +1,8 @@
 package GlobalData.Tasks.CompilationTask;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.TableMenu;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
diff --git a/src/GlobalData/Tasks/Passes/TaskLocalPass.java b/src/GlobalData/Tasks/Passes/TaskLocalPass.java
index e8678538..111aef15 100644
--- a/src/GlobalData/Tasks/Passes/TaskLocalPass.java
+++ b/src/GlobalData/Tasks/Passes/TaskLocalPass.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Passes;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import Visual_DVM_2021.Passes.ProcessPass;
 public abstract class TaskLocalPass<S extends TaskSupervisor> extends ProcessPass {
diff --git a/src/GlobalData/Tasks/RunTask/RunTask.java b/src/GlobalData/Tasks/RunTask/RunTask.java
index 9a9ce4e1..992943ca 100644
--- a/src/GlobalData/Tasks/RunTask/RunTask.java
+++ b/src/GlobalData/Tasks/RunTask/RunTask.java
@@ -2,11 +2,11 @@ package GlobalData.Tasks.RunTask;
 import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import Common.Utils.StringTemplate;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.RunConfiguration.RunConfiguration;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
diff --git a/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
index 8962c3fc..f2c9e875 100644
--- a/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -1,9 +1,9 @@
 package GlobalData.Tasks.RunTask;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.TableMenu;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
index 86ca0456..4985e19f 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Local.Linux;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Makefile.Makefile;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
 import GlobalData.Tasks.TaskState;
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java
index 59f37559..43b10a6c 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.Supervisor.Local.Linux;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.Tasks.RunTask.RunTask;
 
 import java.util.Map;
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
index 566ba29c..124a68ae 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
@@ -1,7 +1,7 @@
 package GlobalData.Tasks.Supervisor.Local.Linux;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Utils.Utils;
+import _VisualDVM.Constants;
+import _VisualDVM.Utils;
 import GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
diff --git a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
index 399c9f33..f00abbff 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
@@ -1,8 +1,8 @@
 package GlobalData.Tasks.Supervisor.Local;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Utils.Utils;
+import _VisualDVM.Constants;
+import _VisualDVM.Utils;
 import GlobalData.Tasks.RunTask.RunTask;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import GlobalData.Tasks.Task;
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
index 30c9aa2e..1869cf30 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Local.Windows;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.GlobalDatabase;
 import GlobalData.Makefile.Makefile;
 import GlobalData.Settings.SettingName;
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
index 3b453f26..1096ca4e 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.Supervisor.Local.Windows;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.Tasks.RunTask.RunTask;
 
 import java.util.Map;
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
index e2c117f9..b85f496f 100644
--- a/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Remote;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.QueueSystem.MVS;
 import GlobalData.Tasks.TaskState;
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
index cba5d70d..d72e79e5 100644
--- a/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Remote;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Makefile.Makefile;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
index bb165db4..49737ce0 100644
--- a/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Remote;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import GlobalData.Tasks.Task;
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
index 974ae18a..87ab942b 100644
--- a/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Remote;
-import Common_old.Current;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.RunTask.RunTask;
 import GlobalData.Tasks.TaskState;
diff --git a/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
index e5aca799..0c0361a3 100644
--- a/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Project.db_project_info;
diff --git a/src/GlobalData/Tasks/Task.java b/src/GlobalData/Tasks/Task.java
index affa2a66..ffc326a5 100644
--- a/src/GlobalData/Tasks/Task.java
+++ b/src/GlobalData/Tasks/Task.java
@@ -1,9 +1,9 @@
 package GlobalData.Tasks;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Database.Objects.iDBObject;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Machine.Machine;
 import GlobalData.User.User;
 import ProjectData.Project.db_project_info;
diff --git a/src/GlobalData/User/User.java b/src/GlobalData/User/User.java
index 70bf4ed2..c2a75136 100644
--- a/src/GlobalData/User/User.java
+++ b/src/GlobalData/User/User.java
@@ -1,6 +1,6 @@
 package GlobalData.User;
 import Common.CommonConstants;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
 import GlobalData.Machine.Machine;
 import TestingSystem.DVM.UserConnection;
diff --git a/src/GlobalData/User/UsersDBTable.java b/src/GlobalData/User/UsersDBTable.java
index a713ae79..39da317d 100644
--- a/src/GlobalData/User/UsersDBTable.java
+++ b/src/GlobalData/User/UsersDBTable.java
@@ -1,8 +1,8 @@
 package GlobalData.User;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Tables.TableRenderers;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
diff --git a/src/ProjectData/DBArray/ArraysDBTable.java b/src/ProjectData/DBArray/ArraysDBTable.java
index 5c1f23ec..bbf1f398 100644
--- a/src/ProjectData/DBArray/ArraysDBTable.java
+++ b/src/ProjectData/DBArray/ArraysDBTable.java
@@ -1,5 +1,5 @@
 package ProjectData.DBArray;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.DBTable;
 import Common.Visual.DataSetControlForm;
 public class ArraysDBTable extends DBTable<String, DBArray> {
diff --git a/src/ProjectData/Files/DBProjectFile.java b/src/ProjectData/Files/DBProjectFile.java
index 56eb4db2..6f95f973 100644
--- a/src/ProjectData/Files/DBProjectFile.java
+++ b/src/ProjectData/Files/DBProjectFile.java
@@ -1,8 +1,8 @@
 package ProjectData.Files;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Current;
-import Common_old.Utils.Utils;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
+import _VisualDVM.Utils;
 import ProjectData.GCOV.GCOV_info;
 import ProjectData.LanguageName;
 import ProjectData.Messages.Errors.MessageError;
diff --git a/src/ProjectData/Files/ProjectFile.java b/src/ProjectData/Files/ProjectFile.java
index 17831045..a4bd93ad 100644
--- a/src/ProjectData/Files/ProjectFile.java
+++ b/src/ProjectData/Files/ProjectFile.java
@@ -1,6 +1,6 @@
 package ProjectData.Files;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import ProjectData.LanguageName;
 
diff --git a/src/ProjectData/Files/UI/Editor/SPFEditor.java b/src/ProjectData/Files/UI/Editor/SPFEditor.java
index b21e4698..c4b18990 100644
--- a/src/ProjectData/Files/UI/Editor/SPFEditor.java
+++ b/src/ProjectData/Files/UI/Editor/SPFEditor.java
@@ -1,22 +1,22 @@
 package ProjectData.Files.UI.Editor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 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 _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileState;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
-import Common_old.UI.Menus.MainEditorMenu;
+import _VisualDVM.Visual.Menus.MainEditorMenu;
 import ProjectData.SapforData.Loops.Loop;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.SPFEditorInterface;
+import _VisualDVM.Visual.Interface.SPFEditorInterface;
 import javafx.util.Pair;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
 
diff --git a/src/ProjectData/Files/UI/FileGraphTree.java b/src/ProjectData/Files/UI/FileGraphTree.java
index 84cc0468..4b00d6ff 100644
--- a/src/ProjectData/Files/UI/FileGraphTree.java
+++ b/src/ProjectData/Files/UI/FileGraphTree.java
@@ -1,6 +1,6 @@
 package ProjectData.Files.UI;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Trees.DataTree;
 import Common.Visual.Trees.TreeRenderers;
 import ProjectData.SapforData.FileObject;
diff --git a/src/ProjectData/Files/UI/FilesHyperlinksPanel.java b/src/ProjectData/Files/UI/FilesHyperlinksPanel.java
index 35ff486a..773cdf04 100644
--- a/src/ProjectData/Files/UI/FilesHyperlinksPanel.java
+++ b/src/ProjectData/Files/UI/FilesHyperlinksPanel.java
@@ -1,7 +1,7 @@
 package ProjectData.Files.UI;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/ProjectData/Files/UI/FilesTree.java b/src/ProjectData/Files/UI/FilesTree.java
index a8e8dfb6..3472d6ad 100644
--- a/src/ProjectData/Files/UI/FilesTree.java
+++ b/src/ProjectData/Files/UI/FilesTree.java
@@ -1,11 +1,11 @@
 package ProjectData.Files.UI;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import Common.Visual.DragDrop.FileDrop;
-import Common_old.UI.Menus.GraphMenu;
-import Common_old.UI.Menus.ProjectFilesMenu;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.Menus.GraphMenu;
+import _VisualDVM.Visual.Menus.ProjectFilesMenu;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Trees.StyledTree;
 import Common.Visual.Trees.TreeRenderers;
 import ProjectData.Files.DBProjectFile;
diff --git a/src/ProjectData/Messages/Errors/ErrorsDBTable.java b/src/ProjectData/Messages/Errors/ErrorsDBTable.java
index 6afa3e8a..97a52c03 100644
--- a/src/ProjectData/Messages/Errors/ErrorsDBTable.java
+++ b/src/ProjectData/Messages/Errors/ErrorsDBTable.java
@@ -1,5 +1,5 @@
 package ProjectData.Messages.Errors;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Messages.MessagesDBTable;
 public class ErrorsDBTable extends MessagesDBTable<MessageError> {
     public ErrorsDBTable() {
diff --git a/src/ProjectData/Messages/Message.java b/src/ProjectData/Messages/Message.java
index b470555c..8697ed5e 100644
--- a/src/ProjectData/Messages/Message.java
+++ b/src/ProjectData/Messages/Message.java
@@ -2,8 +2,8 @@ package ProjectData.Messages;
 import Common.CurrentAnchestor;
 import Common.Mode;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.FileObject;
diff --git a/src/ProjectData/Messages/MessagesDBTable.java b/src/ProjectData/Messages/MessagesDBTable.java
index 2f2694d6..fb9471a3 100644
--- a/src/ProjectData/Messages/MessagesDBTable.java
+++ b/src/ProjectData/Messages/MessagesDBTable.java
@@ -1,5 +1,5 @@
 package ProjectData.Messages;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.DataSet;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
diff --git a/src/ProjectData/Messages/Notes/NotesDBTable.java b/src/ProjectData/Messages/Notes/NotesDBTable.java
index 2be8d09a..28ecaa0d 100644
--- a/src/ProjectData/Messages/Notes/NotesDBTable.java
+++ b/src/ProjectData/Messages/Notes/NotesDBTable.java
@@ -1,5 +1,5 @@
 package ProjectData.Messages.Notes;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Messages.MessagesDBTable;
 public class NotesDBTable extends MessagesDBTable<MessageNote> {
     public NotesDBTable() {
diff --git a/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java b/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
index 2c1d53d1..55d808d3 100644
--- a/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
+++ b/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
@@ -1,5 +1,5 @@
 package ProjectData.Messages.Recommendations;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Tables.TableRenderers;
diff --git a/src/ProjectData/Messages/Warnings/WarningsDBTable.java b/src/ProjectData/Messages/Warnings/WarningsDBTable.java
index 43942a08..b7d9d174 100644
--- a/src/ProjectData/Messages/Warnings/WarningsDBTable.java
+++ b/src/ProjectData/Messages/Warnings/WarningsDBTable.java
@@ -1,5 +1,5 @@
 package ProjectData.Messages.Warnings;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Messages.MessagesDBTable;
 public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
     //https://stackoverflow.com/questions/13079777/editable-jtableheader
diff --git a/src/ProjectData/Project/UI/VersionsTree.java b/src/ProjectData/Project/UI/VersionsTree.java
index 62ed2285..37d421a8 100644
--- a/src/ProjectData/Project/UI/VersionsTree.java
+++ b/src/ProjectData/Project/UI/VersionsTree.java
@@ -1,9 +1,9 @@
 package ProjectData.Project.UI;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.Menus.GraphMenu;
-import Common_old.UI.Menus.VersionsMenu;
+import _VisualDVM.Visual.Menus.GraphMenu;
+import _VisualDVM.Visual.Menus.VersionsMenu;
 import Common.Visual.Selectable;
 import Common.Visual.Trees.DataTree;
 import Common.Visual.Trees.TreeRenderers;
diff --git a/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java b/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
index 0a4c342e..b2ef4194 100644
--- a/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
+++ b/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
@@ -1,6 +1,6 @@
 package ProjectData.Project.UI;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import Common.Visual.Selectable;
 import Common.Visual.Fonts.VisualiserFonts;
diff --git a/src/ProjectData/Project/db_project_info.java b/src/ProjectData/Project/db_project_info.java
index b9ac0200..73a38654 100644
--- a/src/ProjectData/Project/db_project_info.java
+++ b/src/ProjectData/Project/db_project_info.java
@@ -3,15 +3,15 @@ import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Common.Utils.Index;
 import Common.Utils.TextLog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.DBLastProject.DBLastProject;
 import GlobalData.Settings.SettingName;
 import ProjectData.DBArray.DBArray;
diff --git a/src/ProjectData/SapforData/Arrays/ArraysSet.java b/src/ProjectData/SapforData/Arrays/ArraysSet.java
index ab09a72a..fd8763d3 100644
--- a/src/ProjectData/SapforData/Arrays/ArraysSet.java
+++ b/src/ProjectData/SapforData/Arrays/ArraysSet.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Arrays;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import GlobalData.GlobalDatabase;
diff --git a/src/ProjectData/SapforData/Arrays/ProjectArray.java b/src/ProjectData/SapforData/Arrays/ProjectArray.java
index f890b563..a143836c 100644
--- a/src/ProjectData/SapforData/Arrays/ProjectArray.java
+++ b/src/ProjectData/SapforData/Arrays/ProjectArray.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Arrays;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
 import ProjectData.DBArray.DBArray;
diff --git a/src/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java b/src/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java
index 55e5f0bd..2e27ea8b 100644
--- a/src/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java
+++ b/src/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Arrays.Templates;
-import Common_old.Current;
+import _VisualDVM.Current;
 public enum TemplateDimensionState {
     multiplied, //0
     distributed; //1
diff --git a/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java b/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
index c84ff977..641173ea 100644
--- a/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
@@ -2,7 +2,7 @@ package ProjectData.SapforData.Arrays.UI;
 import Common.Visual.CommonUI;
 import Common.Visual.Tables.DBObjectEditor;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
 import javax.swing.*;
diff --git a/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java b/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
index d520ff26..0a91542a 100644
--- a/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
@@ -1,10 +1,10 @@
 package ProjectData.SapforData.Arrays.UI;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.ControlForm;
 import Common.Visual.Tables.Grid.GridAnchestor;
 import Common.Visual.Tables.StyledTable;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.SapforData.Arrays.ProjectArray;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
diff --git a/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java b/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
index 9b27bb1d..6d701e27 100644
--- a/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common_old.UI.Menus.GraphMenu;
+import _VisualDVM.Visual.Menus.GraphMenu;
 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/FileArraysTree.java b/src/ProjectData/SapforData/Arrays/UI/FileArraysTree.java
index 4989b8c4..c9f995d8 100644
--- a/src/ProjectData/SapforData/Arrays/UI/FileArraysTree.java
+++ b/src/ProjectData/SapforData/Arrays/UI/FileArraysTree.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Files.UI.FileGraphTree;
 public class FileArraysTree extends FileGraphTree {
     public FileArraysTree() {
diff --git a/src/ProjectData/SapforData/Arrays/UI/RulesTree.java b/src/ProjectData/SapforData/Arrays/UI/RulesTree.java
index 17158cd4..22debce5 100644
--- a/src/ProjectData/SapforData/Arrays/UI/RulesTree.java
+++ b/src/ProjectData/SapforData/Arrays/UI/RulesTree.java
@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Arrays.UI;
 import Common.CurrentAnchestor;
-import Common_old.Current;
-import Common_old.UI.Menus.GraphMenu;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.GraphMenu;
 import Common.Visual.Trees.StyledTree;
 import Common.Visual.Trees.TreeRenderers;
 import ProjectData.SapforData.Regions.ParallelRegion;
diff --git a/src/ProjectData/SapforData/FileObject.java b/src/ProjectData/SapforData/FileObject.java
index 246fb929..0e96cfdd 100644
--- a/src/ProjectData/SapforData/FileObject.java
+++ b/src/ProjectData/SapforData/FileObject.java
@@ -1,8 +1,8 @@
 package ProjectData.SapforData;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.DBProjectFile;
 import com.sun.org.glassfish.gmbal.Description;
 //объект принадлежащий файлу и относящийся к его строке.
diff --git a/src/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java b/src/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java
index 91c3ebd6..088a881b 100644
--- a/src/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java
+++ b/src/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Functions.UI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Files.UI.FileGraphTree;
 public class FileFunctionsTree extends FileGraphTree {
     public FileFunctionsTree() {
diff --git a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
index 95ba5cfb..e58e629e 100644
--- a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions.UI.Graph;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.ControlForm;
 import com.mxgraph.swing.mxGraphComponent;
 
diff --git a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
index bed84a76..98edbeaa 100644
--- a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
@@ -1,10 +1,10 @@
 package ProjectData.SapforData.Functions.UI.Graph;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Menus.VisualiserMenuItem;
 import Common.Visual.Menus.StyledPopupMenu;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
index 39612d7c..eae5e52d 100644
--- a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
@@ -2,7 +2,7 @@ package ProjectData.SapforData.Functions.UI.Graph;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.SapforData.Functions.FuncCoordinates;
 import ProjectData.SapforData.Functions.FuncInfo;
 import ProjectData.SapforData.Functions.FunctionType;
diff --git a/src/ProjectData/SapforData/Functions/UI/InlineMenu.java b/src/ProjectData/SapforData/Functions/UI/InlineMenu.java
index 9383bba8..36a7b13e 100644
--- a/src/ProjectData/SapforData/Functions/UI/InlineMenu.java
+++ b/src/ProjectData/SapforData/Functions/UI/InlineMenu.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions.UI;
-import Common_old.Current;
-import Common_old.UI.Menus.SelectionTreeMenu;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.SelectionTreeMenu;
 import Common.Visual.Trees.SelectableTree;
 import ProjectData.SapforData.Functions.FuncInfo;
 public class InlineMenu extends SelectionTreeMenu {
diff --git a/src/ProjectData/SapforData/Functions/UI/InlineMenu2.java b/src/ProjectData/SapforData/Functions/UI/InlineMenu2.java
index 75c6546c..cad2c140 100644
--- a/src/ProjectData/SapforData/Functions/UI/InlineMenu2.java
+++ b/src/ProjectData/SapforData/Functions/UI/InlineMenu2.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Functions.UI;
-import Common_old.UI.Menus.SelectionTreeMenu;
+import _VisualDVM.Visual.Menus.SelectionTreeMenu;
 import Common.Visual.Trees.SelectableTree;
 import ProjectData.SapforData.Functions.FuncCallH;
 
diff --git a/src/ProjectData/SapforData/Functions/UI/InlineTree.java b/src/ProjectData/SapforData/Functions/UI/InlineTree.java
index 60422dd4..60b4cd9f 100644
--- a/src/ProjectData/SapforData/Functions/UI/InlineTree.java
+++ b/src/ProjectData/SapforData/Functions/UI/InlineTree.java
@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Functions.UI;
 import Common.CurrentAnchestor;
-import Common_old.Current;
-import Common_old.UI.Menus.GraphMenu;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.GraphMenu;
 import Common.Visual.Trees.SelectableTree;
 import Common.Visual.Trees.TreeRenderers;
 import ProjectData.SapforData.FileObject;
diff --git a/src/ProjectData/SapforData/Functions/UI/InlineTree2.java b/src/ProjectData/SapforData/Functions/UI/InlineTree2.java
index 8c3b0116..6941b98b 100644
--- a/src/ProjectData/SapforData/Functions/UI/InlineTree2.java
+++ b/src/ProjectData/SapforData/Functions/UI/InlineTree2.java
@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Functions.UI;
 import Common.CurrentAnchestor;
-import Common_old.Current;
-import Common_old.UI.Menus.GraphMenu;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.GraphMenu;
 import Common.Visual.Trees.SelectableTree;
 import Common.Visual.Trees.TreeRenderers;
 import ProjectData.SapforData.FileObject;
diff --git a/src/ProjectData/SapforData/Includes/UI/IncludesMenu.java b/src/ProjectData/SapforData/Includes/UI/IncludesMenu.java
index 1438187d..f34a43b4 100644
--- a/src/ProjectData/SapforData/Includes/UI/IncludesMenu.java
+++ b/src/ProjectData/SapforData/Includes/UI/IncludesMenu.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Includes.UI;
-import Common_old.Current;
-import Common_old.UI.Menus.SelectionTreeMenu;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.SelectionTreeMenu;
 import Common.Visual.Trees.SelectableTree;
 import ProjectData.SapforData.Includes.FileInfo;
 public class IncludesMenu extends SelectionTreeMenu {
diff --git a/src/ProjectData/SapforData/Includes/UI/IncludesTree.java b/src/ProjectData/SapforData/Includes/UI/IncludesTree.java
index 6719acba..b3ebca3c 100644
--- a/src/ProjectData/SapforData/Includes/UI/IncludesTree.java
+++ b/src/ProjectData/SapforData/Includes/UI/IncludesTree.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Includes.UI;
-import Common_old.Current;
-import Common_old.UI.Menus.GraphMenu;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.GraphMenu;
 import Common.Visual.Trees.SelectableTree;
 import Common.Visual.Trees.TreeRenderers;
 public class IncludesTree extends SelectableTree {
diff --git a/src/ProjectData/SapforData/Loops/LoopState.java b/src/ProjectData/SapforData/Loops/LoopState.java
index eecb548c..a732c747 100644
--- a/src/ProjectData/SapforData/Loops/LoopState.java
+++ b/src/ProjectData/SapforData/Loops/LoopState.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Loops;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 
 import javax.swing.text.Highlighter;
 public enum LoopState {
diff --git a/src/ProjectData/SapforData/Loops/UI/FileLoopsTree.java b/src/ProjectData/SapforData/Loops/UI/FileLoopsTree.java
index ce38e1b6..5f147609 100644
--- a/src/ProjectData/SapforData/Loops/UI/FileLoopsTree.java
+++ b/src/ProjectData/SapforData/Loops/UI/FileLoopsTree.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops.UI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Files.UI.FileGraphTree;
 public class FileLoopsTree extends FileGraphTree {
     public FileLoopsTree() {
diff --git a/src/ProjectData/SapforData/Regions/ParallelRegion.java b/src/ProjectData/SapforData/Regions/ParallelRegion.java
index cf92c329..5bad38eb 100644
--- a/src/ProjectData/SapforData/Regions/ParallelRegion.java
+++ b/src/ProjectData/SapforData/Regions/ParallelRegion.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Regions;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
 import ProjectData.Files.DBProjectFile;
diff --git a/src/ProjectData/SapforData/Regions/RegionsSet.java b/src/ProjectData/SapforData/Regions/RegionsSet.java
index 43402c35..a2cb2891 100644
--- a/src/ProjectData/SapforData/Regions/RegionsSet.java
+++ b/src/ProjectData/SapforData/Regions/RegionsSet.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Regions;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 
diff --git a/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java b/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
index 206fa2e4..635e757a 100644
--- a/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
+++ b/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Regions.UI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Tables.StyledCellLabel;
 import ProjectData.SapforData.Arrays.ProjectArray;
 import javafx.util.Pair;
diff --git a/src/ProjectData/SapforData/Variants/ParallelVariant.java b/src/ProjectData/SapforData/Variants/ParallelVariant.java
index 59b4b05d..a3ebb144 100644
--- a/src/ProjectData/SapforData/Variants/ParallelVariant.java
+++ b/src/ProjectData/SapforData/Variants/ParallelVariant.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Variants;
 import Common.Database.Objects.DBObject;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.PredictorStatistic.PredictorStatistics_2021;
 import ProjectData.Project.db_project_info;
 import ProjectData.SapforData.Arrays.ProjectArray;
diff --git a/src/ProjectData/SapforData/Variants/VariantsSet.java b/src/ProjectData/SapforData/Variants/VariantsSet.java
index 14947126..afc930a2 100644
--- a/src/ProjectData/SapforData/Variants/VariantsSet.java
+++ b/src/ProjectData/SapforData/Variants/VariantsSet.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Variants;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 
diff --git a/src/Repository/BugReport/BugReport.java b/src/Repository/BugReport/BugReport.java
index 1e208972..81751325 100644
--- a/src/Repository/BugReport/BugReport.java
+++ b/src/Repository/BugReport/BugReport.java
@@ -1,6 +1,6 @@
 package Repository.BugReport;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.rDBObject;
 import GlobalData.GlobalDatabase;
diff --git a/src/Repository/BugReport/BugReportInterface.java b/src/Repository/BugReport/BugReportInterface.java
index f01dc348..ddf24cef 100644
--- a/src/Repository/BugReport/BugReportInterface.java
+++ b/src/Repository/BugReport/BugReportInterface.java
@@ -1,6 +1,6 @@
 package Repository.BugReport;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import Common.Utils.TextLog;
 import Repository.RepositoryServer;
diff --git a/src/Repository/BugReport/BugReportsDBTable.java b/src/Repository/BugReport/BugReportsDBTable.java
index 25210cfe..b0ebb348 100644
--- a/src/Repository/BugReport/BugReportsDBTable.java
+++ b/src/Repository/BugReport/BugReportsDBTable.java
@@ -1,8 +1,8 @@
 package Repository.BugReport;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.DBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Repository/Component/Component.java b/src/Repository/Component/Component.java
index 29becdc2..9e5626ea 100644
--- a/src/Repository/Component/Component.java
+++ b/src/Repository/Component/Component.java
@@ -1,12 +1,12 @@
 package Repository.Component;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.VFileChooser;
 import Common.Utils.TextLog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Visual_DVM_2021.Passes.PassException;
 import Common.Utils.Loggable;
 
diff --git a/src/Repository/Component/ComponentsMenuBar.java b/src/Repository/Component/ComponentsMenuBar.java
index 3b4f8337..2cbcf53a 100644
--- a/src/Repository/Component/ComponentsMenuBar.java
+++ b/src/Repository/Component/ComponentsMenuBar.java
@@ -1,7 +1,7 @@
 package Repository.Component;
 import Common.Visual.CommonUI;
 import Common.Visual.Menus.DataMenuBar;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Repository/Component/ComponentsSet.java b/src/Repository/Component/ComponentsSet.java
index ffd3dd9d..76cb4efb 100644
--- a/src/Repository/Component/ComponentsSet.java
+++ b/src/Repository/Component/ComponentsSet.java
@@ -1,5 +1,5 @@
 package Repository.Component;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 
diff --git a/src/Repository/Component/Instruction.java b/src/Repository/Component/Instruction.java
index 915fd772..dbee01f9 100644
--- a/src/Repository/Component/Instruction.java
+++ b/src/Repository/Component/Instruction.java
@@ -1,6 +1,6 @@
 package Repository.Component;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java b/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
index 3f0af2d0..f86c680c 100644
--- a/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
+++ b/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
@@ -1,10 +1,10 @@
 package Repository.Component.PerformanceAnalyzer;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import analyzer.common.MessageJtoJ;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Repository.Component.Component;
 import Repository.Component.ComponentType;
 
diff --git a/src/Repository/Component/Sapfor/MessagesServer.java b/src/Repository/Component/Sapfor/MessagesServer.java
index 766cb6b7..97acf7ee 100644
--- a/src/Repository/Component/Sapfor/MessagesServer.java
+++ b/src/Repository/Component/Sapfor/MessagesServer.java
@@ -1,6 +1,6 @@
 package Repository.Component.Sapfor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
diff --git a/src/Repository/Component/Sapfor/Sapfor.java b/src/Repository/Component/Sapfor/Sapfor.java
index 94c567c5..c00bef96 100644
--- a/src/Repository/Component/Sapfor/Sapfor.java
+++ b/src/Repository/Component/Sapfor/Sapfor.java
@@ -2,12 +2,12 @@ package Repository.Component.Sapfor;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.LanguageStyle;
diff --git a/src/Repository/Component/Visualizer_2.java b/src/Repository/Component/Visualizer_2.java
index d669abc6..cd340db1 100644
--- a/src/Repository/Component/Visualizer_2.java
+++ b/src/Repository/Component/Visualizer_2.java
@@ -2,7 +2,7 @@ package Repository.Component;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Visual_DVM_2021.Passes.PassException;
 
 import java.io.BufferedReader;
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index 3edb161c..04899675 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -1,11 +1,11 @@
 package Repository;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Database;
 import _VisualDVM.Global;
 import Common.Utils.InterruptThread;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Repository.Server.DiagnosticSignalHandler;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/Repository/Server/ComponentsServer.java b/src/Repository/Server/ComponentsServer.java
index faf35be0..50be27f7 100644
--- a/src/Repository/Server/ComponentsServer.java
+++ b/src/Repository/Server/ComponentsServer.java
@@ -2,7 +2,7 @@ package Repository.Server;
 import Common.Database.Objects.DBObject;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Account.Account;
 import GlobalData.Machine.Machine;
 import GlobalData.Machine.MachineType;
diff --git a/src/Repository/SubscriberWorkspace/SubscriberWorkspace.java b/src/Repository/SubscriberWorkspace/SubscriberWorkspace.java
index 3ab36a2e..917e9ff7 100644
--- a/src/Repository/SubscriberWorkspace/SubscriberWorkspace.java
+++ b/src/Repository/SubscriberWorkspace/SubscriberWorkspace.java
@@ -1,5 +1,5 @@
 package Repository.SubscriberWorkspace;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
 public class SubscriberWorkspace extends iDBObject {
     public String email; //почта
diff --git a/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java b/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
index bb256fb4..8bd47f42 100644
--- a/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
+++ b/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
@@ -1,5 +1,5 @@
 package Repository.SubscriberWorkspace;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
diff --git a/src/Repository/Subscribes/SubsribersDBTable.java b/src/Repository/Subscribes/SubsribersDBTable.java
index 53ac093b..9075ba98 100644
--- a/src/Repository/Subscribes/SubsribersDBTable.java
+++ b/src/Repository/Subscribes/SubsribersDBTable.java
@@ -1,5 +1,5 @@
 package Repository.Subscribes;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
diff --git a/src/TestingSystem/Common/Group/Group.java b/src/TestingSystem/Common/Group/Group.java
index 19e395a6..8543e0d8 100644
--- a/src/TestingSystem/Common/Group/Group.java
+++ b/src/TestingSystem/Common/Group/Group.java
@@ -1,12 +1,12 @@
 package TestingSystem.Common.Group;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import ProjectData.Files.ProjectFile;
 import ProjectData.LanguageName;
 import TestingSystem.Common.Test.Test;
diff --git a/src/TestingSystem/Common/Group/GroupsDBTable.java b/src/TestingSystem/Common/Group/GroupsDBTable.java
index f7e2db85..aee2bdf4 100644
--- a/src/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/TestingSystem/Common/Group/GroupsDBTable.java
@@ -1,6 +1,6 @@
 package TestingSystem.Common.Group;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
diff --git a/src/TestingSystem/Common/Group/GroupsMenuBar.java b/src/TestingSystem/Common/Group/GroupsMenuBar.java
index 516074db..9798f74a 100644
--- a/src/TestingSystem/Common/Group/GroupsMenuBar.java
+++ b/src/TestingSystem/Common/Group/GroupsMenuBar.java
@@ -2,7 +2,7 @@ package TestingSystem.Common.Group;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common.Visual.Menus.DataMenuBar;
-import Common_old.UI.Menus_2023.MenuBarButton;
+import Common.Visual.Controls.MenuBarButton;
 import TestingSystem.Common.Group.UI.AddGroupMenu;
 import TestingSystem.Common.Group.UI.EditGroupMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/Common/Group/UI/AddGroupMenu.java b/src/TestingSystem/Common/Group/UI/AddGroupMenu.java
index 68723988..8a6b9845 100644
--- a/src/TestingSystem/Common/Group/UI/AddGroupMenu.java
+++ b/src/TestingSystem/Common/Group/UI/AddGroupMenu.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common.Group.UI;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class AddGroupMenu extends VisualiserMenu {
     public AddGroupMenu() {
diff --git a/src/TestingSystem/Common/Group/UI/EditGroupMenu.java b/src/TestingSystem/Common/Group/UI/EditGroupMenu.java
index daffaecd..6e8a961f 100644
--- a/src/TestingSystem/Common/Group/UI/EditGroupMenu.java
+++ b/src/TestingSystem/Common/Group/UI/EditGroupMenu.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common.Group.UI;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EditGroupMenu extends VisualiserMenu {
     public EditGroupMenu() {
diff --git a/src/TestingSystem/Common/MachineProcess/MachineProcess.java b/src/TestingSystem/Common/MachineProcess/MachineProcess.java
index 009942b8..80534893 100644
--- a/src/TestingSystem/Common/MachineProcess/MachineProcess.java
+++ b/src/TestingSystem/Common/MachineProcess/MachineProcess.java
@@ -3,9 +3,9 @@ import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Mode;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.GlobalProperties;
-import Common_old.Utils.Utils;
+import _VisualDVM.Constants;
+import _VisualDVM.GlobalProperties;
+import _VisualDVM.Utils;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.Global;
 import org.apache.commons.io.FileUtils;
diff --git a/src/TestingSystem/Common/Test/Test.java b/src/TestingSystem/Common/Test/Test.java
index 22836d54..2588dda7 100644
--- a/src/TestingSystem/Common/Test/Test.java
+++ b/src/TestingSystem/Common/Test/Test.java
@@ -2,11 +2,11 @@ package TestingSystem.Common.Test;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.FileState;
 import ProjectData.Files.FileType;
 import ProjectData.Files.ProjectFile;
diff --git a/src/TestingSystem/Common/Test/TestDBTable.java b/src/TestingSystem/Common/Test/TestDBTable.java
index 0053ab73..42304e44 100644
--- a/src/TestingSystem/Common/Test/TestDBTable.java
+++ b/src/TestingSystem/Common/Test/TestDBTable.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common.Test;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
diff --git a/src/TestingSystem/Common/Test/UI/AddTestMenu.java b/src/TestingSystem/Common/Test/UI/AddTestMenu.java
index a1de24c9..b0861c3e 100644
--- a/src/TestingSystem/Common/Test/UI/AddTestMenu.java
+++ b/src/TestingSystem/Common/Test/UI/AddTestMenu.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common.Test.UI;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class AddTestMenu extends VisualiserMenu {
diff --git a/src/TestingSystem/Common/Test/UI/EditTestMenu.java b/src/TestingSystem/Common/Test/UI/EditTestMenu.java
index 20792e98..d79fdb89 100644
--- a/src/TestingSystem/Common/Test/UI/EditTestMenu.java
+++ b/src/TestingSystem/Common/Test/UI/EditTestMenu.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common.Test.UI;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class EditTestMenu extends VisualiserMenu {
diff --git a/src/TestingSystem/Common/TestingBar.java b/src/TestingSystem/Common/TestingBar.java
index a7cb2489..c2c960f1 100644
--- a/src/TestingSystem/Common/TestingBar.java
+++ b/src/TestingSystem/Common/TestingBar.java
@@ -2,8 +2,8 @@ package TestingSystem.Common;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.MenuBarButton;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import Common.Visual.Controls.MenuBarButton;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index e289bae5..905e07d2 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -1,6 +1,6 @@
 package TestingSystem.Common.TestingPackage;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import TestingSystem.Common.Configuration.Configuration;
diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
index 0055292e..b1036857 100644
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -1,9 +1,9 @@
 package TestingSystem.Common;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Machine.Machine;
 import GlobalData.Machine.MachineType;
 import GlobalData.User.User;
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index 3e7c03a3..1a236ad6 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -1,11 +1,11 @@
 package TestingSystem.Common;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
 import Common.Utils.TextLog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Account.Account;
 import ProjectData.LanguageName;
 import Repository.Component.Sapfor.Sapfor;
diff --git a/src/TestingSystem/Common/TestsDatabase.java b/src/TestingSystem/Common/TestsDatabase.java
index 59777998..81deadbf 100644
--- a/src/TestingSystem/Common/TestsDatabase.java
+++ b/src/TestingSystem/Common/TestsDatabase.java
@@ -1,11 +1,11 @@
 package TestingSystem.Common;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Database.SQLITE.SQLiteDatabase;
 import _VisualDVM.Global;
 import Common.Utils.TextLog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Account.Account;
 import Repository.Component.Sapfor.Sapfor;
 import Repository.RepositoryRefuseException;
diff --git a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index 1620f724..9467cfca 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMConfiguration;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
diff --git a/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java b/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
index a83a1460..8e28dfd3 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMConfiguration.UI;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
index 7a831ae1..07008c05 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -1,6 +1,6 @@
 package TestingSystem.DVM.DVMPackage;
 import Common.CommonConstants;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
 import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 94417d4d..11b6d91c 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -1,9 +1,9 @@
 package TestingSystem.DVM.DVMPackage;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import _VisualDVM.Global;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import _VisualDVM.ServerObjectsCache.PackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
index ccdec79e..e41b8bb4 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
@@ -2,7 +2,7 @@ package TestingSystem.DVM.DVMPackage;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common.Visual.Menus.DataMenuBar;
-import Common_old.UI.Menus_2023.MenuBarButton;
+import Common.Visual.Controls.MenuBarButton;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
diff --git a/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java b/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
index c7091c6d..729a0587 100644
--- a/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
+++ b/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMSettings;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
diff --git a/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java b/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
index 73d0c631..53fb9322 100644
--- a/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
+++ b/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMSettings.UI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java b/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
index 8a791fe4..c95bf91c 100644
--- a/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
@@ -1,9 +1,9 @@
 package TestingSystem.DVM.DVMTasks;
 import Common.CommonConstants;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Tasks.TaskState;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index df373fec..1fdef7e7 100644
--- a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMTasks;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DBObjectFilter;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetFilter;
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMTask.java b/src/TestingSystem/DVM/DVMTasks/DVMTask.java
index abaa4e3a..789f74bd 100644
--- a/src/TestingSystem/DVM/DVMTasks/DVMTask.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMTask.java
@@ -1,6 +1,6 @@
 package TestingSystem.DVM.DVMTasks;
 import Common.CommonConstants;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.Global;
diff --git a/src/TestingSystem/DVM/DVMTestingPlanner.java b/src/TestingSystem/DVM/DVMTestingPlanner.java
index 13f86f4d..3561210b 100644
--- a/src/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/DVMTestingPlanner.java
@@ -1,7 +1,7 @@
 package TestingSystem.DVM;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Files.ProjectFile;
 import ProjectData.LanguageName;
diff --git a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 2d678fda..c2f399ac 100644
--- a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -1,8 +1,8 @@
 package TestingSystem.DVM;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.TaskState;
 import TestingSystem.Common.TasksPackageState;
diff --git a/src/TestingSystem/DVM/UserConnection.java b/src/TestingSystem/DVM/UserConnection.java
index 7c0a4d76..195a45bc 100644
--- a/src/TestingSystem/DVM/UserConnection.java
+++ b/src/TestingSystem/DVM/UserConnection.java
@@ -1,8 +1,8 @@
 package TestingSystem.DVM;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Utils.Utils;
+import _VisualDVM.Constants;
+import _VisualDVM.Utils;
 import GlobalData.Machine.Machine;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.User.User;
diff --git a/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
index f474c560..2cf359e4 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
@@ -1,8 +1,8 @@
 package TestingSystem.SAPFOR.Json;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Utils.Utils;
+import _VisualDVM.Constants;
+import _VisualDVM.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
 import ProjectData.Files.ProjectFile;
diff --git a/src/TestingSystem/SAPFOR/PackageModeSupervisor.java b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
index 1595af57..2f8634e8 100644
--- a/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
+++ b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
@@ -1,7 +1,7 @@
 package TestingSystem.SAPFOR;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Utils.Utils;
+import _VisualDVM.Constants;
+import _VisualDVM.Utils;
 import TestingSystem.Common.TaskThread;
 import TestingSystem.Common.ThreadsPlanner.ThreadsPlanner;
 import TestingSystem.SAPFOR.Json.SapforPackage_json;
diff --git a/src/TestingSystem/SAPFOR/PerformSapforTask.java b/src/TestingSystem/SAPFOR/PerformSapforTask.java
index e4e29ea0..fb88254c 100644
--- a/src/TestingSystem/SAPFOR/PerformSapforTask.java
+++ b/src/TestingSystem/SAPFOR/PerformSapforTask.java
@@ -1,7 +1,7 @@
 package TestingSystem.SAPFOR;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Utils.Utils;
+import _VisualDVM.Constants;
+import _VisualDVM.Utils;
 import GlobalData.Tasks.TaskState;
 import Repository.Component.Sapfor.Sapfor;
 import TestingSystem.SAPFOR.Json.SapforVersion_json;
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 3261f7ed..d10f47a0 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforConfiguration;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Tables.TableEditors;
 import Common.Visual.Tables.TableRenderers;
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
index 31a0ec3c..31b0afd4 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforConfiguration.UI;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
index 1be0f468..da9d39ba 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
@@ -1,12 +1,12 @@
 package TestingSystem.SAPFOR.SapforPackage;
 import Common.CommonConstants;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Common.Utils.TextLog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Account.Account;
 import GlobalData.Tasks.TaskState;
 import TestingSystem.Common.TasksPackageState;
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index d7791db3..ab2e8ad2 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforPackage;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import _VisualDVM.ServerObjectsCache.PackageCache;
diff --git a/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java b/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
index fd97ee5b..52b44468 100644
--- a/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
@@ -1,6 +1,6 @@
 package TestingSystem.SAPFOR.SapforSettings;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
diff --git a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
index 24d2410b..d6985fc7 100644
--- a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
+++ b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
@@ -1,6 +1,6 @@
 package TestingSystem.SAPFOR.SapforSettingsCommand;
 import Common.CommonConstants;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
index 020b972f..2365cffd 100644
--- a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
@@ -1,6 +1,6 @@
 package TestingSystem.SAPFOR.SapforSettingsCommand;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java
index 773f41c6..91073b5c 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforTasksPackage.UI;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 public class AddSapforPackageMenu extends VisualiserMenu {
     public AddSapforPackageMenu() {
         super("", "/icons/RedAdd.png");
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
index 5b469590..971c5fdb 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
@@ -2,7 +2,7 @@ package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common.Visual.Menus.DataMenuBar;
-import Common_old.UI.Menus_2023.MenuBarButton;
+import Common.Visual.Controls.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 e0f21c94..dcc1b2eb 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
@@ -1,9 +1,9 @@
 package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Trees.DataTree;
 import Common.Visual.Trees.TreeRenderers;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import TestingSystem.SAPFOR.Json.SapforVersion_json;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
index 682d1f9a..787405b3 100644
--- a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -2,9 +2,9 @@ package TestingSystem.SAPFOR;
 import Common.CommonConstants;
 import Common.Mode;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.GlobalProperties;
-import Common_old.Utils.Utils;
+import _VisualDVM.Constants;
+import _VisualDVM.GlobalProperties;
+import _VisualDVM.Utils;
 import ProjectData.LanguageName;
 import Repository.Component.Sapfor.Sapfor;
 import Repository.EmailMessage;
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index bb517b19..01f410f4 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -1,9 +1,9 @@
 package TestingSystem.SAPFOR.ServerSapfor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Tables.TableRenderers;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 
 import java.util.Comparator;
 public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
diff --git a/src/Visual_DVM_2021/Passes/AbortTestingPackage.java b/src/Visual_DVM_2021/Passes/AbortTestingPackage.java
index dc915a6c..4e6cf83e 100644
--- a/src/Visual_DVM_2021/Passes/AbortTestingPackage.java
+++ b/src/Visual_DVM_2021/Passes/AbortTestingPackage.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Common.TestingPackage.TestingPackage;
diff --git a/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java
index 50868f1a..a0df12ee 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Visual_DVM_2021.Passes.AbortTestingPackage;
 public class AbortDVMPackage extends AbortTestingPackage {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/AbortSapforPackage.java b/src/Visual_DVM_2021/Passes/All/AbortSapforPackage.java
index 3be1b61a..3afe3b75 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AbortSapforPackage.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Visual_DVM_2021.Passes.AbortTestingPackage;
 public class AbortSapforPackage extends AbortTestingPackage {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/AddBugReport.java b/src/Visual_DVM_2021/Passes/All/AddBugReport.java
index d62200bf..1224d588 100644
--- a/src/Visual_DVM_2021/Passes/All/AddBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/AddBugReport.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Database;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java b/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
index ad920a0e..4232d0ba 100644
--- a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
+++ b/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.DVMParameter.DVMParameter;
 import GlobalData.DVMParameter.UI.DVMParameterFields;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/AddFile.java b/src/Visual_DVM_2021/Passes/All/AddFile.java
index fcc505a4..e7484235 100644
--- a/src/Visual_DVM_2021/Passes/All/AddFile.java
+++ b/src/Visual_DVM_2021/Passes/All/AddFile.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.FileNameForm;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
 import Visual_DVM_2021.Passes.ChangeFilePass;
diff --git a/src/Visual_DVM_2021/Passes/All/AddUser.java b/src/Visual_DVM_2021/Passes/All/AddUser.java
index a542b196..6286aa01 100644
--- a/src/Visual_DVM_2021/Passes/All/AddUser.java
+++ b/src/Visual_DVM_2021/Passes/All/AddUser.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Database;
 import GlobalData.Machine.Machine;
diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java b/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java
index 13024782..890ba497 100644
--- a/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java
+++ b/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 public class AppendBugReportComment extends AppendBugReportField {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java b/src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java
index b42ce7fd..73c37563 100644
--- a/src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java
+++ b/src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 public class AppendBugReportDescription extends AppendBugReportField {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java b/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
index e42bca96..9a704394 100644
--- a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
+++ b/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
 import Repository.EmailMessage;
diff --git a/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java b/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java
index b66bec6c..9d1c80e0 100644
--- a/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java
+++ b/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.Settings.SettingName;
 import Repository.BugReport.BugReport;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java b/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
index 4eb61256..bda85675 100644
--- a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
+++ b/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import ProjectData.SapforData.Functions.FuncInfo;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java b/src/Visual_DVM_2021/Passes/All/ApplyProfile.java
index 5f805d87..f46a77fc 100644
--- a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java
+++ b/src/Visual_DVM_2021/Passes/All/ApplyProfile.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import GlobalData.SapforProfile.SapforProfile;
 import GlobalData.SapforProfileSetting.SapforProfileSetting;
diff --git a/src/Visual_DVM_2021/Passes/All/BuildComponent.java b/src/Visual_DVM_2021/Passes/All/BuildComponent.java
index 9b4f331e..15acc72d 100644
--- a/src/Visual_DVM_2021/Passes/All/BuildComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/BuildComponent.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Utils;
 import Repository.Component.Component;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
diff --git a/src/Visual_DVM_2021/Passes/All/CheckAccount.java b/src/Visual_DVM_2021/Passes/All/CheckAccount.java
index b5e361e9..df902192 100644
--- a/src/Visual_DVM_2021/Passes/All/CheckAccount.java
+++ b/src/Visual_DVM_2021/Passes/All/CheckAccount.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class CheckAccount extends Pass_2021<Boolean> {
diff --git a/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java b/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java
index e980c610..ff64b803 100644
--- a/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java
+++ b/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import Repository.Subscribes.Subscriber;
diff --git a/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java b/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java
index a20065ef..cb9f3800 100644
--- a/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java
+++ b/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import Repository.SubscriberWorkspace.SubscriberWorkspace;
diff --git a/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java b/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java
index 9cebbddd..93153242 100644
--- a/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java
+++ b/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 public class CleanAnalyses extends CurrentProjectPass {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java b/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
index 532a37c8..7e098845 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
@@ -3,10 +3,10 @@ import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Database;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.MachineType;
 import GlobalData.Tasks.TaskState;
diff --git a/src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java b/src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java
index 0a256076..abda25e4 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.DVM.DVMSettings.DVMSettings;
diff --git a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
index be59fb61..7bf0278e 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
@@ -3,7 +3,7 @@ import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Database;
 import _VisualDVM.Global;
 import Repository.Server.ServerCode;
diff --git a/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java b/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java
index 5818b373..423cd543 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
 import Repository.Server.ServerCode;
diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java b/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
index ca0d66de..5b1cc6ee 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
+++ b/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java b/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
index df2a1301..3a12c1c1 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CloseProject.java b/src/Visual_DVM_2021/Passes/All/CloseProject.java
index 59f040dd..37a0b4a7 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CloseProject.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class CloseProject extends Pass_2021<db_project_info> {
diff --git a/src/Visual_DVM_2021/Passes/All/CombineFiles.java b/src/Visual_DVM_2021/Passes/All/CombineFiles.java
index 2177d2c0..f9920e29 100644
--- a/src/Visual_DVM_2021/Passes/All/CombineFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CombineFiles.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import ProjectData.Files.DBProjectFile;
 import Repository.Component.Sapfor.TransformationPermission;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
index c0f08bf7..787f41c0 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
index debf62a9..e9ad4611 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Visual_DVM_2021/Passes/All/Compile.java b/src/Visual_DVM_2021/Passes/All/Compile.java
index 7a5bfffb..33d25d58 100644
--- a/src/Visual_DVM_2021/Passes/All/Compile.java
+++ b/src/Visual_DVM_2021/Passes/All/Compile.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import GlobalData.GlobalDatabase;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
 import GlobalData.Tasks.TaskState;
diff --git a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
index 8f2da243..637d6a90 100644
--- a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
+++ b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Visual.CommonUI;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CopyProject.java b/src/Visual_DVM_2021/Passes/All/CopyProject.java
index 677d9a0c..0ab322ad 100644
--- a/src/Visual_DVM_2021/Passes/All/CopyProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CopyProject.java
@@ -3,7 +3,7 @@ import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.Dialog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.UI.CopyProjectFields;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
index 417cc169..e338466f 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import Visual_DVM_2021.Passes.ChangeFilePass;
 import Visual_DVM_2021.Passes.PassException;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java b/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
index 06d5e5c1..e028f9de 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
index ce1fa460..356b93d1 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
index ced23644..ae9da41d 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.VFileChooser;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Settings.SettingName;
 import TestingSystem.Common.Group.Group;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java b/src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java
index ef5153f8..d3e0f440 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.VariantsMassPass;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
index f23a8fc6..0d44ed4c 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
@@ -1,10 +1,10 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.ProjectFile;
 import ProjectData.LanguageName;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
index 7b74f040..28aa677b 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Utils;
 import ProjectData.Files.FileType;
 import ProjectData.Files.ProjectFile;
 import ProjectData.LanguageName;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
index 41c02bf7..50bae490 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Files.FileState;
 import ProjectData.Files.ProjectFile;
 import ProjectData.Project.db_project_info;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
index e49fad6a..ac7d9a95 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Visual.Windows.Dialog.VFileChooser;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 
 import java.io.File;
 import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
index 68886c5f..b7a22dd4 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.VFileChooser;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
index c6588819..a24b426c 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Project.db_project_info;
 import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
index 3b782ab8..7ea8350a 100644
--- a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
@@ -2,10 +2,10 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
-import Common_old.UI.Menus_2023.PassMenuItem;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.PassMenuItem;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java b/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java
index c0ea6b77..60c6d2c3 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Database;
 import _VisualDVM.Global;
 import Repository.BugReport.BugReport;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java
index b4a10d9e..7a09e95a 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import Visual_DVM_2021.Passes.DeleteTestingPackages;
 
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java b/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java
index d7538e91..185b01b8 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.GlobalDatabase;
 import GlobalData.Tasks.Task;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java b/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
index 1c35d40e..6ebc81a5 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
@@ -2,9 +2,9 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.ChangeFilePass;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
index f52dd66c..36a764da 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
@@ -1,10 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
-import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.Dialog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.FileObject.DirInfo;
 import GlobalData.FileObject.DirInfosDataSet;
 import GlobalData.FileObject.DirInfosFields;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteFile.java b/src/Visual_DVM_2021/Passes/All/DeleteFile.java
index 02f63788..317f8b95 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteFile.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteFile.java
@@ -2,9 +2,9 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.ChangeFilePass;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java b/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java
index 92673919..5156cbb4 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java
index 74103ccb..1a2e0121 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import Visual_DVM_2021.Passes.DeleteTestingPackages;
 
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java
index 8f8d7a25..a8e2d164 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.GlobalDatabase;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
 import GlobalData.Tasks.RunTask.RunTask;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
index 9de72dd4..9524ad55 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Visual.CommonUI;
-import Common_old.Current;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java
index 168e3a53..ce0bea97 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.GlobalDatabase;
 import GlobalData.Tasks.RunTask.RunTask;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
index b12daf4f..325a087c 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java b/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
index 7a9edac4..9419b531 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import TestingSystem.Common.TestingServer;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java b/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
index 4c3b502d..1396ae29 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
@@ -2,9 +2,9 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java b/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java
index 0d2bb7dd..bc86951f 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java b/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java
index 933a5336..df119463 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
 import Repository.Server.ServerCode;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadComponent.java b/src/Visual_DVM_2021/Passes/All/DownloadComponent.java
index 8a217079..c03217d4 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadComponent.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Repository.Component.Component;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java
index 4ed7fed6..6a447be9 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 
 import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java
index ea168f28..b7e2ca2c 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadProject.java b/src/Visual_DVM_2021/Passes/All/DownloadProject.java
index 427c164a..2a835a0a 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadProject.java
@@ -2,10 +2,10 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadRepository.java b/src/Visual_DVM_2021/Passes/All/DownloadRepository.java
index 300516f9..8ce7ac50 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadRepository.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadRepository.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Visual_DVM_2021.Passes.ProcessPass;
 import org.apache.commons.io.FileUtils;
 
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java
index 8b871478..cbdabfb0 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java b/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
index 1d14dcce..c4009feb 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
 import TestingSystem.Common.Test.Test;
 public class DownloadTaskTest extends DownloadTest {
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTest.java b/src/Visual_DVM_2021/Passes/All/DownloadTest.java
index 0a1e5e19..6938f358 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadTest.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadTest.java
@@ -2,9 +2,9 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Common.Test.Test;
diff --git a/src/Visual_DVM_2021/Passes/All/DropAnalyses.java b/src/Visual_DVM_2021/Passes/All/DropAnalyses.java
index 18ca3b1b..a11c8b95 100644
--- a/src/Visual_DVM_2021/Passes/All/DropAnalyses.java
+++ b/src/Visual_DVM_2021/Passes/All/DropAnalyses.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 public class DropAnalyses extends CurrentProjectPass {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/DropFastAccess.java b/src/Visual_DVM_2021/Passes/All/DropFastAccess.java
index 36de0f4d..85992189 100644
--- a/src/Visual_DVM_2021/Passes/All/DropFastAccess.java
+++ b/src/Visual_DVM_2021/Passes/All/DropFastAccess.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class DropFastAccess extends Pass_2021 {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/EditAccount.java b/src/Visual_DVM_2021/Passes/All/EditAccount.java
index bae845d7..86856169 100644
--- a/src/Visual_DVM_2021/Passes/All/EditAccount.java
+++ b/src/Visual_DVM_2021/Passes/All/EditAccount.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Repository.EmailMessage;
 import Repository.Subscribes.Subscriber;
 import Repository.Subscribes.UI.SubscriberForm;
diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java b/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java
index 51c26fdf..d0aa413e 100644
--- a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java
+++ b/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.SessionMaxtimeDialog;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 public class EditProjectCompilationMaxtime extends CurrentProjectPass {
diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java b/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java
index f083892f..86243b3c 100644
--- a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java
+++ b/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.SessionMaxtimeDialog;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 public class EditProjectRunMaxtime extends CurrentProjectPass {
diff --git a/src/Visual_DVM_2021/Passes/All/ExcludeFile.java b/src/Visual_DVM_2021/Passes/All/ExcludeFile.java
index 9e4f0941..79a9e055 100644
--- a/src/Visual_DVM_2021/Passes/All/ExcludeFile.java
+++ b/src/Visual_DVM_2021/Passes/All/ExcludeFile.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileState;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java
index 67148797..36acb599 100644
--- a/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
index 32840850..c09f3bdb 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
@@ -2,12 +2,12 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import Common.Utils.Index;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Tasks.TaskState;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
diff --git a/src/Visual_DVM_2021/Passes/All/GCOV.java b/src/Visual_DVM_2021/Passes/All/GCOV.java
index fe2c6358..de5df519 100644
--- a/src/Visual_DVM_2021/Passes/All/GCOV.java
+++ b/src/Visual_DVM_2021/Passes/All/GCOV.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Utils;
 import GlobalData.Module.Module;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.LanguageName;
diff --git a/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java b/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
index 019f478e..d778bacf 100644
--- a/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
+++ b/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Visual.CommonUI;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
diff --git a/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java b/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java
index 89d0fcfe..9926ff01 100644
--- a/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java
+++ b/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
diff --git a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java b/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
index 2363deb1..b064c952 100644
--- a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.FileObject.DirInfo;
 import GlobalData.FileObject.DirInfosDataSet;
 import GlobalData.Settings.SettingName;
diff --git a/src/Visual_DVM_2021/Passes/All/IncludeFile.java b/src/Visual_DVM_2021/Passes/All/IncludeFile.java
index 67a79625..4356f3dc 100644
--- a/src/Visual_DVM_2021/Passes/All/IncludeFile.java
+++ b/src/Visual_DVM_2021/Passes/All/IncludeFile.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileState;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java
index e31df8d8..93e43576 100644
--- a/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java b/src/Visual_DVM_2021/Passes/All/InitialiseUser.java
index 3939917b..77a034ca 100644
--- a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/InitialiseUser.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.User.UserState;
diff --git a/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java b/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java
index ac3b00a1..f094c295 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java
+++ b/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import _VisualDVM.Global;
-import Common_old.GlobalProperties;
+import _VisualDVM.GlobalProperties;
 import Common.Visual.Windows.Dialog.VFileChooser;
 import Visual_DVM_2021.Passes.CurrentComponentPass;
 
diff --git a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
index 23e4ea80..e8749175 100644
--- a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
@@ -1,14 +1,13 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Utils;
 import GlobalData.User.User;
 import GlobalData.User.UserState;
 import Visual_DVM_2021.Passes.ProcessPass;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
-import java.nio.file.Paths;
 public class LocalInitaliseUser extends ProcessPass<User> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java b/src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java
index 6acb715e..0f6760c2 100644
--- a/src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Visual_DVM_2021.Passes.ProcessPass;
 public class LocalSingleCommand extends ProcessPass<String> {
     String command = "";
diff --git a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java b/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
index eac846bd..ffc8b215 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java b/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java
index 7d911741..187339af 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
index ab65801a..ebd8cec2 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
@@ -1,11 +1,11 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.DBLastProject.DBLastProject;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
diff --git a/src/Visual_DVM_2021/Passes/All/OpenProject.java b/src/Visual_DVM_2021/Passes/All/OpenProject.java
index 41160e9a..059c6145 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenProject.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenProject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java b/src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java
index f40c0d21..efed1376 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Visual_DVM_2021.Passes.OpenSapforVersionPass;
 public class OpenSapforEtalonVersion extends OpenSapforVersionPass {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java b/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java
index 5734716d..e9f35ed3 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Visual_DVM_2021.Passes.OpenSapforVersionPass;
 public class OpenSapforVersion extends OpenSapforVersionPass {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
index 3b7567da..524c3719 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
+++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Dialog;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
index df26e135..c07ed79d 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
+++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Dialog;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
diff --git a/src/Visual_DVM_2021/Passes/All/Precompilation.java b/src/Visual_DVM_2021/Passes/All/Precompilation.java
index 86d6c088..0ebf0e04 100644
--- a/src/Visual_DVM_2021/Passes/All/Precompilation.java
+++ b/src/Visual_DVM_2021/Passes/All/Precompilation.java
@@ -2,12 +2,12 @@ package Visual_DVM_2021.Passes.All;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Makefile.Makefile;
diff --git a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
index 0e3d1b50..fa252c69 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
@@ -2,9 +2,9 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
 import Repository.BugReport.BugReportState;
diff --git a/src/Visual_DVM_2021/Passes/All/PublishComponent.java b/src/Visual_DVM_2021/Passes/All/PublishComponent.java
index d21b7d1b..551660d6 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishComponent.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import GlobalData.Account.AccountRole;
 import Repository.Component.Component;
 import Repository.Component.ComponentType;
diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java b/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java
index d2eb1f49..775cd908 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTests.java b/src/Visual_DVM_2021/Passes/All/PublishTests.java
index fa4ad3c8..b3de8c54 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTests.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTests.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Common.Group.Group;
diff --git a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
index 0d57238d..4841a232 100644
--- a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
diff --git a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java b/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
index 30a2bb60..97c61230 100644
--- a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
@@ -1,10 +1,10 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.FileNameForm;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.ChangeFilePass;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/RenameFile.java b/src/Visual_DVM_2021/Passes/All/RenameFile.java
index 6ebefdaf..23b6a2bf 100644
--- a/src/Visual_DVM_2021/Passes/All/RenameFile.java
+++ b/src/Visual_DVM_2021/Passes/All/RenameFile.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java b/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java
index 2898fa73..c1a40b8a 100644
--- a/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java
+++ b/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
index adc70c01..fa349640 100644
--- a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
@@ -2,10 +2,10 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.VFileChooser;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Settings.SettingName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java b/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java
index 45b950ac..ad0f56ff 100644
--- a/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class ResetCurrentProject extends CurrentProjectPass {
diff --git a/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java b/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java
index a08ba933..d9fd416a 100644
--- a/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.PassMenuItem;
+import _VisualDVM.Visual.Menus.PassMenuItem;
 import Common.Visual.Windows.Dialog.VFileChooser;
 import Visual_DVM_2021.Passes.CurrentComponentPass;
 
diff --git a/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java b/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
index e19b06af..32f8fd4d 100644
--- a/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
+++ b/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
@@ -1,11 +1,11 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.PassMenuItem;
+import _VisualDVM.Visual.Menus.PassMenuItem;
 import Common.Visual.Trees.DataTree;
 import Common.Visual.Windows.Dialog.Dialog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/Run.java b/src/Visual_DVM_2021/Passes/All/Run.java
index 36619613..c75f1c76 100644
--- a/src/Visual_DVM_2021/Passes/All/Run.java
+++ b/src/Visual_DVM_2021/Passes/All/Run.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import GlobalData.GlobalDatabase;
 import GlobalData.Machine.MachineType;
 import GlobalData.Tasks.RunTask.RunTask;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java b/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java
index 42b83257..01cc1c83 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Visual_DVM_2021.Passes.SapforFilesModification;
 public class SPF_ChangeSpfIntervals extends SapforFilesModification {
     //  SPF_ChangeSpfIntervals (addOpt1_c -> file, addOpt2_c-> int lines, '|' as delimiter)
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java b/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java
index 543f2671..31dea384 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Common.Utils.Index;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.Arrays.ProjectArray;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
index fe1775e0..d57e37a4 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
index 0df65995..5e22cea8 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Menus_2023.PassControl;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.Controls.PassControl;
+import _VisualDVM.Visual.UI;
 import Common.Utils.Index;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyRegions.java b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyRegions.java
index 223af30d..d814256e 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyRegions.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyRegions.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Common.Utils.Index;
 import ProjectData.SapforData.Regions.ParallelRegion;
 import Visual_DVM_2021.Passes.SapforAnalysis;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java b/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java
index 1fde4182..0385d9ce 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.SapforAnalysis;
 public class SPF_GetFileLineInfo extends SapforAnalysis {
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
index 390d5c49..51bfda68 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import Visual_DVM_2021.Passes.PassState;
-import Common_old.UI.Menus_2023.PassControl;
+import _VisualDVM.Visual.Controls.PassControl;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.SilentSapforPass;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java
index 6cb11ca0..5a8052e2 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.SapforData.Functions.FuncCall;
 import ProjectData.SapforData.Functions.FuncCallH;
 import ProjectData.SapforData.Functions.FuncInfo;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
index 04649881..6b6357b8 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Common.Utils.Index;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.Functions.FuncCall;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java
index d8f0a4d8..d183a005 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Common.Utils.Index;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.Loops.Loop;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java b/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java
index 498428c0..f7c05e9f 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
 import ProjectData.Files.LanguageStyle;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java
index 75989cd7..6cfe4a07 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.Functions.FuncCall;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
index 94bfbb60..4393ea98 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.Functions.FuncCall;
 import ProjectData.SapforData.Functions.FuncInfo;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java b/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java
index 610aca4b..603f084a 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.Functions.FuncCallH;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java b/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java
index 0cbc936d..0d80ca11 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common.Visual.Selectable;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.SapforData.Includes.DependencyInfo;
 import ProjectData.SapforData.Includes.FileInfo;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java b/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java
index 23889054..c1251888 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Visual_DVM_2021.Passes.SapforFilesModification;
 //  SPF_LoopUnionCurrent (addOpt1_c -> file, addOpt2_c-> line)
 public class SPF_LoopUnionCurrent extends SapforFilesModification {
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java b/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java
index 95e66c8c..e14b8510 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import ProjectData.SapforData.Arrays.Distribution.Dimension;
 import ProjectData.SapforData.Arrays.ProjectArray;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
index c6487173..3c1c33f5 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
@@ -1,11 +1,11 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileState;
diff --git a/src/Visual_DVM_2021/Passes/All/Save.java b/src/Visual_DVM_2021/Passes/All/Save.java
index 2df33157..7d6cd8bf 100644
--- a/src/Visual_DVM_2021/Passes/All/Save.java
+++ b/src/Visual_DVM_2021/Passes/All/Save.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.Pass_2021;
 import org.apache.commons.io.FileUtils;
diff --git a/src/Visual_DVM_2021/Passes/All/SaveBugReportComment.java b/src/Visual_DVM_2021/Passes/All/SaveBugReportComment.java
index 3f625421..34e62054 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveBugReportComment.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveBugReportComment.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 public class SaveBugReportComment extends UpdateBugReportField {
     @Override
     public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/SaveBugReportDescription.java b/src/Visual_DVM_2021/Passes/All/SaveBugReportDescription.java
index 67e63832..a8ef6b16 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveBugReportDescription.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveBugReportDescription.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 public class SaveBugReportDescription extends UpdateBugReportField {
     @Override
     public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java b/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java
index c8a07c4e..d21b9919 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 public class SaveBugReportExecutor extends UpdateBugReportField {
     @Override
     public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java b/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java
index cc528040..8628968b 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import TestingSystem.DVM.DVMSettings.DVMSettings;
 import Visual_DVM_2021.Passes.SaveCurrentConfiguration;
diff --git a/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java b/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java
index a1cc32e0..7e67aa22 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import Visual_DVM_2021.Passes.SaveCurrentConfiguration;
diff --git a/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java b/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java
index 4b69c360..14731cde 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import ProjectData.SapforData.Functions.FuncCoordinates;
 import ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/SaveGraph.java b/src/Visual_DVM_2021/Passes/All/SaveGraph.java
index 9b8ad8f2..b2606a54 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveGraph.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveGraph.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java b/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java
index e04d21bc..26d2a350 100644
--- a/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java
+++ b/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass;
 public class SelectRemoteFile extends CurrentConnectionPass {
     boolean dialogOK;
diff --git a/src/Visual_DVM_2021/Passes/All/SendBugReport.java b/src/Visual_DVM_2021/Passes/All/SendBugReport.java
index 98e0c3de..ab881e6a 100644
--- a/src/Visual_DVM_2021/Passes/All/SendBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/SendBugReport.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Repository.BugReport.BugReportInterface;
 import Repository.BugReport.BugReportState;
 import Repository.Server.ServerCode;
diff --git a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java
index 89ff5fc6..2c579c70 100644
--- a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java
+++ b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.LanguageName;
 import Visual_DVM_2021.Passes.FilesMassPass;
diff --git a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java
index 2d04eb20..9bbdc114 100644
--- a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java
+++ b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.LanguageStyle;
 import Visual_DVM_2021.Passes.FilesMassPass;
diff --git a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java
index ff395f57..9e018cef 100644
--- a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java
+++ b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
 import Visual_DVM_2021.Passes.FilesMassPass;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java b/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java
index 8b7d85d5..bddcd700 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Machine.MachineType;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java b/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java
index 8f19fd9b..a5904def 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
 import GlobalData.Compiler.Compiler;
 import GlobalData.GlobalDatabase;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java b/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
index a7f474d1..7c08835c 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Repository.Component.Component;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java b/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java
index 14f475f2..5cf1124e 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java b/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java
index 62415cfa..41ac8c8b 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java b/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java
index b8662030..cdaa990b 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.Makefile.UI.MakefilePreviewForm;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java
index 12041a42..c7d05759 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import GlobalData.RemoteFile.RemoteFile;
 public class ShowSapforCompilationErr extends ShowTestingServerFile{
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java
index 703207c8..77642900 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import GlobalData.RemoteFile.RemoteFile;
 public class ShowSapforCompilationOut extends ShowTestingServerFile{
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java b/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java
index 1cb429e0..90e68abf 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
index b9647740..c10ccba9 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.MachineType;
diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java b/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
index d13f27ee..bffffcd3 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
diff --git a/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java b/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java
index b4c40455..44bf6f87 100644
--- a/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
diff --git a/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java b/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
index ed99c712..3a41e9d1 100644
--- a/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
+++ b/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
-import Common_old.UI.Menus_2023.PassButton;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Controls.PassButton;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
diff --git a/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java b/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java
index 912b9a86..71657300 100644
--- a/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java
+++ b/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java b/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
index 351cdfe7..8b37ef77 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
@@ -1,10 +1,10 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
+import _VisualDVM.Visual.UI;
+import _VisualDVM.Utils;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
 import Repository.BugReport.BugReportState;
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java b/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java
index 0a1c9bd5..0464e69c 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.PercentsForm;
 public class UpdateBugReportProgress extends UpdateBugReportField {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateComponent.java b/src/Visual_DVM_2021/Passes/All/UpdateComponent.java
index cae35075..877a2cdd 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateComponent.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import Repository.Component.Component;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateProperty.java b/src/Visual_DVM_2021/Passes/All/UpdateProperty.java
index e3dd4fc0..a2af62d8 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateProperty.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateProperty.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.GlobalProperties;
-import Common_old.UI.UI;
+import _VisualDVM.GlobalProperties;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.lang.reflect.Field;
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
index 288e4021..ff01a1b5 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
@@ -1,16 +1,16 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.PercentsForm;
 import Common.Visual.Windows.Dialog.SliderNumberForm;
 import Common.Visual.Windows.Dialog.SpinnerNumberForm;
 import Common.Visual.Windows.Dialog.Text.TextFieldDialog;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import Common.Visual.Windows.Dialog.VFileChooser;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import GlobalData.Settings.DBSetting;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java b/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java
index 5a2efa87..94350ee1 100644
--- a/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java
+++ b/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.io.*;
diff --git a/src/Visual_DVM_2021/Passes/ChangeFilePass.java b/src/Visual_DVM_2021/Passes/ChangeFilePass.java
index a5dbba86..f84f8e59 100644
--- a/src/Visual_DVM_2021/Passes/ChangeFilePass.java
+++ b/src/Visual_DVM_2021/Passes/ChangeFilePass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import ProjectData.Project.db_project_info;
 
diff --git a/src/Visual_DVM_2021/Passes/CurrentComponentPass.java b/src/Visual_DVM_2021/Passes/CurrentComponentPass.java
index a0e3f623..6c615dd3 100644
--- a/src/Visual_DVM_2021/Passes/CurrentComponentPass.java
+++ b/src/Visual_DVM_2021/Passes/CurrentComponentPass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Repository.Component.Component;
 public abstract class CurrentComponentPass extends Pass_2021<Component> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/CurrentProjectPass.java b/src/Visual_DVM_2021/Passes/CurrentProjectPass.java
index 2d5ebef0..6da74dc6 100644
--- a/src/Visual_DVM_2021/Passes/CurrentProjectPass.java
+++ b/src/Visual_DVM_2021/Passes/CurrentProjectPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Project.db_project_info;
 public abstract class CurrentProjectPass extends Pass_2021<db_project_info> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java b/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java
index 005b2e0a..40c1a615 100644
--- a/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java
+++ b/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes;
 import Common.CommonConstants;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import TestingSystem.Common.TestingPackage.TestingPackage;
 import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.Server.DeleteServerObjects;
diff --git a/src/Visual_DVM_2021/Passes/FilesMassPass.java b/src/Visual_DVM_2021/Passes/FilesMassPass.java
index 24383615..2c0b8f2b 100644
--- a/src/Visual_DVM_2021/Passes/FilesMassPass.java
+++ b/src/Visual_DVM_2021/Passes/FilesMassPass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.DBProjectFile;
 public abstract class FilesMassPass<T> extends Pass_2021<T> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
index 69eb7fd1..0e3ead3e 100644
--- a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
+++ b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 import TestingSystem.SAPFOR.Json.SapforVersion_json;
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index bfc47f37..9e89dc49 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 public enum PassCode_2021 {
     Undefined,
     //-
diff --git a/src/Visual_DVM_2021/Passes/Pass_2021.java b/src/Visual_DVM_2021/Passes/Pass_2021.java
index 2e1497f0..cc3e2f91 100644
--- a/src/Visual_DVM_2021/Passes/Pass_2021.java
+++ b/src/Visual_DVM_2021/Passes/Pass_2021.java
@@ -2,13 +2,13 @@ package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.PassButton;
-import Common_old.UI.Menus_2023.PassControl;
-import Common_old.UI.Menus_2023.StablePassMenuItem;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.Controls.PassButton;
+import _VisualDVM.Visual.Controls.PassControl;
+import _VisualDVM.Visual.Menus.StablePassMenuItem;
+import _VisualDVM.Visual.UI;
 import Common.Utils.Stopwatch;
 import Common.Utils.TextLog;
 import Visual_DVM_2021.PassStats.PassStats;
diff --git a/src/Visual_DVM_2021/Passes/ProcessPass.java b/src/Visual_DVM_2021/Passes/ProcessPass.java
index 813174c5..4864fcf0 100644
--- a/src/Visual_DVM_2021/Passes/ProcessPass.java
+++ b/src/Visual_DVM_2021/Passes/ProcessPass.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/ProjectPass.java b/src/Visual_DVM_2021/Passes/ProjectPass.java
index bbef7d92..bd83c872 100644
--- a/src/Visual_DVM_2021/Passes/ProjectPass.java
+++ b/src/Visual_DVM_2021/Passes/ProjectPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Project.db_project_info;
 public class ProjectPass extends Pass_2021<db_project_info>{
     protected db_project_info getProject(){
diff --git a/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java b/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java
index 299b207c..5c197568 100644
--- a/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.SSH;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 //завязан на текущие машину и юзера
 public abstract class CurrentConnectionPass<T> extends ConnectionPass<T> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java b/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
index d0154b59..84c2e45a 100644
--- a/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.SSH;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Current;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import GlobalData.Machine.Machine;
 import GlobalData.Machine.MachineType;
diff --git a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java b/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
index 8467e759..19c0cfcc 100644
--- a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.SSH;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.Tasks.Supervisor.Remote.RemoteTaskSupervisor;
 public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends ConnectionPass {
     public S supervisor; //инициализация идет в конструкторе потомка.
diff --git a/src/Visual_DVM_2021/Passes/SapforAnalysis.java b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
index a8745a6b..269a4a9b 100644
--- a/src/Visual_DVM_2021/Passes/SapforAnalysis.java
+++ b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
@@ -2,9 +2,9 @@ package Visual_DVM_2021.Passes;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.PassControl;
-import Common_old.UI.Menus_2023.PassMenuItem;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.Controls.PassControl;
+import _VisualDVM.Visual.Menus.PassMenuItem;
+import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/Visual_DVM_2021/Passes/SapforFilesModification.java b/src/Visual_DVM_2021/Passes/SapforFilesModification.java
index 32ce408d..45bf509d 100644
--- a/src/Visual_DVM_2021/Passes/SapforFilesModification.java
+++ b/src/Visual_DVM_2021/Passes/SapforFilesModification.java
@@ -1,8 +1,7 @@
 package Visual_DVM_2021.Passes;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
-import _VisualDVM.Global;
 import GlobalData.Settings.SettingName;
 public class SapforFilesModification extends SapforModification {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/SapforPass.java b/src/Visual_DVM_2021/Passes/SapforPass.java
index 7b245edb..2faa069c 100644
--- a/src/Visual_DVM_2021/Passes/SapforPass.java
+++ b/src/Visual_DVM_2021/Passes/SapforPass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 public class SapforPass extends SilentSapforPass {
     //отличается наличием журнала и сообщений
     @Override
diff --git a/src/Visual_DVM_2021/Passes/SapforTransformation.java b/src/Visual_DVM_2021/Passes/SapforTransformation.java
index 75f276f2..42bdf629 100644
--- a/src/Visual_DVM_2021/Passes/SapforTransformation.java
+++ b/src/Visual_DVM_2021/Passes/SapforTransformation.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.PassMenuItem;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.Menus.PassMenuItem;
+import _VisualDVM.Visual.UI;
 import ProjectData.Project.db_project_info;
 import ProjectData.ProjectView;
 import Repository.Component.Sapfor.TransformationPermission;
diff --git a/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java b/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java
index 3c32dbcf..f77d1fcc 100644
--- a/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import TestingSystem.Common.Configuration.Configuration;
 import TestingSystem.Common.Group.Group;
diff --git a/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java b/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java
index 37a3eef3..671c72fb 100644
--- a/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.riDBObject;
 import Repository.RepositoryServer;
 public abstract class CloneServerObject<S extends RepositoryServer, D extends riDBObject> extends PublishServerObject<S, D> {
diff --git a/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java b/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
index ad44f703..14c79ef8 100644
--- a/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.Server;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import Repository.RepositoryServer;
diff --git a/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java b/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
index 9afb5b4d..6138b54d 100644
--- a/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
+++ b/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.Server;
 import Common.Database.Objects.DBObject;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Repository.RepositoryRefuseException;
 import Repository.RepositoryServer;
 import Repository.Server.ServerCode;
diff --git a/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java b/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java
index 4d4e6c92..56bc05b1 100644
--- a/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java
+++ b/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
diff --git a/src/Visual_DVM_2021/Passes/SilentSapforPass.java b/src/Visual_DVM_2021/Passes/SilentSapforPass.java
index e58461f0..0b7b8a1d 100644
--- a/src/Visual_DVM_2021/Passes/SilentSapforPass.java
+++ b/src/Visual_DVM_2021/Passes/SilentSapforPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Repository.Component.Sapfor.Sapfor;
 public class SilentSapforPass extends CurrentProjectPass {
     protected Sapfor sapfor;
diff --git a/src/Visual_DVM_2021/Passes/StartTestingPackage.java b/src/Visual_DVM_2021/Passes/StartTestingPackage.java
index b7490502..3887451f 100644
--- a/src/Visual_DVM_2021/Passes/StartTestingPackage.java
+++ b/src/Visual_DVM_2021/Passes/StartTestingPackage.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
 import TestingSystem.Common.TestingPackage.TestingPackage;
 import TestingSystem.Common.TestingServer;
diff --git a/src/Visual_DVM_2021/Passes/Transformation.java b/src/Visual_DVM_2021/Passes/Transformation.java
index 3cd72e5d..772d371d 100644
--- a/src/Visual_DVM_2021/Passes/Transformation.java
+++ b/src/Visual_DVM_2021/Passes/Transformation.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
-import Common_old.Current;
-import Common_old.UI.Menus_2023.PassMenuItem;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.PassMenuItem;
+import _VisualDVM.Visual.UI;
 import ProjectData.Project.db_project_info;
 import ProjectData.ProjectView;
 import Repository.Component.Sapfor.TransformationPermission;
diff --git a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java b/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
index 1a0073c5..8175dd68 100644
--- a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
+++ b/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.UI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
diff --git a/src/Visual_DVM_2021/Passes/VariantsMassPass.java b/src/Visual_DVM_2021/Passes/VariantsMassPass.java
index 2ee81c83..6992687e 100644
--- a/src/Visual_DVM_2021/Passes/VariantsMassPass.java
+++ b/src/Visual_DVM_2021/Passes/VariantsMassPass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes;
-import Common_old.Current;
-import Common_old.UI.UI;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.Variants.ParallelVariant;
 import Repository.Component.Sapfor.Sapfor;
diff --git a/src/Visual_DVM_2021/UI/Main/AnalysisForm.java b/src/Visual_DVM_2021/UI/Main/AnalysisForm.java
index e04f086a..392fe7b6 100644
--- a/src/Visual_DVM_2021/UI/Main/AnalysisForm.java
+++ b/src/Visual_DVM_2021/UI/Main/AnalysisForm.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.Current;
-import Visual_DVM_2021.UI.Interface.AnalysisWindow;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Interface.AnalysisWindow;
 
 import javax.swing.*;
 public class AnalysisForm implements AnalysisWindow {
diff --git a/src/Visual_DVM_2021/UI/Main/ArraysForm.java b/src/Visual_DVM_2021/UI/Main/ArraysForm.java
index 3e987970..b8e22241 100644
--- a/src/Visual_DVM_2021/UI/Main/ArraysForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ArraysForm.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.TextField.StyledTextField;
 import ProjectData.SapforData.Arrays.ProjectArray;
-import Visual_DVM_2021.UI.Interface.ArraysWindow;
+import _VisualDVM.Visual.Interface.ArraysWindow;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
index a2fa66ba..1dd17666 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -1,24 +1,24 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.Editor.BaseEditor;
 import _VisualDVM.Visual.Editor.Viewer;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.TextField.StyledTextField;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import GlobalData.Settings.SettingName;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
 import Repository.BugReport.BugReportState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.CallbackWindow;
-import Visual_DVM_2021.UI.Interface.CommentInterface;
-import Visual_DVM_2021.UI.Interface.DescriptionInterface;
-import Visual_DVM_2021.UI.Interface.FormWithSplitters;
+import _VisualDVM.Visual.Interface.CallbackWindow;
+import _VisualDVM.Visual.Interface.CommentInterface;
+import _VisualDVM.Visual.Interface.DescriptionInterface;
+import _VisualDVM.Visual.Interface.FormWithSplitters;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
diff --git a/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java b/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java
index 9e837c87..b8424bfd 100644
--- a/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java
+++ b/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 
 import java.util.Vector;
 public class CombineFilesDialog extends ComboTextDialog {
diff --git a/src/Visual_DVM_2021/UI/Main/CommentFields.java b/src/Visual_DVM_2021/UI/Main/CommentFields.java
index 50d4ff3c..77c2b322 100644
--- a/src/Visual_DVM_2021/UI/Main/CommentFields.java
+++ b/src/Visual_DVM_2021/UI/Main/CommentFields.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.CommentInterface;
+import _VisualDVM.Visual.Interface.CommentInterface;
 
 import javax.swing.*;
 public class CommentFields implements CommentInterface {
diff --git a/src/Visual_DVM_2021/UI/Main/CommentTabs.java b/src/Visual_DVM_2021/UI/Main/CommentTabs.java
index c7816657..57b8d5ec 100644
--- a/src/Visual_DVM_2021/UI/Main/CommentTabs.java
+++ b/src/Visual_DVM_2021/UI/Main/CommentTabs.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.UI.Interface.CommentInterface;
+import _VisualDVM.Visual.Interface.CommentInterface;
 
 import javax.swing.*;
 public class CommentTabs implements CommentInterface {
diff --git a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
index d9bcf996..1654210c 100644
--- a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
@@ -3,14 +3,14 @@ import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Visual.Editor.BaseEditor;
 import _VisualDVM.Visual.Controls.ShortLabel;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
+import _VisualDVM.Visual.UI;
 import Common.Utils.TextLog;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import Visual_DVM_2021.Passes.Pass_2021;
 import javafx.util.Pair;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
diff --git a/src/Visual_DVM_2021/UI/Main/CompilationTasksComparisonForm.java b/src/Visual_DVM_2021/UI/Main/CompilationTasksComparisonForm.java
index 85f2362f..d0c50a88 100644
--- a/src/Visual_DVM_2021/UI/Main/CompilationTasksComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CompilationTasksComparisonForm.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
 public class CompilationTasksComparisonForm extends TasksComparisonForm<CompilationTask> {
     public CompilationTasksComparisonForm(ComparisonForm<CompilationTask> slave_in) {
diff --git a/src/Visual_DVM_2021/UI/Main/DVMRunTasksComparisonForm.java b/src/Visual_DVM_2021/UI/Main/DVMRunTasksComparisonForm.java
index ae0645bc..b06f9b4e 100644
--- a/src/Visual_DVM_2021/UI/Main/DVMRunTasksComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/DVMRunTasksComparisonForm.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.Current;
+import _VisualDVM.Current;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
 public class DVMRunTasksComparisonForm extends TasksComparisonForm<DVMRunTask> {
     public DVMRunTasksComparisonForm(ComparisonForm<DVMRunTask> slave_in) {
diff --git a/src/Visual_DVM_2021/UI/Main/DebugForm.java b/src/Visual_DVM_2021/UI/Main/DebugForm.java
index 31e1940c..0db10afb 100644
--- a/src/Visual_DVM_2021/UI/Main/DebugForm.java
+++ b/src/Visual_DVM_2021/UI/Main/DebugForm.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
 import GlobalData.GlobalDatabase;
-import Visual_DVM_2021.UI.Interface.DebugWindow;
-import Visual_DVM_2021.UI.Interface.FormWithSplitters;
+import _VisualDVM.Visual.Interface.DebugWindow;
+import _VisualDVM.Visual.Interface.FormWithSplitters;
 
 import javax.swing.*;
 public class DebugForm implements DebugWindow, FormWithSplitters {
diff --git a/src/Visual_DVM_2021/UI/Main/DescriptionFields.java b/src/Visual_DVM_2021/UI/Main/DescriptionFields.java
index 5cc29e15..fb85eda6 100644
--- a/src/Visual_DVM_2021/UI/Main/DescriptionFields.java
+++ b/src/Visual_DVM_2021/UI/Main/DescriptionFields.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.DescriptionInterface;
+import _VisualDVM.Visual.Interface.DescriptionInterface;
 
 import javax.swing.*;
 public class DescriptionFields implements DescriptionInterface {
diff --git a/src/Visual_DVM_2021/UI/Main/DescriptionTabs.java b/src/Visual_DVM_2021/UI/Main/DescriptionTabs.java
index ca75bb31..de4a973b 100644
--- a/src/Visual_DVM_2021/UI/Main/DescriptionTabs.java
+++ b/src/Visual_DVM_2021/UI/Main/DescriptionTabs.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.UI.Interface.DescriptionInterface;
+import _VisualDVM.Visual.Interface.DescriptionInterface;
 
 import javax.swing.*;
 public class DescriptionTabs implements DescriptionInterface {
diff --git a/src/Visual_DVM_2021/UI/Main/FileForm.java b/src/Visual_DVM_2021/UI/Main/FileForm.java
index 2f4a6649..35a9bbec 100644
--- a/src/Visual_DVM_2021/UI/Main/FileForm.java
+++ b/src/Visual_DVM_2021/UI/Main/FileForm.java
@@ -5,9 +5,9 @@ import Common.Visual.CommonUI;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.Editor.Viewer;
-import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
+import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
 import Common.Visual.Trees.TreeForm;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.UI.Editor.SPFEditor;
@@ -20,9 +20,9 @@ import ProjectData.SapforData.Functions.UI.FileFunctionsTree;
 import ProjectData.SapforData.Loops.UI.FileLoopsTree;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.FileWindow;
-import Visual_DVM_2021.UI.Interface.FormWithSplitters;
-import Visual_DVM_2021.UI.Interface.SPFEditorInterface;
+import _VisualDVM.Visual.Interface.FileWindow;
+import _VisualDVM.Visual.Interface.FormWithSplitters;
+import _VisualDVM.Visual.Interface.SPFEditorInterface;
 import com.sun.org.glassfish.gmbal.Description;
 import org.fife.ui.rtextarea.RTextScrollPane;
 
diff --git a/src/Visual_DVM_2021/UI/Main/FunctionsForm.java b/src/Visual_DVM_2021/UI/Main/FunctionsForm.java
index a30eb6cd..41f98bf1 100644
--- a/src/Visual_DVM_2021/UI/Main/FunctionsForm.java
+++ b/src/Visual_DVM_2021/UI/Main/FunctionsForm.java
@@ -1,13 +1,13 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 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;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.FunctionsWindow;
+import _VisualDVM.Visual.Interface.FunctionsWindow;
 import javafx.util.Pair;
 
 import javax.swing.*;
diff --git a/src/Visual_DVM_2021/UI/Main/MainForm.java b/src/Visual_DVM_2021/UI/Main/MainForm.java
index 1233cb1d..f3101bde 100644
--- a/src/Visual_DVM_2021/UI/Main/MainForm.java
+++ b/src/Visual_DVM_2021/UI/Main/MainForm.java
@@ -1,17 +1,17 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
+import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Form;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.*;
+import _VisualDVM.Visual.Interface.*;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Visual_DVM_2021/UI/Main/ProfilesFields.java b/src/Visual_DVM_2021/UI/Main/ProfilesFields.java
index 3d4f1393..30429e7e 100644
--- a/src/Visual_DVM_2021/UI/Main/ProfilesFields.java
+++ b/src/Visual_DVM_2021/UI/Main/ProfilesFields.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
 import Common.Visual.Windows.Dialog.DialogFields;
 import GlobalData.GlobalDatabase;
-import Visual_DVM_2021.UI.Interface.FormWithSplitters;
+import _VisualDVM.Visual.Interface.FormWithSplitters;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Visual_DVM_2021/UI/Main/ProjectForm.java b/src/Visual_DVM_2021/UI/Main/ProjectForm.java
index 6807bb80..c8869c7c 100644
--- a/src/Visual_DVM_2021/UI/Main/ProjectForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ProjectForm.java
@@ -1,13 +1,13 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.Editor.Viewer;
-import Common_old.UI.Menus_2023.ProjectMenuBar.ProjectMenuBar;
+import _VisualDVM.Visual.Menus.ProjectMenuBar.ProjectMenuBar;
 import Common.Visual.Trees.TreeForm;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.UI.FilesTree;
@@ -17,7 +17,7 @@ import ProjectData.SapforData.Functions.UI.InlineTree2;
 import ProjectData.SapforData.Includes.UI.IncludesTree;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.*;
+import _VisualDVM.Visual.Interface.*;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Visual_DVM_2021/UI/Main/RunTasksComparisonForm.java b/src/Visual_DVM_2021/UI/Main/RunTasksComparisonForm.java
index 66043ed9..9674be5e 100644
--- a/src/Visual_DVM_2021/UI/Main/RunTasksComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/RunTasksComparisonForm.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.Tasks.RunTask.RunTask;
 public class RunTasksComparisonForm extends TasksComparisonForm<RunTask> {
     public RunTasksComparisonForm(ComparisonForm<RunTask> slave_in) {
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index cd980028..08f25be7 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -1,11 +1,11 @@
 package Visual_DVM_2021.UI.Main;
 import Common.CurrentAnchestor;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Visual.Controls.ShortLabel;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
+import _VisualDVM.Visual.UI;
 import Common.Utils.TextLog;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
diff --git a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
index de02833b..5f83a4b9 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
-import Common_old.Current;
-import Common_old.UI.Menus_2023.MenuBarButton;
-import Common_old.Utils.Utils;
+import _VisualDVM.Constants;
+import _VisualDVM.Current;
+import Common.Visual.Controls.MenuBarButton;
+import _VisualDVM.Utils;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.ProjectFile;
diff --git a/src/Visual_DVM_2021/UI/Main/TabToolBar.java b/src/Visual_DVM_2021/UI/Main/TabToolBar.java
index ff5e3285..dbc7e290 100644
--- a/src/Visual_DVM_2021/UI/Main/TabToolBar.java
+++ b/src/Visual_DVM_2021/UI/Main/TabToolBar.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Visual_DVM_2021/UI/Main/TasksComparisonForm.java b/src/Visual_DVM_2021/UI/Main/TasksComparisonForm.java
index 602b5894..78219983 100644
--- a/src/Visual_DVM_2021/UI/Main/TasksComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TasksComparisonForm.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Database.Objects.DBObject;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Menus_2023.MenuBarButton;
+import Common.Visual.Controls.MenuBarButton;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 7b8280de..9bd57ea8 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -3,19 +3,19 @@ import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
+import _VisualDVM.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import Common.Visual.TextField.StyledTextField;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Credentials.Credentials;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import Visual_DVM_2021.UI.Interface.FormWithSplitters;
-import Visual_DVM_2021.UI.Interface.TestingWindow;
+import _VisualDVM.Visual.Interface.FormWithSplitters;
+import _VisualDVM.Visual.Interface.TestingWindow;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Visual_DVM_2021/UI/Main/TestsForm.java b/src/Visual_DVM_2021/UI/Main/TestsForm.java
index ea6b0569..36f459a1 100644
--- a/src/Visual_DVM_2021/UI/Main/TestsForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestsForm.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.UI.Main;
 import _VisualDVM.Global;
-import Visual_DVM_2021.UI.Interface.FormWithSplitters;
-import Visual_DVM_2021.UI.Interface.TestsWindow;
+import _VisualDVM.Visual.Interface.FormWithSplitters;
+import _VisualDVM.Visual.Interface.TestsWindow;
 
 import javax.swing.*;
 public class TestsForm implements TestsWindow, FormWithSplitters {
diff --git a/src/Visual_DVM_2021/UI/Main/VariantsForm.java b/src/Visual_DVM_2021/UI/Main/VariantsForm.java
index 1b37561d..58a4c377 100644
--- a/src/Visual_DVM_2021/UI/Main/VariantsForm.java
+++ b/src/Visual_DVM_2021/UI/Main/VariantsForm.java
@@ -1,10 +1,10 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.Trees.TreeForm;
 import ProjectData.SapforData.Arrays.UI.DimensionsTableForm;
 import ProjectData.SapforData.Arrays.UI.RulesTree;
-import Visual_DVM_2021.UI.Interface.VariantsWindow;
+import _VisualDVM.Visual.Interface.VariantsWindow;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
index d2a30a3e..f1844227 100644
--- a/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.Utils.Utils;
+import _VisualDVM.Current;
+import _VisualDVM.Utils;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
diff --git a/src/Visual_DVM_2021/UI/Main/VersionsForm.java b/src/Visual_DVM_2021/UI/Main/VersionsForm.java
index e15c51d1..7b9642e9 100644
--- a/src/Visual_DVM_2021/UI/Main/VersionsForm.java
+++ b/src/Visual_DVM_2021/UI/Main/VersionsForm.java
@@ -1,12 +1,12 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Visual.CommonUI;
 import Common.Visual.Trees.TreeForm;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.Project.UI.VersionsTree;
 import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.UI.Interface.FormWithSplitters;
-import Visual_DVM_2021.UI.Interface.VariantsWindow;
-import Visual_DVM_2021.UI.Interface.VersionsWindow;
+import _VisualDVM.Visual.Interface.FormWithSplitters;
+import _VisualDVM.Visual.Interface.VariantsWindow;
+import _VisualDVM.Visual.Interface.VersionsWindow;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Common_old/Constants.java b/src/_VisualDVM/Constants.java
similarity index 99%
rename from src/Common_old/Constants.java
rename to src/_VisualDVM/Constants.java
index 3e4e0206..390044f5 100644
--- a/src/Common_old/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -1,4 +1,4 @@
-package Common_old;
+package _VisualDVM;
 import Common.Utils.Vector_;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
diff --git a/src/Common_old/Current.java b/src/_VisualDVM/Current.java
similarity index 99%
rename from src/Common_old/Current.java
rename to src/_VisualDVM/Current.java
index 2b5c3f16..738d636f 100644
--- a/src/Common_old/Current.java
+++ b/src/_VisualDVM/Current.java
@@ -1,4 +1,4 @@
-package Common_old;
+package _VisualDVM;
 import Common.CurrentAnchestor;
 import GlobalData.Account.Account;
 import GlobalData.Compiler.Compiler;
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 6ac485b5..a9b82fb9 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -5,11 +5,6 @@ import Common.Mode;
 import Common.Utils.CommonUtils;
 import Common.Utils.Loggable;
 import Common.Visual.CommonUI;
-import Common_old.Constants;
-import Common_old.Current;
-import Common_old.GlobalProperties;
-import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import GlobalData.Account.Account;
 import GlobalData.Account.AccountRole;
 import GlobalData.GlobalDatabase;
@@ -29,6 +24,7 @@ import TestingSystem.SAPFOR.PackageModeSupervisor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
+import _VisualDVM.Visual.UI;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 
diff --git a/src/Common_old/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
similarity index 99%
rename from src/Common_old/GlobalProperties.java
rename to src/_VisualDVM/GlobalProperties.java
index a70fa1ed..4d4e5ea7 100644
--- a/src/Common_old/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -1,6 +1,6 @@
-package Common_old;
+package _VisualDVM;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Menus_2023.StableMenuItem;
+import _VisualDVM.Visual.Menus.StableMenuItem;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import com.google.gson.annotations.Expose;
diff --git a/src/Common_old/Utils/Utils.java b/src/_VisualDVM/Utils.java
similarity index 99%
rename from src/Common_old/Utils/Utils.java
rename to src/_VisualDVM/Utils.java
index 6783893a..ff961001 100644
--- a/src/Common_old/Utils/Utils.java
+++ b/src/_VisualDVM/Utils.java
@@ -1,12 +1,10 @@
-package Common_old.Utils;
+package _VisualDVM;
 import Common.Utils.CommonUtils;
 import Common.Utils.Index;
 import Common.Utils.StringTemplate;
 import Common.Utils.TextLog;
 import Common.Visual.CommonUI;
-import Common_old.Constants;
 import GlobalData.GlobalDatabase;
-import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.VFileChooser_;
 import GlobalData.Settings.SettingName;
 import GlobalData.Tasks.TaskState;
diff --git a/src/Common_old/Utils/Validators/DVMHelpParser.java b/src/_VisualDVM/Validators/DVMHelpParser.java
similarity index 99%
rename from src/Common_old/Utils/Validators/DVMHelpParser.java
rename to src/_VisualDVM/Validators/DVMHelpParser.java
index db3fdcf7..6e0484e6 100644
--- a/src/Common_old/Utils/Validators/DVMHelpParser.java
+++ b/src/_VisualDVM/Validators/DVMHelpParser.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Validators;
+package _VisualDVM.Validators;
 import Common.Utils.CommonUtils;
 import GlobalData.Compiler.Compiler;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
diff --git a/src/Common_old/Utils/Validators/EnvironmentState.java b/src/_VisualDVM/Validators/EnvironmentState.java
similarity index 74%
rename from src/Common_old/Utils/Validators/EnvironmentState.java
rename to src/_VisualDVM/Validators/EnvironmentState.java
index 711899d4..52d4c55e 100644
--- a/src/Common_old/Utils/Validators/EnvironmentState.java
+++ b/src/_VisualDVM/Validators/EnvironmentState.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Validators;
+package _VisualDVM.Validators;
 public enum EnvironmentState {
     SearchName,
     Name,
diff --git a/src/Common_old/Utils/Validators/HelpParserState.java b/src/_VisualDVM/Validators/HelpParserState.java
similarity index 82%
rename from src/Common_old/Utils/Validators/HelpParserState.java
rename to src/_VisualDVM/Validators/HelpParserState.java
index 8c82b174..ae6fa784 100644
--- a/src/Common_old/Utils/Validators/HelpParserState.java
+++ b/src/_VisualDVM/Validators/HelpParserState.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Validators;
+package _VisualDVM.Validators;
 public enum HelpParserState {
     Search,
     OptionsChapter,
diff --git a/src/Common_old/Utils/Validators/OptionState.java b/src/_VisualDVM/Validators/OptionState.java
similarity index 79%
rename from src/Common_old/Utils/Validators/OptionState.java
rename to src/_VisualDVM/Validators/OptionState.java
index 8d768b29..055600b6 100644
--- a/src/Common_old/Utils/Validators/OptionState.java
+++ b/src/_VisualDVM/Validators/OptionState.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Validators;
+package _VisualDVM.Validators;
 public enum OptionState {
     SearchName,
     Name,
diff --git a/src/Common_old/Utils/Validators/PathValidator.java b/src/_VisualDVM/Validators/PathValidator.java
similarity index 97%
rename from src/Common_old/Utils/Validators/PathValidator.java
rename to src/_VisualDVM/Validators/PathValidator.java
index 87ffc4dc..1fead000 100644
--- a/src/Common_old/Utils/Validators/PathValidator.java
+++ b/src/_VisualDVM/Validators/PathValidator.java
@@ -1,6 +1,5 @@
-package Common_old.Utils.Validators;
+package _VisualDVM.Validators;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
 import Common.Utils.TextLog;
 import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
 public class PathValidator extends Validator {
diff --git a/src/Common_old/Utils/Validators/PathValidatorState.java b/src/_VisualDVM/Validators/PathValidatorState.java
similarity index 75%
rename from src/Common_old/Utils/Validators/PathValidatorState.java
rename to src/_VisualDVM/Validators/PathValidatorState.java
index 7f829bcb..157ce253 100644
--- a/src/Common_old/Utils/Validators/PathValidatorState.java
+++ b/src/_VisualDVM/Validators/PathValidatorState.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Validators;
+package _VisualDVM.Validators;
 public enum PathValidatorState {
     Start,
     Name,
diff --git a/src/Common_old/Utils/Validators/ShellParser.java b/src/_VisualDVM/Validators/ShellParser.java
similarity index 99%
rename from src/Common_old/Utils/Validators/ShellParser.java
rename to src/_VisualDVM/Validators/ShellParser.java
index dc83f3f8..7178084f 100644
--- a/src/Common_old/Utils/Validators/ShellParser.java
+++ b/src/_VisualDVM/Validators/ShellParser.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Validators;
+package _VisualDVM.Validators;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
 
diff --git a/src/Common_old/Utils/Validators/ShellParserState.java b/src/_VisualDVM/Validators/ShellParserState.java
similarity index 92%
rename from src/Common_old/Utils/Validators/ShellParserState.java
rename to src/_VisualDVM/Validators/ShellParserState.java
index fdb23d89..579f94c7 100644
--- a/src/Common_old/Utils/Validators/ShellParserState.java
+++ b/src/_VisualDVM/Validators/ShellParserState.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Validators;
+package _VisualDVM.Validators;
 public enum ShellParserState {
     //--------------------------------
     NewLine, //начало строки.
diff --git a/src/Common_old/Utils/Validators/Validator.java b/src/_VisualDVM/Validators/Validator.java
similarity index 95%
rename from src/Common_old/Utils/Validators/Validator.java
rename to src/_VisualDVM/Validators/Validator.java
index 147aba90..9fe74679 100644
--- a/src/Common_old/Utils/Validators/Validator.java
+++ b/src/_VisualDVM/Validators/Validator.java
@@ -1,4 +1,4 @@
-package Common_old.Utils.Validators;
+package _VisualDVM.Validators;
 import Common.Utils.TextLog;
 public class Validator {
     protected char c;
diff --git a/src/_VisualDVM/Visual/1.txt b/src/_VisualDVM/Visual/1.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/Common_old/UI/Menus_2023/PassButton.java b/src/_VisualDVM/Visual/Controls/PassButton.java
similarity index 90%
rename from src/Common_old/UI/Menus_2023/PassButton.java
rename to src/_VisualDVM/Visual/Controls/PassButton.java
index 1b3c0cca..ee051827 100644
--- a/src/Common_old/UI/Menus_2023/PassButton.java
+++ b/src/_VisualDVM/Visual/Controls/PassButton.java
@@ -1,4 +1,5 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Controls;
+import Common.Visual.Controls.MenuBarButton;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.awt.*;
diff --git a/src/Common_old/UI/Menus_2023/PassControl.java b/src/_VisualDVM/Visual/Controls/PassControl.java
similarity index 85%
rename from src/Common_old/UI/Menus_2023/PassControl.java
rename to src/_VisualDVM/Visual/Controls/PassControl.java
index 304e2838..b9b7ab7a 100644
--- a/src/Common_old/UI/Menus_2023/PassControl.java
+++ b/src/_VisualDVM/Visual/Controls/PassControl.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Controls;
 public interface PassControl {
     void setIcon(String icon_path);
     void setEnabled(boolean flag);
diff --git a/src/Visual_DVM_2021/UI/Interface/AnalysisWindow.java b/src/_VisualDVM/Visual/Interface/AnalysisWindow.java
similarity index 89%
rename from src/Visual_DVM_2021/UI/Interface/AnalysisWindow.java
rename to src/_VisualDVM/Visual/Interface/AnalysisWindow.java
index 353b3620..85d46a7b 100644
--- a/src/Visual_DVM_2021/UI/Interface/AnalysisWindow.java
+++ b/src/_VisualDVM/Visual/Interface/AnalysisWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 public interface AnalysisWindow extends FormWithSplitters, VisualizerForm{
     void ShowProjectMaxDim();
     void ShowNoProjectMaxDim();
diff --git a/src/Visual_DVM_2021/UI/Interface/ArraysWindow.java b/src/_VisualDVM/Visual/Interface/ArraysWindow.java
similarity index 76%
rename from src/Visual_DVM_2021/UI/Interface/ArraysWindow.java
rename to src/_VisualDVM/Visual/Interface/ArraysWindow.java
index 836a00e5..eff4b254 100644
--- a/src/Visual_DVM_2021/UI/Interface/ArraysWindow.java
+++ b/src/_VisualDVM/Visual/Interface/ArraysWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 public interface ArraysWindow extends VisualizerForm, FormWithSplitters{
     void ShowArrays();
     void ShowNoArrays();
diff --git a/src/Visual_DVM_2021/UI/Interface/CallbackWindow.java b/src/_VisualDVM/Visual/Interface/CallbackWindow.java
similarity index 95%
rename from src/Visual_DVM_2021/UI/Interface/CallbackWindow.java
rename to src/_VisualDVM/Visual/Interface/CallbackWindow.java
index 5ae95571..7b864975 100644
--- a/src/Visual_DVM_2021/UI/Interface/CallbackWindow.java
+++ b/src/_VisualDVM/Visual/Interface/CallbackWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 public interface CallbackWindow extends VisualizerForm {
     void ShowAccount();
     void ShowBugReports();
diff --git a/src/Visual_DVM_2021/UI/Interface/CommentInterface.java b/src/_VisualDVM/Visual/Interface/CommentInterface.java
similarity index 84%
rename from src/Visual_DVM_2021/UI/Interface/CommentInterface.java
rename to src/_VisualDVM/Visual/Interface/CommentInterface.java
index 17f82ab1..12fc6abc 100644
--- a/src/Visual_DVM_2021/UI/Interface/CommentInterface.java
+++ b/src/_VisualDVM/Visual/Interface/CommentInterface.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 import javax.swing.*;
 public interface CommentInterface extends VisualizerForm, FormWithSplitters {
     void setEditorScroll(JScrollPane scroll_in);
diff --git a/src/Visual_DVM_2021/UI/Interface/DebugWindow.java b/src/_VisualDVM/Visual/Interface/DebugWindow.java
similarity index 89%
rename from src/Visual_DVM_2021/UI/Interface/DebugWindow.java
rename to src/_VisualDVM/Visual/Interface/DebugWindow.java
index 089798f8..b334243f 100644
--- a/src/Visual_DVM_2021/UI/Interface/DebugWindow.java
+++ b/src/_VisualDVM/Visual/Interface/DebugWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 import javax.swing.*;
 public interface DebugWindow {
     JPanel getContent();
diff --git a/src/Visual_DVM_2021/UI/Interface/DescriptionInterface.java b/src/_VisualDVM/Visual/Interface/DescriptionInterface.java
similarity index 84%
rename from src/Visual_DVM_2021/UI/Interface/DescriptionInterface.java
rename to src/_VisualDVM/Visual/Interface/DescriptionInterface.java
index 3944ff62..2ffaf531 100644
--- a/src/Visual_DVM_2021/UI/Interface/DescriptionInterface.java
+++ b/src/_VisualDVM/Visual/Interface/DescriptionInterface.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 import javax.swing.*;
 public interface DescriptionInterface extends VisualizerForm,FormWithSplitters {
     void setEditorScroll(JScrollPane scroll_in);
diff --git a/src/Visual_DVM_2021/UI/Interface/FileWindow.java b/src/_VisualDVM/Visual/Interface/FileWindow.java
similarity index 97%
rename from src/Visual_DVM_2021/UI/Interface/FileWindow.java
rename to src/_VisualDVM/Visual/Interface/FileWindow.java
index 23cba3a9..f7716656 100644
--- a/src/Visual_DVM_2021/UI/Interface/FileWindow.java
+++ b/src/_VisualDVM/Visual/Interface/FileWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 public interface FileWindow extends VisualizerForm{
     void ShowText();
     void ShowLanguage();
diff --git a/src/Visual_DVM_2021/UI/Interface/FormWithSplitters.java b/src/_VisualDVM/Visual/Interface/FormWithSplitters.java
similarity index 86%
rename from src/Visual_DVM_2021/UI/Interface/FormWithSplitters.java
rename to src/_VisualDVM/Visual/Interface/FormWithSplitters.java
index aa3577bf..9528f327 100644
--- a/src/Visual_DVM_2021/UI/Interface/FormWithSplitters.java
+++ b/src/_VisualDVM/Visual/Interface/FormWithSplitters.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 import Common.Utils.CommonUtils;
 public interface FormWithSplitters {
     default void LoadSplitters() {
diff --git a/src/Visual_DVM_2021/UI/Interface/FunctionsWindow.java b/src/_VisualDVM/Visual/Interface/FunctionsWindow.java
similarity index 91%
rename from src/Visual_DVM_2021/UI/Interface/FunctionsWindow.java
rename to src/_VisualDVM/Visual/Interface/FunctionsWindow.java
index e0871675..214dac53 100644
--- a/src/Visual_DVM_2021/UI/Interface/FunctionsWindow.java
+++ b/src/_VisualDVM/Visual/Interface/FunctionsWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 import ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
 import javafx.util.Pair;
 public interface FunctionsWindow extends VisualizerForm, FormWithSplitters {
diff --git a/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java b/src/_VisualDVM/Visual/Interface/ProjectWindow.java
similarity index 97%
rename from src/Visual_DVM_2021/UI/Interface/ProjectWindow.java
rename to src/_VisualDVM/Visual/Interface/ProjectWindow.java
index bcd13fe7..c0bc5517 100644
--- a/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java
+++ b/src/_VisualDVM/Visual/Interface/ProjectWindow.java
@@ -1,6 +1,6 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 import Common.Visual.Trees.TreeForm;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 public interface ProjectWindow {
     //-
     ArraysWindow getArraysWindow();
diff --git a/src/Visual_DVM_2021/UI/Interface/SPFEditorInterface.java b/src/_VisualDVM/Visual/Interface/SPFEditorInterface.java
similarity index 91%
rename from src/Visual_DVM_2021/UI/Interface/SPFEditorInterface.java
rename to src/_VisualDVM/Visual/Interface/SPFEditorInterface.java
index c55a0eb7..74a8ba40 100644
--- a/src/Visual_DVM_2021/UI/Interface/SPFEditorInterface.java
+++ b/src/_VisualDVM/Visual/Interface/SPFEditorInterface.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 public interface SPFEditorInterface {
     //-----------------------------------
     void ClearHighlights();
diff --git a/src/Visual_DVM_2021/UI/Interface/ScenariosWindow.java b/src/_VisualDVM/Visual/Interface/ScenariosWindow.java
similarity index 84%
rename from src/Visual_DVM_2021/UI/Interface/ScenariosWindow.java
rename to src/_VisualDVM/Visual/Interface/ScenariosWindow.java
index 9417a48b..299bb103 100644
--- a/src/Visual_DVM_2021/UI/Interface/ScenariosWindow.java
+++ b/src/_VisualDVM/Visual/Interface/ScenariosWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 public interface ScenariosWindow extends FormWithSplitters, VisualizerForm{
     void ShowAll();
     void FocusSapforTasksPackages();
diff --git a/src/Visual_DVM_2021/UI/Interface/StatisticsWindow.java b/src/_VisualDVM/Visual/Interface/StatisticsWindow.java
similarity index 67%
rename from src/Visual_DVM_2021/UI/Interface/StatisticsWindow.java
rename to src/_VisualDVM/Visual/Interface/StatisticsWindow.java
index d69d71df..470345db 100644
--- a/src/Visual_DVM_2021/UI/Interface/StatisticsWindow.java
+++ b/src/_VisualDVM/Visual/Interface/StatisticsWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 public interface StatisticsWindow extends VisualizerForm{
     void ShowAll();
 }
diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/_VisualDVM/Visual/Interface/TestingWindow.java
similarity index 97%
rename from src/Visual_DVM_2021/UI/Interface/TestingWindow.java
rename to src/_VisualDVM/Visual/Interface/TestingWindow.java
index 68788c5e..38220f16 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
+++ b/src/_VisualDVM/Visual/Interface/TestingWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
diff --git a/src/Visual_DVM_2021/UI/Interface/TestsWindow.java b/src/_VisualDVM/Visual/Interface/TestsWindow.java
similarity index 72%
rename from src/Visual_DVM_2021/UI/Interface/TestsWindow.java
rename to src/_VisualDVM/Visual/Interface/TestsWindow.java
index 9e95fb09..766b523b 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestsWindow.java
+++ b/src/_VisualDVM/Visual/Interface/TestsWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 import javax.swing.*;
 public interface TestsWindow {
     void ShowAll();
diff --git a/src/Visual_DVM_2021/UI/Interface/VariantsWindow.java b/src/_VisualDVM/Visual/Interface/VariantsWindow.java
similarity index 93%
rename from src/Visual_DVM_2021/UI/Interface/VariantsWindow.java
rename to src/_VisualDVM/Visual/Interface/VariantsWindow.java
index 69ff2de5..37405064 100644
--- a/src/Visual_DVM_2021/UI/Interface/VariantsWindow.java
+++ b/src/_VisualDVM/Visual/Interface/VariantsWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 public interface VariantsWindow extends VisualizerForm, FormWithSplitters {
     void ShowProjectDistribution();
     void ShowNoProjectDistribution();
diff --git a/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java b/src/_VisualDVM/Visual/Interface/VersionsWindow.java
similarity index 91%
rename from src/Visual_DVM_2021/UI/Interface/VersionsWindow.java
rename to src/_VisualDVM/Visual/Interface/VersionsWindow.java
index 1deffa65..bb01b213 100644
--- a/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java
+++ b/src/_VisualDVM/Visual/Interface/VersionsWindow.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 import Common.Visual.Trees.TreeForm;
 import ProjectData.Project.db_project_info;
 public interface VersionsWindow extends VisualizerForm {
diff --git a/src/Visual_DVM_2021/UI/Interface/VisualizerForm.java b/src/_VisualDVM/Visual/Interface/VisualizerForm.java
similarity index 90%
rename from src/Visual_DVM_2021/UI/Interface/VisualizerForm.java
rename to src/_VisualDVM/Visual/Interface/VisualizerForm.java
index d834bb1e..ef7f493c 100644
--- a/src/Visual_DVM_2021/UI/Interface/VisualizerForm.java
+++ b/src/_VisualDVM/Visual/Interface/VisualizerForm.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package _VisualDVM.Visual.Interface;
 import javax.swing.*;
 public interface VisualizerForm {
     //просто некая панель, на которой может быть все что угодно. монтируется на панель родителя,
diff --git a/src/Common_old/UI/Menus/AttachementsMenu.java b/src/_VisualDVM/Visual/Menus/AttachementsMenu.java
similarity index 95%
rename from src/Common_old/UI/Menus/AttachementsMenu.java
rename to src/_VisualDVM/Visual/Menus/AttachementsMenu.java
index a2fafd76..711de575 100644
--- a/src/Common_old/UI/Menus/AttachementsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/AttachementsMenu.java
@@ -1,8 +1,8 @@
-package Common_old.UI.Menus;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.Menus.StyledPopupMenu;
 import Common.Visual.Menus.VisualiserMenuItem;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java
similarity index 90%
rename from src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java
rename to src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java
index 0f645248..530614eb 100644
--- a/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java
+++ b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java
@@ -1,7 +1,7 @@
-package Common_old.UI.Menus_2023.CredentialsBar;
-import Common_old.Current;
-import Common_old.UI.Menus_2023.MenuBarButton;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
+package _VisualDVM.Visual.Menus.CredentialsBar;
+import _VisualDVM.Current;
+import Common.Visual.Controls.MenuBarButton;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java b/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
similarity index 93%
rename from src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java
rename to src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
index b0fe8390..d23d8554 100644
--- a/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
@@ -1,7 +1,7 @@
-package Common_old.UI.Menus_2023.FastAccessMenuBar;
+package _VisualDVM.Visual.Menus.FastAccessMenuBar;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Common_old/UI/Menus_2023/FileMenuBar/FileMenuBar.java b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
similarity index 94%
rename from src/Common_old/UI/Menus_2023/FileMenuBar/FileMenuBar.java
rename to src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
index 2b2bae76..4778b038 100644
--- a/src/Common_old/UI/Menus_2023/FileMenuBar/FileMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
@@ -1,7 +1,7 @@
-package Common_old.UI.Menus_2023.FileMenuBar;
-import Common_old.UI.Menus_2023.MenuBarButton;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
-import Common_old.UI.UI;
+package _VisualDVM.Visual.Menus.FileMenuBar;
+import Common.Visual.Controls.MenuBarButton;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.UI.Editor.SPFEditor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
diff --git a/src/Common_old/UI/Menus_2023/FileMenuBar/FileSettingsMenu.java b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
similarity index 87%
rename from src/Common_old/UI/Menus_2023/FileMenuBar/FileSettingsMenu.java
rename to src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
index 27777ee7..e75518ee 100644
--- a/src/Common_old/UI/Menus_2023/FileMenuBar/FileSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
@@ -1,10 +1,10 @@
-package Common_old.UI.Menus_2023.FileMenuBar;
-import Common_old.Current;
-import Common_old.UI.Menus_2023.LanguagesSubmenu;
-import Common_old.UI.Menus_2023.StylesSubmenu;
-import Common_old.UI.Menus_2023.TypesSubmenu;
-import Common_old.UI.Menus_2023.VisualiserMenu;
-import Common_old.UI.UI;
+package _VisualDVM.Visual.Menus.FileMenuBar;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.LanguagesSubmenu;
+import _VisualDVM.Visual.Menus.StylesSubmenu;
+import _VisualDVM.Visual.Menus.TypesSubmenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.FileType;
 import ProjectData.Files.LanguageStyle;
 import ProjectData.LanguageName;
diff --git a/src/Common_old/UI/Menus/FileStyleMenu.java b/src/_VisualDVM/Visual/Menus/FileStyleMenu.java
similarity index 93%
rename from src/Common_old/UI/Menus/FileStyleMenu.java
rename to src/_VisualDVM/Visual/Menus/FileStyleMenu.java
index 622e5863..8f7ef06e 100644
--- a/src/Common_old/UI/Menus/FileStyleMenu.java
+++ b/src/_VisualDVM/Visual/Menus/FileStyleMenu.java
@@ -1,7 +1,7 @@
-package Common_old.UI.Menus;
+package _VisualDVM.Visual.Menus;
 import Common.Visual.Menus.StyledPopupMenu;
 import Common.Visual.Menus.VisualiserMenuItem;
-import Common_old.Current;
+import _VisualDVM.Current;
 import ProjectData.Files.LanguageStyle;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Menus/GraphMenu.java b/src/_VisualDVM/Visual/Menus/GraphMenu.java
similarity index 97%
rename from src/Common_old/UI/Menus/GraphMenu.java
rename to src/_VisualDVM/Visual/Menus/GraphMenu.java
index b81c411f..8cf04829 100644
--- a/src/Common_old/UI/Menus/GraphMenu.java
+++ b/src/_VisualDVM/Visual/Menus/GraphMenu.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus;
+package _VisualDVM.Visual.Menus;
 import Common.Visual.Menus.StyledPopupMenu;
 import Common.Visual.Menus.VisualiserMenuItem;
 import Common.Visual.Trees.StyledTree;
diff --git a/src/Common_old/UI/Menus_2023/LanguagesSubmenu.java b/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java
similarity index 97%
rename from src/Common_old/UI/Menus_2023/LanguagesSubmenu.java
rename to src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java
index 2eba08c7..84d54320 100644
--- a/src/Common_old/UI/Menus_2023/LanguagesSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import ProjectData.LanguageName;
 
diff --git a/src/Common_old/UI/Menus/MainEditorMenu.java b/src/_VisualDVM/Visual/Menus/MainEditorMenu.java
similarity index 99%
rename from src/Common_old/UI/Menus/MainEditorMenu.java
rename to src/_VisualDVM/Visual/Menus/MainEditorMenu.java
index 63d053ef..4576c2a8 100644
--- a/src/Common_old/UI/Menus/MainEditorMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainEditorMenu.java
@@ -1,10 +1,10 @@
-package Common_old.UI.Menus;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.Menus.TextEditorMenu;
 import Common.Visual.Menus.VisualiserMenuItem;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Visual.Editor.CaretInfo;
-import Common_old.Utils.Utils;
+import _VisualDVM.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.UI.Editor.SPFEditor;
 import ProjectData.SapforData.Functions.FuncCall;
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/AnalysesMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java
similarity index 84%
rename from src/Common_old/UI/Menus_2023/MainMenuBar/AnalysesMenu.java
rename to src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java
index 54ce5d03..3ef20a9e 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/AnalysesMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java
@@ -1,5 +1,5 @@
-package Common_old.UI.Menus_2023.MainMenuBar;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+package _VisualDVM.Visual.Menus.MainMenuBar;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Repository.Component.Sapfor.Sapfor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java
similarity index 91%
rename from src/Common_old/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java
rename to src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java
index 933a27e2..577f0313 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java
@@ -1,5 +1,5 @@
-package Common_old.UI.Menus_2023.MainMenuBar;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+package _VisualDVM.Visual.Menus.MainMenuBar;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class GlobalCleaningMenu extends VisualiserMenu {
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
similarity index 95%
rename from src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java
rename to src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
index 3c5473d4..181e4dc8 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
@@ -1,7 +1,7 @@
-package Common_old.UI.Menus_2023.MainMenuBar;
+package _VisualDVM.Visual.Menus.MainMenuBar;
 import Common.Utils.CommonUtils;
 import Common.Visual.Menus.VisualiserMenuItem;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import GlobalData.DBLastProject.DBLastProject;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
similarity index 92%
rename from src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java
rename to src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
index 4bdd0fe4..7a2436bb 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
@@ -1,10 +1,10 @@
-package Common_old.UI.Menus_2023.MainMenuBar;
+package _VisualDVM.Visual.Menus.MainMenuBar;
 import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.MenuBarButton;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
-import Common_old.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
-import Common_old.UI.UI;
+import Common.Visual.Controls.MenuBarButton;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
+import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
+import _VisualDVM.Visual.UI;
 import Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/MainWindow.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainWindow.java
similarity index 84%
rename from src/Common_old/UI/Menus_2023/MainMenuBar/MainWindow.java
rename to src/_VisualDVM/Visual/Menus/MainMenuBar/MainWindow.java
index 9f2ca8ee..d72df2f5 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/MainWindow.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainWindow.java
@@ -1,5 +1,5 @@
-package Common_old.UI.Menus_2023.MainMenuBar;
-import Visual_DVM_2021.UI.Interface.*;
+package _VisualDVM.Visual.Menus.MainMenuBar;
+import _VisualDVM.Visual.Interface.*;
 public interface MainWindow {
     void Show();
     void ShowProject();
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/TransformationsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java
similarity index 92%
rename from src/Common_old/UI/Menus_2023/MainMenuBar/TransformationsMenu.java
rename to src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java
index fe9435f1..856c4315 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/TransformationsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java
@@ -1,6 +1,6 @@
-package Common_old.UI.Menus_2023.MainMenuBar;
-import Common_old.UI.Menus.PassesSubMenu;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+package _VisualDVM.Visual.Menus.MainMenuBar;
+import _VisualDVM.Visual.Menus.PassesSubMenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Repository.Component.Sapfor.Sapfor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
similarity index 87%
rename from src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
rename to src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
index 0926872b..b6553a70 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
@@ -1,6 +1,6 @@
-package Common_old.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu;
+package _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.SettingsSubmenu;
+import _VisualDVM.Visual.Menus.SettingsSubmenu;
 import GlobalData.Settings.SettingName;
 public class CompactnessSettingsMenu extends SettingsSubmenu {
     public CompactnessSettingsMenu(){
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
similarity index 88%
rename from src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
rename to src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
index a041315f..feffb7cf 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
@@ -1,8 +1,8 @@
-package Common_old.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu;
+package _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Menus.PropertiesSubmenu;
-import Common_old.UI.Menus_2023.SettingsSubmenu;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Visual.Menus.PropertiesSubmenu;
+import _VisualDVM.Visual.Menus.SettingsSubmenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 public class VisualiserSettingsMenu extends VisualiserMenu {
diff --git a/src/Common_old/UI/Menus_2023/PassMenuItem.java b/src/_VisualDVM/Visual/Menus/PassMenuItem.java
similarity index 88%
rename from src/Common_old/UI/Menus_2023/PassMenuItem.java
rename to src/_VisualDVM/Visual/Menus/PassMenuItem.java
index 0190be39..cc772d5b 100644
--- a/src/Common_old/UI/Menus_2023/PassMenuItem.java
+++ b/src/_VisualDVM/Visual/Menus/PassMenuItem.java
@@ -1,7 +1,8 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.Menus.VisualiserMenuItem;
 import Visual_DVM_2021.Passes.Pass_2021;
+import _VisualDVM.Visual.Controls.PassControl;
 public class PassMenuItem extends VisualiserMenuItem implements PassControl {
     @Override
     public void setIcon(String icon_path) {
diff --git a/src/Common_old/UI/Menus/PassesSubMenu.java b/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
similarity index 94%
rename from src/Common_old/UI/Menus/PassesSubMenu.java
rename to src/_VisualDVM/Visual/Menus/PassesSubMenu.java
index 7e4401d1..9839be87 100644
--- a/src/Common_old/UI/Menus/PassesSubMenu.java
+++ b/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
diff --git a/src/Common_old/UI/Menus/ProjectFilesMenu.java b/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
similarity index 95%
rename from src/Common_old/UI/Menus/ProjectFilesMenu.java
rename to src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
index cdd41fe7..8aaca668 100644
--- a/src/Common_old/UI/Menus/ProjectFilesMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
@@ -1,14 +1,10 @@
-package Common_old.UI.Menus;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.Menus.VisualiserMenuItem;
-import Common_old.Current;
+import _VisualDVM.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.Visual.Trees.StyledTree;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.Files.FileType;
 import ProjectData.Files.LanguageStyle;
 import ProjectData.LanguageName;
diff --git a/src/Common_old/UI/Menus_2023/ProjectMenuBar/FilesOperationsMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java
similarity index 67%
rename from src/Common_old/UI/Menus_2023/ProjectMenuBar/FilesOperationsMenu.java
rename to src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java
index 67c78a5e..a5c24ef8 100644
--- a/src/Common_old/UI/Menus_2023/ProjectMenuBar/FilesOperationsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java
@@ -1,5 +1,5 @@
-package Common_old.UI.Menus_2023.ProjectMenuBar;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+package _VisualDVM.Visual.Menus.ProjectMenuBar;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 public class FilesOperationsMenu extends VisualiserMenu {
     public FilesOperationsMenu() {
         super("Массовые операции над файлами","/icons/MassFiles.png" );
diff --git a/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectMenuBar.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java
similarity index 82%
rename from src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectMenuBar.java
rename to src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java
index 9e59f3c5..3ff3a43d 100644
--- a/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java
@@ -1,7 +1,7 @@
-package Common_old.UI.Menus_2023.ProjectMenuBar;
-import Common_old.UI.Menus_2023.MenuBarButton;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
-import Common_old.UI.UI;
+package _VisualDVM.Visual.Menus.ProjectMenuBar;
+import Common.Visual.Controls.MenuBarButton;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
+import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
similarity index 90%
rename from src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java
rename to src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
index 77662b90..a8d4000c 100644
--- a/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
@@ -1,10 +1,10 @@
-package Common_old.UI.Menus_2023.ProjectMenuBar;
+package _VisualDVM.Visual.Menus.ProjectMenuBar;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import Common_old.UI.Menus_2023.LanguagesSubmenu;
-import Common_old.UI.Menus_2023.SettingsSubmenu;
-import Common_old.UI.Menus_2023.StylesSubmenu;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.LanguagesSubmenu;
+import _VisualDVM.Visual.Menus.SettingsSubmenu;
+import _VisualDVM.Visual.Menus.StylesSubmenu;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.LanguageStyle;
diff --git a/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
similarity index 88%
rename from src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
rename to src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
index 5b0f707c..2983087c 100644
--- a/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
@@ -1,11 +1,11 @@
-package Common_old.UI.Menus_2023.ProjectMenuBar;
+package _VisualDVM.Visual.Menus.ProjectMenuBar;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
-import Common_old.UI.Menus_2023.VisualiserMenu;
+import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import ProjectData.ProjectView;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Menus/PropertiesSubmenu.java b/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
similarity index 94%
rename from src/Common_old/UI/Menus/PropertiesSubmenu.java
rename to src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
index bde1646f..a64125a7 100644
--- a/src/Common_old/UI/Menus/PropertiesSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import _VisualDVM.Global;
diff --git a/src/Common_old/UI/Menus/SelectionTreeMenu.java b/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
similarity index 97%
rename from src/Common_old/UI/Menus/SelectionTreeMenu.java
rename to src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
index 5a54c62e..eb2bec3b 100644
--- a/src/Common_old/UI/Menus/SelectionTreeMenu.java
+++ b/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
@@ -1,8 +1,7 @@
-package Common_old.UI.Menus;
+package _VisualDVM.Visual.Menus;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common.Visual.Menus.VisualiserMenuItem;
-import Common_old.UI.Menus_2023.StableMenuItem;
 import Common.Visual.Selectable;
 import Common.Visual.Trees.DataTree;
 import Common.Visual.Trees.SelectableTree;
diff --git a/src/Common_old/UI/Menus_2023/SettingsSubmenu.java b/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
similarity index 94%
rename from src/Common_old/UI/Menus_2023/SettingsSubmenu.java
rename to src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
index 03461cb9..0a56fe98 100644
--- a/src/Common_old/UI/Menus_2023/SettingsSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import GlobalData.GlobalDatabase;
diff --git a/src/Common_old/UI/Menus_2023/StableMenuItem.java b/src/_VisualDVM/Visual/Menus/StableMenuItem.java
similarity index 84%
rename from src/Common_old/UI/Menus_2023/StableMenuItem.java
rename to src/_VisualDVM/Visual/Menus/StableMenuItem.java
index 658a1bce..95ee45ea 100644
--- a/src/Common_old/UI/Menus_2023/StableMenuItem.java
+++ b/src/_VisualDVM/Visual/Menus/StableMenuItem.java
@@ -1,7 +1,7 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common.Visual.Menus.VisualiserMenuItem;
-import Common_old.UI.UI;
 
 import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
@@ -15,15 +15,15 @@ class StableItemUI extends BasicMenuItemUI {
     @Override
     protected void doClick(MenuSelectionManager msm) {
         menuItem.doClick(0);
-        if (UI.last_menu_path != null)
-            MenuSelectionManager.defaultManager().setSelectedPath(UI.last_menu_path);
+        if (CommonUI.last_menu_path != null)
+            MenuSelectionManager.defaultManager().setSelectedPath(CommonUI.last_menu_path);
     }
 }
 public class StableMenuItem extends VisualiserMenuItem {
     {
         getModel().addChangeListener(e -> {
             if (getModel().isArmed() && isShowing())
-                UI.last_menu_path = MenuSelectionManager.defaultManager().getSelectedPath();
+                CommonUI.last_menu_path = MenuSelectionManager.defaultManager().getSelectedPath();
         });
     }
     public StableMenuItem(String text) {
diff --git a/src/Common_old/UI/Menus_2023/StablePassMenuItem.java b/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java
similarity index 87%
rename from src/Common_old/UI/Menus_2023/StablePassMenuItem.java
rename to src/_VisualDVM/Visual/Menus/StablePassMenuItem.java
index 324e3554..2f1596c9 100644
--- a/src/Common_old/UI/Menus_2023/StablePassMenuItem.java
+++ b/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java
@@ -1,6 +1,7 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Visual_DVM_2021.Passes.Pass_2021;
+import _VisualDVM.Visual.Controls.PassControl;
 public class StablePassMenuItem extends StableMenuItem implements PassControl {
     @Override
     public void setIcon(String icon_path) {
diff --git a/src/Common_old/UI/Menus_2023/StylesSubmenu.java b/src/_VisualDVM/Visual/Menus/StylesSubmenu.java
similarity index 96%
rename from src/Common_old/UI/Menus_2023/StylesSubmenu.java
rename to src/_VisualDVM/Visual/Menus/StylesSubmenu.java
index e9b6a504..7c61f9be 100644
--- a/src/Common_old/UI/Menus_2023/StylesSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/StylesSubmenu.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Menus;
 import ProjectData.Files.LanguageStyle;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Menus/TestsCompilationFilterMenu.java b/src/_VisualDVM/Visual/Menus/TestsCompilationFilterMenu.java
similarity index 96%
rename from src/Common_old/UI/Menus/TestsCompilationFilterMenu.java
rename to src/_VisualDVM/Visual/Menus/TestsCompilationFilterMenu.java
index 76273f7c..06092376 100644
--- a/src/Common_old/UI/Menus/TestsCompilationFilterMenu.java
+++ b/src/_VisualDVM/Visual/Menus/TestsCompilationFilterMenu.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus;
+package _VisualDVM.Visual.Menus;
 import Common.Visual.Menus.StyledPopupMenu;
 import Common.Visual.Menus.VisualiserMenuItem;
 import GlobalData.Tasks.TaskState;
diff --git a/src/Common_old/UI/Menus_2023/TypesSubmenu.java b/src/_VisualDVM/Visual/Menus/TypesSubmenu.java
similarity index 96%
rename from src/Common_old/UI/Menus_2023/TypesSubmenu.java
rename to src/_VisualDVM/Visual/Menus/TypesSubmenu.java
index d59be63c..48a4a0cd 100644
--- a/src/Common_old/UI/Menus_2023/TypesSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/TypesSubmenu.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Menus;
 import ProjectData.Files.FileType;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java b/src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java
similarity index 89%
rename from src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
rename to src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java
index 5514b6e0..f1980fde 100644
--- a/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023.VariantsMenuBar;
+package _VisualDVM.Visual.Menus.VariantsMenuBar;
 import Common.Visual.Menus.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class VariantsMenuBar extends DataMenuBar {
diff --git a/src/Common_old/UI/Menus/VersionsMenu.java b/src/_VisualDVM/Visual/Menus/VersionsMenu.java
similarity index 95%
rename from src/Common_old/UI/Menus/VersionsMenu.java
rename to src/_VisualDVM/Visual/Menus/VersionsMenu.java
index 81353261..142d446e 100644
--- a/src/Common_old/UI/Menus/VersionsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/VersionsMenu.java
@@ -1,11 +1,10 @@
-package Common_old.UI.Menus;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.Menus.VisualiserMenuItem;
-import Common_old.Current;
+import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.StableMenuItem;
 import Common.Visual.Trees.DataTree;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class VersionsMenu extends GraphMenu<DataTree> {
diff --git a/src/Common_old/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java b/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java
similarity index 67%
rename from src/Common_old/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java
rename to src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java
index efcd4a07..11d683d1 100644
--- a/src/Common_old/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java
@@ -1,5 +1,5 @@
-package Common_old.UI.Menus_2023.VersionsMenuBar;
-import Common_old.UI.Menus_2023.VisualiserMenuBar;
+package _VisualDVM.Visual.Menus.VersionsMenuBar;
+import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class VersionsMenuBar extends VisualiserMenuBar {
     public VersionsMenuBar(){
diff --git a/src/Common_old/UI/Menus_2023/VisualiserMenu.java b/src/_VisualDVM/Visual/Menus/VisualiserMenu.java
similarity index 96%
rename from src/Common_old/UI/Menus_2023/VisualiserMenu.java
rename to src/_VisualDVM/Visual/Menus/VisualiserMenu.java
index 659220ec..687c3e33 100644
--- a/src/Common_old/UI/Menus_2023/VisualiserMenu.java
+++ b/src/_VisualDVM/Visual/Menus/VisualiserMenu.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
diff --git a/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java b/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
similarity index 97%
rename from src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
rename to src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
index 9caf20f1..eb6472f5 100644
--- a/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Menus_2023;
+package _VisualDVM.Visual.Menus;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common.Visual.Fonts.VisualiserFonts;
diff --git a/src/Common_old/UI/UI.java b/src/_VisualDVM/Visual/UI.java
similarity index 96%
rename from src/Common_old/UI/UI.java
rename to src/_VisualDVM/Visual/UI.java
index 52ffad80..cf209c58 100644
--- a/src/Common_old/UI/UI.java
+++ b/src/_VisualDVM/Visual/UI.java
@@ -1,16 +1,16 @@
-package Common_old.UI;
+package _VisualDVM.Visual;
 import Common.Database.Tables.DataSet;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 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;
-import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
-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 _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsBar;
+import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
+import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
+import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
+import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
+import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
+import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
 import Common.Visual.Tables.*;
 import Common.Visual.Trees.GraphTreeCellRenderer;
 import Common.Visual.Trees.SelectionTreeCellRenderer;
@@ -85,8 +85,8 @@ import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer
 import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
 import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.UI.Interface.DebugWindow;
-import Visual_DVM_2021.UI.Interface.VersionsWindow;
+import _VisualDVM.Visual.Interface.DebugWindow;
+import _VisualDVM.Visual.Interface.VersionsWindow;
 import Visual_DVM_2021.UI.Main.DebugForm;
 import Visual_DVM_2021.UI.Main.MainForm;
 import Visual_DVM_2021.UI.Main.ProfilesForm;
@@ -105,7 +105,6 @@ 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;
     public static TestingBar testingBar = null;
     public static CredentialsBar credentialsBar = null;
diff --git a/src/_VisualDVM/Visual/Windows/ProjectsChooser.java b/src/_VisualDVM/Visual/Windows/ProjectsChooser.java
index 81d6fc3a..b4df1108 100644
--- a/src/_VisualDVM/Visual/Windows/ProjectsChooser.java
+++ b/src/_VisualDVM/Visual/Windows/ProjectsChooser.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Visual.Windows;
 import Common.Utils.CommonUtils;
 import Common.Visual.Windows.Dialog.VFileChooser_;
-import Common_old.Constants;
+import _VisualDVM.Constants;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
diff --git a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
index c2d925a3..5d880725 100644
--- a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
+++ b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
@@ -2,10 +2,10 @@ package _VisualDVM.Visual.Windows;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common.Visual.Windows.Form;
-import Common_old.Current;
+import _VisualDVM.Current;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Trees.StyledTree;
-import Common_old.UI.UI;
+import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import javafx.util.Pair;