diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c434df0d..39e090ae 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,804 +7,179 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/1.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/Apply.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/Delete.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/Edit.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/Excel.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/GlobalStatistic.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/Help.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/NotPick.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/Pick.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/RedAdd.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/RedPick.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/Save.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/Settings.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/Unknown.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/VisualCache.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/CommonConstants.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/icons/Filter.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/icons/SelectAll.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/icons/UnselectAll.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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Current.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/ColumnType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/ColumnType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/DBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/DBObjectFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DBObjectFilter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/DBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/DBTableColumn.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DBTableColumn.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/DataSetAnchestor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSetAnchestor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/DataSetFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFilter.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/FKBehaviour.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/FKBehaviour.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/FKCurrentObjectBehaviuor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/FKCurrentObjectBehaviuor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/FKDataBehaviour.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/FKDataBehaviour.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/iDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/iDBObject.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/iDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/iDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/iDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/iDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/nDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/nDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/rDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/rDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/riDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/riDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/GlobalProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Properties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Properties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/ComboBox/StyledTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/ComboBox/StyledTextComboBox.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/ControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/ControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/ControlWithCurrentForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/ControlWithCurrentForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/DataControl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DataControl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/DataControl_OLD.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DataControl_OLD.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/DebugPrintLevel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DebugPrintLevel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/DragDrop/ExampleDrop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DragDrop/ExampleDrop.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/DragDrop/FileDrop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DragDrop/FileDrop.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Editor/CaretInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Editor/CaretInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Editor/Viewer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Editor/Viewer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/EmptyDialogFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/EmptyDialogFields.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/EmptyDialogFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/EmptyDialogFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Label/ShortLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Label/ShortLabel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/List/HyperlinksStyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/List/HyperlinksStyledList.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/List/StyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/List/StyledList.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/AttachementsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/AttachementsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/FileStyleMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/FileStyleMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/GraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/GraphMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/MainEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/MainEditorMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/PassesSubMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/PassesSubMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/ProjectFilesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/ProjectFilesMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/PropertiesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/PropertiesSubmenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/SelectionTreeMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/StyledPopupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/StyledPopupMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TableMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/TestsCompilationFilterMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TestsCompilationFilterMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/TextComboBoxMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextComboBoxMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/TextEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextEditorMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/VersionsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/VersionsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/VisualiserMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/VisualiserMenuItem.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/DataMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ECButtonPosition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ECButtonPosition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ExpandCollapseButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ExpandCollapseButton.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/FileMenuBar/FileMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FileMenuBar/FileMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/FileMenuBar/FileSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FileMenuBar/FileSettingsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/LanguagesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/LanguagesSubmenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/AnalysesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/AnalysesMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/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/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MenuBarButton.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/PassButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/PassButton.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/PassControl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/PassControl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/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/UI/Menus_2023/ProjectMenuBar/FilesOperationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/FilesOperationsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ProjectMenuBar/ProjectMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SettingsSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/SettingsSubmenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/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/UI/Menus_2023/StablePassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StablePassMenuItem.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/StylesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StylesSubmenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TypesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/TypesSubmenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/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/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/ProgressBar/StyledProgressBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/ProgressBar/StyledProgressBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Selectable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Selectable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/StatusEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/StatusEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/ColumnFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/ColumnFilter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/ColumnInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/ColumnInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/ConfigurationAutoRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/ConfigurationAutoRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/ConfigurationAutoSwitcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/DBObjectEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/DBObjectRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/DBObjectSelectionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectSelectionRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/DBObjectSelector.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectSelector.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/DataTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/DataTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/DateRenderer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/DateRenderer_.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/EditableHeaderRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/EditableHeaderRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/EditorCell.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/EditorCell.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/Grid/GridAnchestor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/Grid/GridAnchestor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/HiddenListRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/HyperlinksRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/HyperlinksRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/MaskedIntegerValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/MaskedIntegerValueRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/MultilineRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/MultilineRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/ProgressBarRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/ProgressBarRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/RendererCell.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/RendererCell.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/StatusEnumRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/StyledCellLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledCellLabel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/StyledTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/TableEditors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/TableEditors.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/TableRenderers.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/TableRenderers.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/TopLeftRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/TopLeftRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/VectorEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/VectorEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/WrapTextRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/TextArea/StyledTextArea.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/TextArea/StyledTextArea.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/TextField/StyledPasswordField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/TextField/StyledPasswordField.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/TextField/StyledTextField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/TextField/StyledTextField.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/DarkVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/DarkVisualiserTheme.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/FortranSPFTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/FortranSPFTokenMaker.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/FreeFortranSPFTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/FreeFortranSPFTokenMaker.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/LightVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/LightVisualiserTheme.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/ProvidedTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/ProvidedTokenMaker.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/ThemeElement.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/ThemeElement.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/TokenProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/TokenProvider.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/VisualiserColor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/VisualiserColor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/VisualiserFonts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/VisualiserFonts.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/VisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/VisualiserTheme.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/VisualiserThemeName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/VisualiserThemeName.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/dark_editor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/dark_editor.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/light_editor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Themes/light_editor.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Trees/DataTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/DataTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Trees/GraphTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/GraphTreeCellRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Trees/SelectableTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectableTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Trees/SelectionTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Trees/StyledTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTreeCellRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/TreeForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Trees/TreeRenderers.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/TreeRenderers.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/ConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/DVMConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/DVMConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/PackageCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/SapforConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/SapforConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/VisualCache.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/VisualCaches.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualiserStringList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/VisualiserStringList.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/DBObjectDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DBObjectDialog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/DialogFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/DialogSlider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogSlider.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/DialogSpinner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogSpinner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/DialogTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/DialogTextField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogTextField.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/DialogWrapText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogWrapText.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/NumberDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/NumberDialog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/PercentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/PercentsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/SessionMaxtimeDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/SessionMaxtimeDialog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/SliderNumberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/SliderNumberForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/SpinnerNumberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/SpinnerNumberForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/Text/ComboTextDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/ComboTextDialog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/Text/FileNameForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/FileNameForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/Text/MultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/MultilineTextForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/Text/TextDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/TextDialog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/Text/TextFieldDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/TextFieldDialog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Form.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/FormType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/FormType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Sapfor.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Sapfor.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/SearchReplaceForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Files/ProjectsChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Files/ProjectsChooser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Files/VDirectoryChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Files/VDirectoryChooser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Files/VFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Files/VFileChooser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Files/VFileChooser_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Files/VFileChooser_.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/StringTemplate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/StringTemplate.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/TextLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/TextLog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/DVMHelpParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/DVMHelpParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/EnvironmentState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/EnvironmentState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/HelpParserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/HelpParserState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/OptionState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/OptionState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/PathValidator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/PathValidator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/PathValidatorState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/PathValidatorState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/ShellParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/ShellParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/ShellParserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/ShellParserState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/StatementsChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/StatementsChecker.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/Validator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/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/Account/AccountsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Account/AccountsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.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/DataSetFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFilter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.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/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/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TableMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/ColumnInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/ColumnInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualiserStringList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/VisualiserStringList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/ProjectsChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Files/ProjectsChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/VDirectoryChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Files/VDirectoryChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/VFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Files/VFileChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/ShellParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/ShellParser.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/CompilersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/UI/CompilerFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/UI/CompilerFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/CompilerEnvironment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/CompilerEnvironment.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/CompilerEnvironment/UI/CompilerEnvironmentsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/CompilerOption.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/CompilerOption.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/CompilerOption/UI/CompilerOptionsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/GlobalData/Credentials/Credentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Credentials/Credentials.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Credentials/CredentialsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Credentials/CredentialsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/DBLastProject/DBLastProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DBLastProject/DBLastProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/DBLastProject/LastProjectsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DBLastProject/LastProjectsDBTable.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/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/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/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/DirInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfo.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/FileObject/DirInfosFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/FormsParams/DBForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FormsParams/DBForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/FormsParams/DBMainFormParams.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FormsParams/DBMainFormParams.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/FormsParams/FormsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FormsParams/FormsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/FormsParams/MainFormParamsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FormsParams/MainFormParamsDBTable.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/Grid/Grid.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Grid/Grid.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Grid/GridsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Grid/GridsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/Machine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/Machine.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/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/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/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModuleAnchestor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModuleAnchestor.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/ModulesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesMenuBar.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/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/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/SapforProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfile/SapforProfile.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/SapforProfile/UI/SapforProfileFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfile/UI/SapforProfileFields.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/Splitter/Splitter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Splitter/Splitter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Splitter/SplittersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Splitter/SplittersDBTable.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/QueueSystem/QueueSystem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/QueueSystem/QueueSystem.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/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/Local/Windows/WindowsLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.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/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UI/UserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UI/UserFields.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UserState.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/Program.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Program.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/DBArray/DBArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/DBArray/DBArray.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/FilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/FilesDBTable.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/AutoComplete/SAPFOR/Directives/BaseDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.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/MessageRecommendation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Recommendations/MessageRecommendation.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/PredictorStatistic/PredictorStatisticsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/PredictorStatistic/PredictorStatisticsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/PredictorStatistic/PredictorStatistics_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/PredictorStatistic/PredictorStatistics_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/ProjectInfoDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/ProjectInfoDBTable.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/ArrayDecl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ArrayDecl.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/Distribution/Dimension.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/Distribution/Dimension.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/TemplateDimension.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/Templates/TemplateDimension.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/DimensionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/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/FileObjectWithMessages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/FileObjectWithMessages.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCoordinates.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCoordinates.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCoordinatesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCoordinatesDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncInfo.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/Graph/GraphInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.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/DependencyInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/DependencyInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/FileInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/FileInfo.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/EGoto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/EGoto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IGoto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IGoto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Loop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Loop.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/NonRectIter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/NonRectIter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Stop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Stop.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/Regions/UI/ParallelRegionFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.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/UI/VariantRankRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/VariantsSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/BugReport/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/BugReportState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.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/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReportsDatabase.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/ComponentState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentState.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/Instruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Instruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/OSDComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/OSDComponent.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/Sapfor/Sapfor_F.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor_F.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/PickUpComponentFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PickUpComponentFields.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/Component/UI/PublishForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PublishForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.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/EmailMessage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/EmailMessage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryClient.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/Server/ServerExchangeUnit_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerExchangeUnit_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/SubscriberRights/SubscriberRights.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberRights/SubscriberRights.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/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/Subscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/Subscriber.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/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.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/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.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/Json/GroupJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Json/GroupJson.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/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/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcessSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcessSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Settings/Settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Settings/Settings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.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/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.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/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/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/TestingPackageToKill/TestingPackageToKill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackageToKill/TestingPackageToKill.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackageToKill/TestingPackagesToKillDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackageToKill/TestingPackagesToKillDBTable.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/Common/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.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/DVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettings.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/DVMSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.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/DVMRunTasksBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/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/LocalDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/LocalDVMTestingPlanner.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/SapforConfiguration_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTest_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTest_json.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/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/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/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/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.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/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.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/SapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.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/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.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/PackageSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageSummary.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.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/SapforTasksPackage/UI/VersionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionNode.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/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStatsDBTable.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/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ActualizeTestingPackages.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AddObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AddObjectPass.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/ActualizeServerSapfors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizeServerSapfors.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/AddCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddCompiler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameter.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/AddEnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.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/AddMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddMachine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddMakefile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.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/ArchivesBackupPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.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/CompileServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompileServerSapfor.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/DeleteCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteConfiguration.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/DeleteDVMParameter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMSettings.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/DeleteEnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.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/DeleteGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteGroup.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/DeleteMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteMachine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteProfile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.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/DeleteSapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforSettingsCommand.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/DeleteSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteUser.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/DropLastProjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropLastProjects.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/EditCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditCompiler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditDVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditDVMSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditGroup.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditMachine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditMakefile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditModule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProfile.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/EditRunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforSettingsCommand.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriber.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditUser.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.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/GetComponentsActualVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetComponentsActualVersions.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/ImportFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ImportFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/MakeScreenShot.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/MakeScreenShot.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/PickCompilerOptions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.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/PrepareForModulesAssembly.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.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/PublishComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishDVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishDVMSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforSettings.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/PublishServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestingServer.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/RemoteSingleCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.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_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.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_GetArrayLinks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayLinks.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_GetMaxMinBlockDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.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/SPF_PredictParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_PredictParallelVariant.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.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/SaveProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveProfile.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/ShowInstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowInstruction.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/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.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/UpdateSelectedComponents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSelectedComponents.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/CloneConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/CloneConfiguration.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/DeleteObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/DeleteObjectPass.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/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/EditObjectPass.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/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ObjectPass.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/SapforModification.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforModification.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/ComponentsRepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/ComponentsRepositoryPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/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/Server/ServerObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/ServerObjectPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.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/Passes/UI/PassFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.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/FormWithSplitters.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/FormWithSplitters.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/Loggable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/ProjectWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/VersionsWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/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/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/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/ProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.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/Visual_DVM_2021/UI/Main/WelcomeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/WelcomeForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -904,10 +279,10 @@
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
       <recent name="Common.Utils.CommonUtils" />
+      <recent name="Common.CommonConstants" />
       <recent name="Common_old.Constants" />
       <recent name="Common.Constants" />
       <recent name="Common.Utils.Utils" />
-      <recent name="Repository.Component.Sapfor.Sapfor" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
diff --git a/src/Common/CommonConstants.java b/src/Common/CommonConstants.java
new file mode 100644
index 00000000..9ffb548c
--- /dev/null
+++ b/src/Common/CommonConstants.java
@@ -0,0 +1,7 @@
+package Common;
+public class CommonConstants {
+    public static final int Nan = -1;
+    public static char[] regular_metasymbols = new char[]{
+            '<', '>', '(', ')', '[', ']', '{', '}', '^', '-', '=', '$', '!', '|', '?', '*', '+', '.'
+    };
+}
diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java
index 3b74a433..2a1ad63e 100644
--- a/src/Common/Database/Database.java
+++ b/src/Common/Database/Database.java
@@ -1,8 +1,8 @@
 package Common.Database;
-import Common_old.Constants;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common.Database.Tables.DBTable;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DataSet;
 import Common.Database.Objects.iDBObject;
@@ -85,7 +85,7 @@ public abstract class Database {
     public DBObject InsertS(DBObject object) throws Exception {
         DBTable table = tables.get(object.getClass());
         if (!(object instanceof iDBObject) && table.Data.containsKey(object.getPK()))
-            throw new RepositoryRefuseException("Таблица " + Utils.Brackets(table.Name) + " уже содержит объект с ключом " + Utils.Brackets(object.getPK().toString()));
+            throw new RepositoryRefuseException("Таблица " + CommonUtils.Brackets(table.Name) + " уже содержит объект с ключом " + CommonUtils.Brackets(object.getPK().toString()));
         insert(table, object);
         table.Data.put(object.getPK(), object);
         return object;
@@ -112,7 +112,7 @@ public abstract class Database {
             table.Data.remove(o.getPK());
             return o;
         } else
-            throw new RepositoryRefuseException("Таблица " + Utils.Brackets(table.Name) + " не содержит объект с ключом " + Utils.Brackets(to_delete.getPK().toString()));
+            throw new RepositoryRefuseException("Таблица " + CommonUtils.Brackets(table.Name) + " не содержит объект с ключом " + CommonUtils.Brackets(to_delete.getPK().toString()));
     }
     public DBObject DeleteByPK(Class object_class, Object key) throws Exception {
         DBTable table = tables.get(object_class);
@@ -122,7 +122,7 @@ public abstract class Database {
             table.Data.remove(key);
             return o;
         } else
-            throw new RepositoryRefuseException("Таблица " + Utils.Brackets(table.Name) + " не содержит объект с ключом " + Utils.Brackets(key.toString()));
+            throw new RepositoryRefuseException("Таблица " + CommonUtils.Brackets(table.Name) + " не содержит объект с ключом " + CommonUtils.Brackets(key.toString()));
     }
     // не работает с автоинкрементом.
     public DBObject getObjectCopyByPK(Class table_class, Object pk) throws Exception {
@@ -233,7 +233,7 @@ public abstract class Database {
                 (O) (tables.get(class_in).Data.get(pk)) : null;
     }
     public <O extends iDBObject> O getById(Class<O> class_in, int pk) {
-        return getByPK(class_in, pk, Constants.Nan);
+        return getByPK(class_in, pk, CommonConstants.Nan);
     }
     public <G, O extends DBObject, F extends DBObject> LinkedHashMap<G, F> getByFKAndGroupBy(O owner, Class<F> fk_class, String group_field, Class<G> group_class) {
         LinkedHashMap<G, F> res = new LinkedHashMap<>();
diff --git a/src/Common/Database/Objects/DBObject.java b/src/Common/Database/Objects/DBObject.java
index 2f7111fa..c721758f 100644
--- a/src/Common/Database/Objects/DBObject.java
+++ b/src/Common/Database/Objects/DBObject.java
@@ -1,7 +1,7 @@
 package Common.Database.Objects;
+import Common.Utils.CommonUtils;
 import Common_old.UI.Selectable;
 import Common.Utils.Index;
-import Common_old.Utils.Utils;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.Serializable;
@@ -34,7 +34,7 @@ public abstract class DBObject implements Selectable, Serializable {
     }
     public abstract Object getPK();
     public String getBDialogName() {
-        return Utils.Brackets(getDialogName());
+        return CommonUtils.Brackets(getDialogName());
     }
     public String getDialogName() {
         return getPK().toString();
diff --git a/src/Common/Database/Objects/iDBObject.java b/src/Common/Database/Objects/iDBObject.java
index 90d0dcd1..463f7d5d 100644
--- a/src/Common/Database/Objects/iDBObject.java
+++ b/src/Common/Database/Objects/iDBObject.java
@@ -1,5 +1,5 @@
 package Common.Database.Objects;
-import Common_old.Constants;
+import Common.CommonConstants;
 import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;
 //автоинкрементальный ключ
@@ -13,7 +13,7 @@ public class iDBObject extends DBObject {
     }
     @Override
     public Object getEmptyFK() {
-        return Constants.Nan;
+        return CommonConstants.Nan;
     }
     //---
     @Override
diff --git a/src/Common/Database/SQLITE/SQLiteDatabase.java b/src/Common/Database/SQLITE/SQLiteDatabase.java
index 41c54427..766071f8 100644
--- a/src/Common/Database/SQLITE/SQLiteDatabase.java
+++ b/src/Common/Database/SQLITE/SQLiteDatabase.java
@@ -3,6 +3,7 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DBTableColumn;
 import Common.Database.Database;
+import Common.Utils.CommonUtils;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassException;
@@ -116,7 +117,7 @@ public abstract class SQLiteDatabase extends Database {
                 Vector<String> columns_names = new Vector<>();
                 for (DBTableColumn column : table.columns.values())
                     columns_names.add(column.toString());
-                cmd += Utils.RBrackets(String.join(",", columns_names));
+                cmd += CommonUtils.RBrackets(String.join(",", columns_names));
                 statement.execute(cmd);
             }
         }
@@ -135,8 +136,8 @@ public abstract class SQLiteDatabase extends Database {
             }
             insertStatements.put(table.d, conn.prepareStatement(
                     "INSERT OR REPLACE INTO " + table.QName() + " " +
-                            Utils.RBrackets(String.join(",", column_names)) + " " + "VALUES " +
-                            Utils.RBrackets(String.join(",", column_values))));
+                            CommonUtils.RBrackets(String.join(",", column_names)) + " " + "VALUES " +
+                            CommonUtils.RBrackets(String.join(",", column_values))));
             //------------------------------------------------------------------------------->>
             Vector<String> new_values = new Vector();
             for (DBTableColumn column : table.columns.values()) {
@@ -194,7 +195,7 @@ public abstract class SQLiteDatabase extends Database {
             if (field_value != null) {
                 table.d.getField(column.Name).set(o, field_value);
             } else
-                throw new PassException("Ошибка при загрузке поля " + Utils.Brackets(column.Name) + " класса " + Utils.Brackets(table.d.getSimpleName()));
+                throw new PassException("Ошибка при загрузке поля " + CommonUtils.Brackets(column.Name) + " класса " + CommonUtils.Brackets(table.d.getSimpleName()));
         }
         return new Pair<>((K) o.getPK(), o);
     }
diff --git a/src/Common/Utils/CommonUtils.java b/src/Common/Utils/CommonUtils.java
index 8db21bcd..dd784bf7 100644
--- a/src/Common/Utils/CommonUtils.java
+++ b/src/Common/Utils/CommonUtils.java
@@ -1,26 +1,274 @@
 package Common.Utils;
+import Common.CommonConstants;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.nio.charset.Charset;
 public class CommonUtils {
+    //JSON
+    //--
+    //    public static String jsonToPrettyFormat(String packed) {
+    //        JsonParser parser = new JsonParser();
+    //        JsonObject json = parser.parse(packed).getAsJsonObject();
+    //        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+    //        return gson.toJson(json);
+    //    }
+    //--
     public static Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setPrettyPrinting().create();
-    /*
-    public static String jsonToPrettyFormat(String packed) {
-        JsonParser parser = new JsonParser();
-        JsonObject json = parser.parse(packed).getAsJsonObject();
-        Gson gson = new GsonBuilder().setPrettyPrinting().create();
-        return gson.toJson(json);
-    }
-     */
     public static <T> T jsonFromFile(File file, Class<T> json_class) throws Exception {
         return gson.fromJson(FileUtils.readFileToString(file, Charset.defaultCharset()), json_class);
     }
     public static void jsonToFile(Object json_object, File file) throws Exception {
         FileUtils.writeStringToFile(file, gson.toJson(json_object));
     }
+    //Синтаксис и регулярные выражения
+    public static String hideRegularMetasymbols(String word) {
+        String res = word.replace("\\", "\\\\");
+        for (char c : CommonConstants.regular_metasymbols)
+            res = res.replace(String.valueOf(c), "\\" + c);
+        return res;
+    }
+    public static String DQuotes(Object o) {
+        return "\"" + o.toString() + "\"";
+    }
+    public static String Quotes(Object o) {
+        return "'" + o.toString() + "'";
+    }
+    public static String Brackets(Object o) {
+        return "[" + o.toString() + "]";
+    }
+    public static String RBrackets(Object o) {
+        return "(" + o.toString() + ")";
+    }
+    public static String TBrackets(Object o) {
+        return "<" + o.toString() + ">";
+    }
+    public static boolean ContainsCyrillic(String string) {
+        return string.chars()
+                .mapToObj(Character.UnicodeBlock::of)
+                .anyMatch(b -> b.equals(Character.UnicodeBlock.CYRILLIC));
+    }
+    public static boolean isDigit(String s) {
+        try {
+            Integer.parseInt(s);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+    public static boolean isEnglishLetter(char c) {
+        return (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')));
+    }
+    public static boolean isRussianLetter(char c) {
+        return ((c >= 'а') && (c <= 'я'))
+                || ((c >= 'А') && (c <= 'Я'))
+                || (c == 'Ё')
+                || (c == 'ё');
+    }
+    public static boolean isSign(char c) {
+        switch (c) {
+            //арифметика.
+            case '+':
+            case '-':
+            case '*':
+            case '/':
+            case '<':
+            case '>':
+            case '&':
+            case '=':
+            case '%':
+            case '^':
+                //- обр слеш
+            case '\\':
+                //препинание
+            case ' ':
+            case '_':
+            case '.':
+            case ',':
+            case '!':
+            case '?':
+            case ';':
+            case ':':
+                //escape последовательности
+            case '\t':
+            case '\n':
+            case '\r':
+                //кавычки
+            case '\'':
+            case '"':
+                //- скобки
+            case '(':
+            case ')':
+            case '[':
+            case ']':
+            case '{':
+            case '}':
+                //прочее
+            case '~':
+            case '`':
+            case '|':
+            case '@':
+            case '$':
+            case '#':
+            case '№':
+                return true;
+        }
+        return false;
+    }
+    public static char Translit(char c) {
+        switch (c) {
+            case 'А':
+            case 'а':
+            case 'Я':
+            case 'я':
+                return 'A';
+            //
+            case 'Б':
+            case 'б':
+                return 'B';
+            //-
+            case 'В':
+            case 'в':
+                return 'V';
+            //
+            case 'Г':
+            case 'г':
+                return 'G';
+            //
+            case 'Д':
+            case 'д':
+                return 'D';
+            //
+            case 'Е':
+            case 'е':
+            case 'Ё':
+            case 'ё':
+            case 'Э':
+            case 'э':
+                return 'E';
+            //
+            case 'Ж':
+            case 'ж':
+                return 'J';
+            //
+            case 'З':
+            case 'з':
+                return 'Z';
+            //
+            case 'И':
+            case 'и':
+            case 'Й':
+            case 'й':
+                return 'I';
+            //
+            case 'К':
+            case 'к':
+                return 'K';
+            //
+            case 'Л':
+            case 'л':
+                return 'L';
+            //
+            case 'М':
+            case 'м':
+                return 'M';
+            //
+            case 'Н':
+            case 'н':
+                return 'N';
+            //
+            case 'О':
+            case 'о':
+                return 'O';
+            //
+            case 'П':
+            case 'п':
+                return 'P';
+            //
+            case 'Р':
+            case 'р':
+                return 'R';
+            //
+            case 'С':
+            case 'с':
+                return 'S';
+            case 'Т':
+            case 'т':
+                return 'T';
+            //
+            case 'У':
+            case 'у':
+            case 'Ю':
+            case 'ю':
+                return 'U';
+            case 'Х':
+            case 'х':
+            case 'Щ':
+            case 'щ':
+            case 'Ш':
+            case 'ш':
+                return 'H';
+            //
+            case 'Ф':
+            case 'ф':
+                return 'F';
+            //
+            case 'Ч':
+            case 'ч':
+            case 'Ц':
+            case 'ц':
+                return 'C';
+            //
+            case 'Ы':
+            case 'ы':
+                return 'Y';
+            //
+        }
+        return ' ';
+    }
+    public static String ending(boolean flag) {
+        return flag ? ")" : ",";
+    }
+    public static boolean isRBracketsBalanced(String fragment) {
+        int cc = 0;
+        for (char c : fragment.toCharArray()) {
+            if (c == '(')
+                cc++;
+            if (c == ')')
+                cc--;
+            if (cc < 0)
+                return false;
+        }
+        return (cc == 0);
+    }
+    //ФАЙЛЫ
+    public static String getExtension(File file) {
+        String fn = file.getName();
+        int di = fn.lastIndexOf(".");
+        return (di >= 0) ? fn.substring(di + 1).toLowerCase() : "";
+    }
+    public static String getExtensionFromName(String fn) {
+        int di = fn.lastIndexOf(".");
+        return (di >= 0) ? fn.substring(di + 1).toLowerCase() : "";
+    }
+    public static String getFileNameWithoutExtension(File file) {
+        return getNameWithoutExtension(file.getName());
+    }
+    public static String getNameWithoutExtension(String fn) {
+        return (fn.contains(".")) ? fn.substring(0, fn.lastIndexOf(".")).toLowerCase() : fn.toLowerCase();
+    }
+    public static String toU(String path) {
+        return path.replace('\\', '/');
+    }
+    public static String toW(String path) {
+        return path.replace('/', '\\');
+    }
+    public static double getFileSizeMegaBytes(File file) {
+        return ((double)file.length()) / (1024 * 1024);
+    }
+    //-
+    //ГЕНЕРАЦИЯ ИМЕН
+
 }
diff --git a/src/Common/Visual/DBObjectFilter.java b/src/Common/Visual/DBObjectFilter.java
index a143c975..f198817e 100644
--- a/src/Common/Visual/DBObjectFilter.java
+++ b/src/Common/Visual/DBObjectFilter.java
@@ -1,4 +1,5 @@
 package Common.Visual;
+import Common.Utils.CommonUtils;
 import Common_old.UI.Menus_2023.StableMenuItem;
 import Common_old.Utils.Utils;
 import Common.Database.Objects.DBObject;
@@ -53,7 +54,7 @@ public abstract class DBObjectFilter<D extends DBObject> {
         count = 0;
     }
     public void Refresh() {
-        menuItem.setText(description + " " + Utils.RBrackets(count));
+        menuItem.setText(description + " " + CommonUtils.RBrackets(count));
     }
     public boolean isActive() {
         return active;
diff --git a/src/Common/Visual/DataSetFilter.java b/src/Common/Visual/DataSetFilter.java
index 46af4552..828590c6 100644
--- a/src/Common/Visual/DataSetFilter.java
+++ b/src/Common/Visual/DataSetFilter.java
@@ -14,14 +14,14 @@ public abstract class DataSetFilter<D extends DBObject> {
     protected Vector<DBObjectFilter<D>> field_filters;
     public DataSetFilter(String name, DataSet dataSet_in) {
         dataSet = dataSet_in;
-        menu = new VisualiserMenu(name, "/icons/Filter.png", true);
+        menu = new VisualiserMenu(name, "/Common/icons/Filter.png", true);
         field_filters = new Vector<>();
         fill();
         //-
         for (DBObjectFilter<D> filter : field_filters)
             menu.add(filter.menuItem);
         menu.addSeparator();
-        menu.add(new StableMenuItem("Выбрать всё", "/icons/SelectAll.png") {
+        menu.add(new StableMenuItem("Выбрать всё", "/Common/icons/SelectAll.png") {
             {
                 addActionListener(new ActionListener() {
                     @Override
@@ -32,7 +32,7 @@ public abstract class DataSetFilter<D extends DBObject> {
                 });
             }
         });
-        menu.add(new StableMenuItem("Отменить всё", "/icons/UnselectAll.png") {
+        menu.add(new StableMenuItem("Отменить всё", "/Common/icons/UnselectAll.png") {
             {
                 addActionListener(new ActionListener() {
                     @Override
diff --git a/src/Common/icons/Filter.png b/src/Common/icons/Filter.png
new file mode 100644
index 00000000..24184946
Binary files /dev/null and b/src/Common/icons/Filter.png differ
diff --git a/src/Common/icons/SelectAll.png b/src/Common/icons/SelectAll.png
new file mode 100644
index 00000000..35e6367e
Binary files /dev/null and b/src/Common/icons/SelectAll.png differ
diff --git a/src/Common/icons/UnselectAll.png b/src/Common/icons/UnselectAll.png
new file mode 100644
index 00000000..9195e0a0
Binary files /dev/null and b/src/Common/icons/UnselectAll.png differ
diff --git a/src/Common_old/Constants.java b/src/Common_old/Constants.java
index 1a0f0df3..e8a25b7f 100644
--- a/src/Common_old/Constants.java
+++ b/src/Common_old/Constants.java
@@ -5,7 +5,6 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 import java.util.Vector;
 import java.util.regex.Pattern;
 public class Constants {
-    public static final int Nan = -1;
     public static final int planner_version = 3;
     //--
     public static final String ComponentsDirectoryName = "Components";
@@ -52,15 +51,6 @@ public class Constants {
     public static final String package_json = "package_json";
     public static final String results_json = "results_json";
     //--
-    public static final PassCode_2021[] startingSapforTestingCodes_old = new PassCode_2021[]{
-            PassCode_2021.SPF_InsertIncludesPass
-    };
-    public static final PassCode_2021[] terminalSapforTestingCodes_old = new PassCode_2021[]{
-            PassCode_2021.CreateParallelVariants,
-            PassCode_2021.SPF_SharedMemoryParallelization,
-            PassCode_2021.SPF_InsertDvmhRegions
-    };
-    //--
     public static final Vector<PassCode_2021> startSapforCodes =
             new Vector_<>(PassCode_2021.SPF_InsertIncludesPass);
 
@@ -486,9 +476,6 @@ public class Constants {
             '`', '|', '=', '#', ':', '/', '\\',
             '~', '^'
     };
-    public static char[] regular_metasymbols = new char[]{
-            '<', '>', '(', ')', '[', ']', '{', '}', '^', '-', '=', '$', '!', '|', '?', '*', '+', '.'
-    };
     //все запретные символы через пробел.
     public static String all_forbidden_characters_string = "";
     public static Vector<String> admins_mails = new Vector_<>(
diff --git a/src/Common_old/UI/DataSetControlForm.java b/src/Common_old/UI/DataSetControlForm.java
index 98aba6c2..2efce0dc 100644
--- a/src/Common_old/UI/DataSetControlForm.java
+++ b/src/Common_old/UI/DataSetControlForm.java
@@ -1,5 +1,5 @@
 package Common_old.UI;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
@@ -207,7 +207,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
             }
         };
         if (CurrentName() != Current.Undefined) {
-            current_row_i = Constants.Nan;
+            current_row_i = CommonConstants.Nan;
             ListSelectionModel selModel = control.getSelectionModel();
             selModel.addListSelectionListener(e -> {
                 int row = control.getSelectedRow();
@@ -224,7 +224,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
                         }
                     }
                 } else {
-                    current_row_i = Constants.Nan;
+                    current_row_i = CommonConstants.Nan;
                     getDataSource().dropCurrent();
                     if (events_on) {
                         try {
diff --git a/src/Common_old/UI/Menus/MainEditorMenu.java b/src/Common_old/UI/Menus/MainEditorMenu.java
index 8174c5d0..94d702ab 100644
--- a/src/Common_old/UI/Menus/MainEditorMenu.java
+++ b/src/Common_old/UI/Menus/MainEditorMenu.java
@@ -1,4 +1,5 @@
 package Common_old.UI.Menus;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Editor.CaretInfo;
@@ -218,9 +219,9 @@ public class MainEditorMenu extends TextEditorMenu {
         if (!Utils.isFunctionName(selectedText)) {
             String tip = "Имя процедуры может содержать только английские буквы, цифры и подчеркивания, и не может начинаться с цифры.";
             //-
-            m_inline.setText("Невозможно подставить вызов процедуры " + Utils.Brackets(selectedText) +
+            m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
                     " . Выделено некорректное имя.");
-            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils.Brackets(selectedText) +
+            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
                     " . Выделено некорректное имя.");
             //-
             m_inline.setToolTipText(tip);
@@ -228,40 +229,40 @@ public class MainEditorMenu extends TextEditorMenu {
             return;
         }
         if (!Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
-            m_inline.setText("Невозможно подставить вызов процедуры " + Utils.Brackets(selectedText) +
+            m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
                     " . Выполните проход \"Граф процедур \".");
-            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils.Brackets(selectedText) +
+            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
                     " . Выполните проход \"Граф процедур \"");
             return;
         }
         if (Current.getSapfor().isIntrinsic(selectedText)) {
-            m_inline.setText("Невозможно подставить вызов процедуры " + Utils.Brackets(selectedText) +
+            m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
                     " . Процедура является стандартной.");
-            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils.Brackets(selectedText) +
+            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
                     " . Процедура является стандартной.");
             return;
         }
         call = Current.getFile().find_func_call(selectedText);
         if (call == null) {
-            m_inline.setText("Невозможно подставить вызов процедуры " + Utils.Brackets(selectedText) +
+            m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
                     " . Вызов не найден в текущей строке.");
-            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils.Brackets(selectedText) +
+            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
                     " . Объявление процедуры уже находится в текущей строке.");
             return;
         }
         decl = Current.getProject().allFunctions.get(call.funcName);
         if (decl.type.equals(FunctionType.NotFound)) {
-            m_inline.setText("Невозможно подставить вызов процедуры " + Utils.Brackets(selectedText) +
+            m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
                     " . Объявление процедуры не найдено в проекте.");
-            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils.Brackets(selectedText) +
+            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
                     " . Объявление процедуры не найдено в проекте.");
             return;
         }
         //---
         m_inline.setEnabled(true);
         m_gotoFunction.setEnabled(true);
-        m_inline.setText("Подставить вызов процедуры " + Utils.Brackets(selectedText));
-        m_gotoFunction.setText("Перейти к объявлению процедуры " + Utils.Brackets(selectedText));
+        m_inline.setText("Подставить вызов процедуры " + CommonUtils.Brackets(selectedText));
+        m_gotoFunction.setText("Перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText));
         //--
     }
     private void checkHeader() {
@@ -280,11 +281,11 @@ public class MainEditorMenu extends TextEditorMenu {
                 return;
             }
             if (!Current.getFile().relativeHeaders.containsKey(header_)) {
-                m_gotoHeader.setText("Невозможно перейти к заголовочному файлу " + Utils.Brackets(header_) + " . Файл не найден среди включений текущего файла.");
+                m_gotoHeader.setText("Невозможно перейти к заголовочному файлу " + CommonUtils.Brackets(header_) + " . Файл не найден среди включений текущего файла.");
                 return;
             }
             header = Current.getFile().relativeHeaders.get(header_);
-            m_gotoHeader.setText("Переход к заголовочному файлу " + Utils.Brackets(header_));
+            m_gotoHeader.setText("Переход к заголовочному файлу " + CommonUtils.Brackets(header_));
             m_gotoHeader.setEnabled(true);
         }
     }
@@ -302,7 +303,7 @@ public class MainEditorMenu extends TextEditorMenu {
             return;
         }
         m_loop_union.setEnabled(true);
-        m_loop_union.setText("Объединить цикл в строке " + Utils.Brackets(loop.line) + " со следующим");
+        m_loop_union.setText("Объединить цикл в строке " + CommonUtils.Brackets(loop.line) + " со следующим");
     }
     @Override
     public void CheckElementsVisibility() {
diff --git a/src/Common_old/UI/Menus/SelectionTreeMenu.java b/src/Common_old/UI/Menus/SelectionTreeMenu.java
index 6d23c79b..95287c92 100644
--- a/src/Common_old/UI/Menus/SelectionTreeMenu.java
+++ b/src/Common_old/UI/Menus/SelectionTreeMenu.java
@@ -1,10 +1,10 @@
 package Common_old.UI.Menus;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.StableMenuItem;
 import Common_old.UI.Selectable;
 import Common_old.UI.Trees.DataTree;
 import Common_old.UI.Trees.SelectableTree;
-import Common_old.Utils.Utils;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -72,9 +72,9 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
         if ((current != null) && (current.getClass().equals(getTargetClass()))) {
             String name = ((Selectable) current).getSelectionText();
             m_select_for_current.setText("Выбрать всё для " +
-                    Utils.Brackets(name));
+                    CommonUtils.Brackets(name));
             m_unselect_for_current.setText("Отменить выбор всех для " +
-                    Utils.Brackets(name));
+                    CommonUtils.Brackets(name));
             //-
             m_select_for_current.setVisible(true);
             m_unselect_for_current.setVisible(true);
diff --git a/src/Common_old/UI/Menus/TableMenu.java b/src/Common_old/UI/Menus/TableMenu.java
index b0a1151b..6c1606be 100644
--- a/src/Common_old/UI/Menus/TableMenu.java
+++ b/src/Common_old/UI/Menus/TableMenu.java
@@ -1,11 +1,11 @@
 package Common_old.UI.Menus;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Utils.Utils;
 
 import javax.swing.*;
 public class TableMenu extends StyledPopupMenu {
-    int row = Constants.Nan;
-    int column = Constants.Nan;
+    int row = CommonConstants.Nan;
+    int column = CommonConstants.Nan;
     Object target = null;
     //-
     JTable owner = null;
diff --git a/src/Common_old/UI/Tables/ColumnInfo.java b/src/Common_old/UI/Tables/ColumnInfo.java
index 231c62e7..adaa0015 100644
--- a/src/Common_old/UI/Tables/ColumnInfo.java
+++ b/src/Common_old/UI/Tables/ColumnInfo.java
@@ -1,13 +1,13 @@
 package Common_old.UI.Tables;
-import Common_old.Constants;
+import Common.CommonConstants;
 public class ColumnInfo {
     private String Name = "?";
     private boolean visible = true;
     private boolean editable = false;
     private TableRenderers renderer = TableRenderers.RendererDefault;
     private TableEditors editor = TableEditors.EditorDefault;
-    private int maxWidth = Constants.Nan;
-    private int minWidth = Constants.Nan;
+    private int maxWidth = CommonConstants.Nan;
+    private int minWidth = CommonConstants.Nan;
     //private int lastWidth = Utils.Nan;
     // public void setLastWidth(int width_in) {
     //       lastWidth = width_in;
@@ -72,7 +72,7 @@ public class ColumnInfo {
         this.maxWidth = maxWidth_in;
     }
     public boolean hasMaxWidth() {
-        return maxWidth != Constants.Nan;
+        return maxWidth != CommonConstants.Nan;
     }
     //-
     public int getMinWidth() {
@@ -82,7 +82,7 @@ public class ColumnInfo {
         this.minWidth = minWidth_in;
     }
     public boolean hasMinWidth() {
-        return minWidth != Constants.Nan;
+        return minWidth != CommonConstants.Nan;
     }
 
 /*
diff --git a/src/Common_old/UI/VisualiserStringList.java b/src/Common_old/UI/VisualiserStringList.java
index 0ba30caf..526666bf 100644
--- a/src/Common_old/UI/VisualiserStringList.java
+++ b/src/Common_old/UI/VisualiserStringList.java
@@ -1,5 +1,5 @@
 package Common_old.UI;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 
 import javax.swing.*;
 import java.util.Vector;
@@ -12,7 +12,7 @@ public class VisualiserStringList extends JList<String> {
     public void fill(Vector<String> content) {
         elements = new DefaultListModel<>();
         for (String s : content)
-            elements.addElement(Utils.Brackets(s));
+            elements.addElement(CommonUtils.Brackets(s));
         setModel(elements);
     }
     public String pack() {
@@ -25,7 +25,7 @@ public class VisualiserStringList extends JList<String> {
         return res;
     }
     public void addElement(String element) {
-        String element_ = Utils.Brackets(element);
+        String element_ = CommonUtils.Brackets(element);
         if (!elements.contains(element_))
             elements.addElement(element_);
         else UI.Info("элемент " + element_ + " уже существует.");
diff --git a/src/Common_old/UI/Windows/SearchReplaceForm.java b/src/Common_old/UI/Windows/SearchReplaceForm.java
index 9521a475..067c5f40 100644
--- a/src/Common_old/UI/Windows/SearchReplaceForm.java
+++ b/src/Common_old/UI/Windows/SearchReplaceForm.java
@@ -1,9 +1,9 @@
 package Common_old.UI.Windows;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.TextField.StyledTextField;
 import Common_old.UI.Trees.StyledTree;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import javafx.util.Pair;
@@ -100,8 +100,8 @@ public class SearchReplaceForm extends Form {
         }
     }
     public void applyParams() {
-        String toFind = Utils.hideRegularMetasymbols(tfFind.getText());
-        String toReplace = Utils.hideRegularMetasymbols(tfReplace.getText());
+        String toFind = CommonUtils.hideRegularMetasymbols(tfFind.getText());
+        String toReplace = CommonUtils.hideRegularMetasymbols(tfReplace.getText());
         context.setSearchFor(toFind);
         context.setMatchCase(registerOn.isSelected());
         context.setWholeWord(wholeWordOn.isSelected());
diff --git a/src/Common_old/Utils/Files/ProjectsChooser.java b/src/Common_old/Utils/Files/ProjectsChooser.java
index a57d7092..1a826d97 100644
--- a/src/Common_old/Utils/Files/ProjectsChooser.java
+++ b/src/Common_old/Utils/Files/ProjectsChooser.java
@@ -1,6 +1,6 @@
 package Common_old.Utils.Files;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
-import Common_old.Utils.Utils;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
@@ -11,7 +11,7 @@ public class ProjectsChooser extends VFileChooser_ {
             @Override
             public boolean accept(File f) {
                 return
-                        !Utils.ContainsCyrillic(f.getAbsolutePath()) &&
+                        !CommonUtils.ContainsCyrillic(f.getAbsolutePath()) &&
                                 !f.getName().equalsIgnoreCase(Constants.data)
                         ;
             }
diff --git a/src/Common_old/Utils/Files/VDirectoryChooser.java b/src/Common_old/Utils/Files/VDirectoryChooser.java
index 87653d5d..4ea33398 100644
--- a/src/Common_old/Utils/Files/VDirectoryChooser.java
+++ b/src/Common_old/Utils/Files/VDirectoryChooser.java
@@ -1,5 +1,5 @@
 package Common_old.Utils.Files;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
@@ -9,7 +9,7 @@ public class VDirectoryChooser extends VFileChooser_ {
         super(title, new FileFilter() {
             @Override
             public boolean accept(File f) {
-                return !Utils.ContainsCyrillic(f.getAbsolutePath());
+                return !CommonUtils.ContainsCyrillic(f.getAbsolutePath());
             }
             @Override
             public String getDescription() {
diff --git a/src/Common_old/Utils/Files/VFileChooser.java b/src/Common_old/Utils/Files/VFileChooser.java
index 1ed544af..f8a81b07 100644
--- a/src/Common_old/Utils/Files/VFileChooser.java
+++ b/src/Common_old/Utils/Files/VFileChooser.java
@@ -1,5 +1,5 @@
 package Common_old.Utils.Files;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
@@ -20,7 +20,7 @@ public class VFileChooser extends VFileChooser_ {
         fileChooser.setFileFilter(new FileFilter() {
             @Override
             public boolean accept(File f) {
-                return !Utils.ContainsCyrillic(f.getName())
+                return !CommonUtils.ContainsCyrillic(f.getName())
                         && (f.isDirectory() || acceptExtensions(f));
             }
             @Override
@@ -36,7 +36,7 @@ public class VFileChooser extends VFileChooser_ {
     }
     public boolean acceptExtensions(File file) {
         if (Extensions.isEmpty()) return true;
-        String file_ext = Utils.getExtension(file);
+        String file_ext = CommonUtils.getExtension(file);
         for (String ext : Extensions)
             if (ext.equalsIgnoreCase(file_ext)) return true;
         return false;
diff --git a/src/Common_old/Utils/Utils.java b/src/Common_old/Utils/Utils.java
index d6235549..916fb28c 100644
--- a/src/Common_old/Utils/Utils.java
+++ b/src/Common_old/Utils/Utils.java
@@ -1,4 +1,6 @@
 package Common_old.Utils;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common.Utils.Index;
 import Common.Utils.StringTemplate;
 import Common.Utils.TextLog;
@@ -38,13 +40,6 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 public class Utils {
-    //--->>
-    public static String hideRegularMetasymbols(String word) {
-        String res = word.replace("\\", "\\\\");
-        for (char c : Constants.regular_metasymbols)
-            res = res.replace(String.valueOf(c), "\\" + c);
-        return res;
-    }
     public static boolean isLinuxSystemCommand(String text) {
         for (String command : Constants.linux_system_commands) {
             if (text.equalsIgnoreCase(command)) return true;
@@ -72,48 +67,9 @@ public class Utils {
         for (char f : Constants.forbidden_file_name_characters)
             Constants.all_forbidden_characters_string += f + " ";
     }
-    public static String DQuotes(Object o) {
-        return "\"" + o.toString() + "\"";
-    }
-    public static String Quotes(Object o) {
-        return "'" + o.toString() + "'";
-    }
-    public static String Brackets(Object o) {
-        return "[" + o.toString() + "]";
-    }
-    public static String Bold(Object o) {
-        return "<b>" + o.toString() + "</b>";
-    }
-    public static String RBrackets(Object o) {
-        return "(" + o.toString() + ")";
-    }
     public static String MFVar(Object o) {
         return "$(" + o.toString() + ")";
     }
-    public static String TBrackets(Object o) {
-        return "<" + o.toString() + ">";
-    }
-    public static String getExtension(File file) {
-        String fn = file.getName();
-        int di = fn.lastIndexOf(".");
-        return (di >= 0) ? fn.substring(di + 1).toLowerCase() : "";
-    }
-    public static String getExtensionByName(String fn) {
-        ;
-        int di = fn.lastIndexOf(".");
-        return (di >= 0) ? fn.substring(di + 1).toLowerCase() : "";
-    }
-    public static String getFileNameWithoutExtension(File file) {
-        return getNameWithoutExtension(file.getName());
-    }
-    public static String getNameWithoutExtension(String fn) {
-        return (fn.contains(".")) ? fn.substring(0, fn.lastIndexOf(".")).toLowerCase() : fn.toLowerCase();
-    }
-    public static boolean ContainsCyrillic(String string) {
-        return string.chars()
-                .mapToObj(Character.UnicodeBlock::of)
-                .anyMatch(b -> b.equals(Character.UnicodeBlock.CYRILLIC));
-    }
     public static void CheckDirectory(File dir) {
         if (!dir.exists()) {
             try {
@@ -145,8 +101,6 @@ public class Utils {
     public static Object requireNonNullElse(Object value, Object default_value) {
         return (value != null) ? value : default_value;
     }
-    //https://javadevblog.com/kak-schitat-fajl-v-string-primer-chteniya-fajla-na-java.html
-    //https://habr.com/ru/post/269667/
     public static String ReadAllText(File file) {
         try {
             return new String(Files.readAllBytes(file.toPath()));
@@ -155,16 +109,6 @@ public class Utils {
         }
         return "";
     }
-    public static String toU(String path) {
-        return path.replace('\\', '/');
-    }
-    public static String toW(String path) {
-        return path.replace('/', '\\');
-    }
-    public static double getFileSizeMegaBytes(File file) {
-        double res = file.length() / (1024 * 1024);
-        return res;
-    }
     public static void CleanDirectory(File dir) {
         if (dir.exists() && dir.isDirectory()) {
             File[] files = dir.listFiles();
@@ -179,7 +123,7 @@ public class Utils {
             }
         }
     }
-    public static long last_ticks = Constants.Nan;
+    public static long last_ticks = CommonConstants.Nan;
     public static void sleep(long millis) {
         try {
             Thread.sleep(millis);
@@ -213,187 +157,6 @@ public class Utils {
                 StandardOpenOption.CREATE,
                 StandardOpenOption.TRUNCATE_EXISTING);
     }
-    public static boolean isDigit(String s) {
-        try {
-            Integer.parseInt(s);
-            return true;
-        } catch (NumberFormatException e) {
-            return false;
-        }
-    }
-    public static boolean isEnglishLetter(char c) {
-        return (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')));
-    }
-    public static boolean isRussianLetter(char c) {
-        return ((c >= 'а') && (c <= 'я'))
-                || ((c >= 'А') && (c <= 'Я'))
-                || (c == 'Ё')
-                || (c == 'ё');
-    }
-    public static boolean isSign(char c) {
-        switch (c) {
-            //арифметика.
-            case '+':
-            case '-':
-            case '*':
-            case '/':
-            case '<':
-            case '>':
-            case '&':
-            case '=':
-            case '%':
-            case '^':
-                //- обр слеш
-            case '\\':
-                //препинание
-            case ' ':
-            case '_':
-            case '.':
-            case ',':
-            case '!':
-            case '?':
-            case ';':
-            case ':':
-                //escape последовательности
-            case '\t':
-            case '\n':
-            case '\r':
-                //кавычки
-            case '\'':
-            case '"':
-                //- скобки
-            case '(':
-            case ')':
-            case '[':
-            case ']':
-            case '{':
-            case '}':
-                //прочее
-            case '~':
-            case '`':
-            case '|':
-            case '@':
-            case '$':
-            case '#':
-            case '№':
-                return true;
-        }
-        return false;
-    }
-    public static char Translit(char c) {
-        switch (c) {
-            case 'А':
-            case 'а':
-            case 'Я':
-            case 'я':
-                return 'A';
-            //
-            case 'Б':
-            case 'б':
-                return 'B';
-            //-
-            case 'В':
-            case 'в':
-                return 'V';
-            //
-            case 'Г':
-            case 'г':
-                return 'G';
-            //
-            case 'Д':
-            case 'д':
-                return 'D';
-            //
-            case 'Е':
-            case 'е':
-            case 'Ё':
-            case 'ё':
-            case 'Э':
-            case 'э':
-                return 'E';
-            //
-            case 'Ж':
-            case 'ж':
-                return 'J';
-            //
-            case 'З':
-            case 'з':
-                return 'Z';
-            //
-            case 'И':
-            case 'и':
-            case 'Й':
-            case 'й':
-                return 'I';
-            //
-            case 'К':
-            case 'к':
-                return 'K';
-            //
-            case 'Л':
-            case 'л':
-                return 'L';
-            //
-            case 'М':
-            case 'м':
-                return 'M';
-            //
-            case 'Н':
-            case 'н':
-                return 'N';
-            //
-            case 'О':
-            case 'о':
-                return 'O';
-            //
-            case 'П':
-            case 'п':
-                return 'P';
-            //
-            case 'Р':
-            case 'р':
-                return 'R';
-            //
-            case 'С':
-            case 'с':
-                return 'S';
-            case 'Т':
-            case 'т':
-                return 'T';
-            //
-            case 'У':
-            case 'у':
-            case 'Ю':
-            case 'ю':
-                return 'U';
-            case 'Х':
-            case 'х':
-            case 'Щ':
-            case 'щ':
-            case 'Ш':
-            case 'ш':
-                return 'H';
-            //
-            case 'Ф':
-            case 'ф':
-                return 'F';
-            //
-            case 'Ч':
-            case 'ч':
-            case 'Ц':
-            case 'ц':
-                return 'C';
-            //
-            case 'Ы':
-            case 'ы':
-                return 'Y';
-            //
-        }
-        return ' ';
-    }
-    public static String ending(boolean flag) {
-        return flag ? ")" : ",";
-    }
     // http://java-online.ru/blog-archive.xhtml
     public static void getFilesCountR(File dir, Index res) {
         for (File f : dir.listFiles()) {
@@ -412,18 +175,6 @@ public class Utils {
         DateFormat df = new SimpleDateFormat(pattern);
         return df.format(date);
     }
-    public static boolean isBracketsBalanced(String fragment) {
-        int cc = 0;
-        for (char c : fragment.toCharArray()) {
-            if (c == '(')
-                cc++;
-            if (c == ')')
-                cc--;
-            if (cc < 0)
-                return false;
-        }
-        return (cc == 0);
-    }
     public static File CreateTempResourceFile(String res_name) throws Exception {
         URL u = (Utils.class.getResource("/files/" + res_name));
         InputStream i = u.openStream();
@@ -477,7 +228,7 @@ public class Utils {
             Log.Writeln_("Имя файла не может быть пустым");
             res = false;
         }
-        if (ContainsCyrillic(name)) {
+        if (CommonUtils.ContainsCyrillic(name)) {
             Log.Writeln_("Имя файла не может содержать кириллицу");
             res = false;
         }
@@ -491,7 +242,7 @@ public class Utils {
     //идет по всем уровням файлов
     public static boolean validateProjectFile(File file, TextLog Log) {
         String name = file.getName();
-        if (ContainsCyrillic(name) || ContainsForbiddenName(name)) {
+        if (CommonUtils.ContainsCyrillic(name) || ContainsForbiddenName(name)) {
             Log.Writeln_(file.getAbsolutePath());
             return false;
         }
@@ -567,11 +318,11 @@ public class Utils {
             } else return;
             if (file.exists()) {
                 attempts++;
-                System.out.println("файл " + Brackets(file.getAbsolutePath()) + " занят");
+                System.out.println("файл " + CommonUtils.Brackets(file.getAbsolutePath()) + " занят");
                 Thread.sleep(2000);
             } else return;
         }
-        throw new PassException("Не удалось удалить файл " + Brackets(file.getAbsolutePath()) + " за " + attempts + " попыток");
+        throw new PassException("Не удалось удалить файл " + CommonUtils.Brackets(file.getAbsolutePath()) + " за " + attempts + " попыток");
     }
     public static void GetVertices(float R, float r, float x0, float y0, int n, float phi) {
         boolean inner = false;
@@ -625,11 +376,11 @@ public class Utils {
             } else return;
             if (file.exists()) {
                 attempts++;
-                Global.Log.Print("неудачная попытка удаления: файл " + Brackets(file.getAbsolutePath()) + " занят");
+                Global.Log.Print("неудачная попытка удаления: файл " + CommonUtils.Brackets(file.getAbsolutePath()) + " занят");
                 Thread.sleep(2000);
             } else return;
         }
-        throw new PassException("Не удалось удалить файл " + Brackets(file.getAbsolutePath()) + " за " + attempts + " попыток");
+        throw new PassException("Не удалось удалить файл " + CommonUtils.Brackets(file.getAbsolutePath()) + " за " + attempts + " попыток");
     }
     public static byte[] packFile(File src) throws Exception {
         byte[] dst = Files.readAllBytes(src.toPath());
@@ -669,7 +420,7 @@ public class Utils {
         if (files != null) {
             for (File file : files) {
                 if (file.isFile()) {
-                    String file_extension = getExtension(file);
+                    String file_extension = CommonUtils.getExtension(file);
                     for (String ext : extensions) {
                         if (file_extension.equalsIgnoreCase(ext)) {
                             res.add(file);
@@ -710,7 +461,7 @@ public class Utils {
     public static File createScript(File scriptDirectory, File targetDirectory, String name, String scriptText) throws Exception {
         //->
         File scriptFile = Paths.get(scriptDirectory.getAbsolutePath(), name + (Global.isWindows ? ".bat" : "")).toFile();
-        FileUtils.write(scriptFile, "cd " + Utils.DQuotes(targetDirectory.getAbsolutePath()) + "\n" + scriptText);
+        FileUtils.write(scriptFile, "cd " + CommonUtils.DQuotes(targetDirectory.getAbsolutePath()) + "\n" + scriptText);
         if (!scriptFile.setExecutable(true)) throw new PassException("Не удалось создать исполняемый файл для скрипта");
         return scriptFile;
     }
@@ -847,25 +598,6 @@ public class Utils {
         }
         return res;
     }
-    public static Vector<String> unpackStrings(String string, boolean brackets) {
-        Vector<String> res = new Vector<>();
-        if (string.isEmpty())
-            res.add(brackets ? "[]" : "");
-        else {
-            StringBuilder line = new StringBuilder();
-            for (char c : string.toCharArray()) {
-                if (c == '\n') {
-                    res.add(brackets ? Utils.Brackets(line.toString()) : line.toString());
-                    line = new StringBuilder();
-                } else
-                    line.append(c);
-            }
-        }
-        return res;
-    }
-    public static Vector<String> unpackStrings(String string) {
-        return unpackStrings(string, false);
-    }
     public static boolean isTimeout(long startDate, long maxtime_sec) {
         Date now = new Date();
         long delta = (now.getTime() - startDate) / 1000;
@@ -914,7 +646,7 @@ public class Utils {
     }
     protected static boolean isSource(File file) {
         if (file.isFile()) {
-            String extension = getExtension(file).toLowerCase();
+            String extension = CommonUtils.getExtension(file).toLowerCase();
             switch (extension) {
                 case "f":
                 case "fdv":
@@ -946,7 +678,7 @@ public class Utils {
             }
         }
         if (sources.isEmpty()) {
-            if (question) return UI.Question("Папка " + Brackets(folder.getName()) + "\n" +
+            if (question) return UI.Question("Папка " + CommonUtils.Brackets(folder.getName()) + "\n" +
                     "не содержит ни одного файла, распознанного как поддерживаемый код\n" +
                     "Всё равно открыть её как проект");
             else return false;
@@ -955,8 +687,8 @@ public class Utils {
     public static void Kill(String PID, boolean force) {
         if (!PID.isEmpty()) {
             String killCommand =
-                    force ? Global.isWindows ? "taskkill /PID " + Utils.DQuotes(PID) + " /F /T" : "kill -9 " + Utils.DQuotes(PID) :
-                            Global.isWindows ? "taskkill /PID " + Utils.DQuotes(PID) : "kill -2 " + Utils.DQuotes(PID);
+                    force ? Global.isWindows ? "taskkill /PID " + CommonUtils.DQuotes(PID) + " /F /T" : "kill -9 " + CommonUtils.DQuotes(PID) :
+                            Global.isWindows ? "taskkill /PID " + CommonUtils.DQuotes(PID) : "kill -2 " + CommonUtils.DQuotes(PID);
             System.out.println(killCommand);
             try {
                 Process killer = Utils.startScript(Global.TempDirectory, Global.TempDirectory, "killer", killCommand);
@@ -971,12 +703,12 @@ public class Utils {
         if (name.isEmpty())
             return false;
         char[] letters = name.toCharArray();
-        if (!(isEnglishLetter(letters[0]) || letters[0] == '_')) {
+        if (!(CommonUtils.isEnglishLetter(letters[0]) || letters[0] == '_')) {
             return false;
         }
         //---
         for (int i = 1; i < letters.length; ++i) {
-            if (!(isEnglishLetter(letters[i]) || letters[i] == '_' || Utils.isDigit(String.valueOf(letters[i])))) {
+            if (!(CommonUtils.isEnglishLetter(letters[i]) || letters[i] == '_' || CommonUtils.isDigit(String.valueOf(letters[i])))) {
                 return false;
             }
         }
diff --git a/src/Common_old/Utils/Validators/ShellParser.java b/src/Common_old/Utils/Validators/ShellParser.java
index ceb895e2..5603bb40 100644
--- a/src/Common_old/Utils/Validators/ShellParser.java
+++ b/src/Common_old/Utils/Validators/ShellParser.java
@@ -1,7 +1,7 @@
 package Common_old.Utils.Validators;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 
 import java.io.InputStreamReader;
 import java.util.Vector;
@@ -173,7 +173,7 @@ public class ShellParser {
                 System.out.print(c == '\r' ? ("\\r") :
                         (c == '\n' ? "\\n\n" : c));
                 if (isCommandSymbol())
-                    System.out.print(Utils.RBrackets(code));
+                    System.out.print(CommonUtils.RBrackets(code));
             }
         }
     }
diff --git a/src/GlobalData/Compiler/Compiler.java b/src/GlobalData/Compiler/Compiler.java
index 36575b7d..55e3519d 100644
--- a/src/GlobalData/Compiler/Compiler.java
+++ b/src/GlobalData/Compiler/Compiler.java
@@ -1,7 +1,7 @@
 package GlobalData.Compiler;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Objects.iDBObject;
-import Common_old.Utils.Utils;
 import Common_old.Utils.Validators.DVMHelpParser;
 import GlobalData.CompilerEnvironment.CompilerEnvironmentsSet;
 import GlobalData.CompilerOption.CompilerOptionsSet;
@@ -182,10 +182,10 @@ public class Compiler extends iDBObject {
         return "";
     }
     public String getHelpCommand() {
-        return Utils.DQuotes(call_command) + " " + help_command;
+        return CommonUtils.DQuotes(call_command) + " " + help_command;
     }
     public String getVersionCommand() {
-        return Utils.DQuotes(call_command) + " " + version_command;
+        return CommonUtils.DQuotes(call_command) + " " + version_command;
     }
     public String getVersionInfo(){
         return "v="+version+" r="+revision;
diff --git a/src/GlobalData/Compiler/CompilersDBTable.java b/src/GlobalData/Compiler/CompilersDBTable.java
index 6aea1fcc..18d2692e 100644
--- a/src/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/GlobalData/Compiler/CompilersDBTable.java
@@ -1,4 +1,5 @@
 package GlobalData.Compiler;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.DataSetControlForm;
 import Common_old.UI.UI;
@@ -45,7 +46,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
                 String home = fields.tfHome.getText();
                 if (!home.isEmpty()) {
                     if (home.startsWith("/")) {
-                        if (Utils.ContainsCyrillic(home))
+                        if (CommonUtils.ContainsCyrillic(home))
                             Log.Writeln("Расположение компилятора не может содержать кириллицу");
                         else {
                             new PathValidator(home, "Расположение компилятора", Log).Validate();
@@ -58,7 +59,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
                 String call_command = fields.tfCallCommand.getText();
                 if (call_command.isEmpty())
                     Log.Writeln("Команда вызова компилятора не может быть пустой");
-                else if (Utils.ContainsCyrillic(call_command))
+                else if (CommonUtils.ContainsCyrillic(call_command))
                     Log.Writeln("Команда вызова компилятора не может содержать кириллицу");
                 else {
                     switch (call_command.charAt(0)) {
@@ -80,7 +81,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
                                 Log.Writeln("Прямая команда вызова содержит запрещённые символы");
                             else {
                                 if (Utils.isLinuxSystemCommand(call_command))
-                                    Log.Writeln(Utils.DQuotes(call_command) + " является системной командой Linux");
+                                    Log.Writeln(CommonUtils.DQuotes(call_command) + " является системной командой Linux");
                             }
                             break;
                     }
diff --git a/src/GlobalData/CompilerOption/CompilerOption.java b/src/GlobalData/CompilerOption/CompilerOption.java
index ed1ce0c3..0c776f35 100644
--- a/src/GlobalData/CompilerOption/CompilerOption.java
+++ b/src/GlobalData/CompilerOption/CompilerOption.java
@@ -1,6 +1,6 @@
 package GlobalData.CompilerOption;
 import Common.Database.Objects.DBObject;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Arrays;
@@ -26,7 +26,7 @@ public class CompilerOption extends DBObject {
     @Override
     public String toString() {
         return name + (hasParameter() ? (parameterSeparator +
-                (parameterValue.contains(" ") ? Utils.DQuotes(parameterValue) : parameterValue)) : "");
+                (parameterValue.contains(" ") ? CommonUtils.DQuotes(parameterValue) : parameterValue)) : "");
     }
     public void CheckParameterVariants() {
         for (String line : description)
@@ -34,7 +34,7 @@ public class CompilerOption extends DBObject {
     }
     public boolean CheckLine(String line) {
         if (hasParameter()) {
-            Pattern DVM_PARAM_VALUES_REGEX = Pattern.compile(Utils.TBrackets(parameterName) + "\\s*=\\s*" + "\\w+(\\|\\w+)+", Pattern.CASE_INSENSITIVE);
+            Pattern DVM_PARAM_VALUES_REGEX = Pattern.compile(CommonUtils.TBrackets(parameterName) + "\\s*=\\s*" + "\\w+(\\|\\w+)+", Pattern.CASE_INSENSITIVE);
             Matcher matcher = DVM_PARAM_VALUES_REGEX.matcher(line);
             if (matcher.find()) {
                 String s = line.substring(matcher.start(), matcher.end());
diff --git a/src/GlobalData/Credentials/Credentials.java b/src/GlobalData/Credentials/Credentials.java
index 8edf6e44..3f0ba86f 100644
--- a/src/GlobalData/Credentials/Credentials.java
+++ b/src/GlobalData/Credentials/Credentials.java
@@ -1,18 +1,18 @@
 package GlobalData.Credentials;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common.Database.Objects.iDBObject;
 import com.sun.org.glassfish.gmbal.Description;
 public class Credentials extends iDBObject {
     @Description("DEFAULT -1")
-    public int machine_id = Constants.Nan;
+    public int machine_id = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int user_id = Constants.Nan;
+    public int user_id = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int compiler_id = Constants.Nan;
+    public int compiler_id = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int makefile_id = Constants.Nan;
+    public int makefile_id = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int runconfiguration_id = Constants.Nan;
+    public int runconfiguration_id = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int remotesapfor_id = Constants.Nan;
+    public int remotesapfor_id = CommonConstants.Nan;
 }
diff --git a/src/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/GlobalData/DVMParameter/DVMParameterDBTable.java
index 64037e7b..4afb5864 100644
--- a/src/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -1,4 +1,5 @@
 package GlobalData.DVMParameter;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import _VisualDVM.Global;
@@ -68,7 +69,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
                 }
                  */
                 if (Utils.isLinuxSystemCommand(name))
-                    Log.Writeln(Utils.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
+                    Log.Writeln(CommonUtils.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
 
                /*
                 if (value.contains("\"")) {
@@ -77,7 +78,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
                 */
                 for (DVMParameter par : Global.db.dvmParameters.Data.values()) {
                     if (par.isVisible() && (Result.id != par.id) && (par.name.equals(name))) {
-                        Log.Writeln("В конфигурации запуска уже задан параметр DVM системы  с именем " + Utils.Brackets(name));
+                        Log.Writeln("В конфигурации запуска уже задан параметр DVM системы  с именем " + CommonUtils.Brackets(name));
                         break;
                     }
                 }
diff --git a/src/GlobalData/EnvironmentValue/EnvironmentValue.java b/src/GlobalData/EnvironmentValue/EnvironmentValue.java
index 2807b18d..ba54c3d8 100644
--- a/src/GlobalData/EnvironmentValue/EnvironmentValue.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValue.java
@@ -1,19 +1,19 @@
 package GlobalData.EnvironmentValue;
-import Common_old.Constants;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Objects.iDBObject;
-import Common_old.Utils.Utils;
 public class EnvironmentValue extends iDBObject {
     public String name = "";
     public String value = "";
-    public int machine_id = Constants.Nan; //для удаления машин
-    public int run_configuration_id = Constants.Nan;
+    public int machine_id = CommonConstants.Nan; //для удаления машин
+    public int run_configuration_id = CommonConstants.Nan;
     @Override
     public boolean isVisible() {
         return Current.HasRunConfiguration() && (run_configuration_id == Current.getRunConfiguration().id);
     }
     @Override
     public String toString() {
-        return name + "=" + Utils.DQuotes(value);
+        return name + "=" + CommonUtils.DQuotes(value);
     }
 }
diff --git a/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
index 7978976c..e1b47e1d 100644
--- a/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -1,4 +1,5 @@
 package GlobalData.EnvironmentValue;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import _VisualDVM.Global;
@@ -38,13 +39,13 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
                     Log.Writeln("Имя переменной окружения может содержать только латинские буквы, цифры и подчёркивания");
                 }
                 if (Utils.isLinuxSystemCommand(name))
-                    Log.Writeln(Utils.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
+                    Log.Writeln(CommonUtils.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
                 if (value.contains("\"")) {
                     Log.Writeln("Значение переменной окружения не может содержать двойные кавычки");
                 }
                 for (EnvironmentValue env : Global.db.environmentValues.Data.values()) {
                     if (env.isVisible() && (Result.id != env.id) && (env.name.equals(name))) {
-                        Log.Writeln("В конфигурации запуска уже задана переменная окружения  с именем " + Utils.Brackets(name));
+                        Log.Writeln("В конфигурации запуска уже задана переменная окружения  с именем " + CommonUtils.Brackets(name));
                         break;
                     }
                 }
diff --git a/src/GlobalData/Machine/Machine.java b/src/GlobalData/Machine/Machine.java
index c05c5913..ab4290a4 100644
--- a/src/GlobalData/Machine/Machine.java
+++ b/src/GlobalData/Machine/Machine.java
@@ -1,7 +1,7 @@
 package GlobalData.Machine;
 import Common.Database.Objects.iDBObject;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import GlobalData.Compiler.Compiler;
 import GlobalData.User.User;
 
@@ -24,7 +24,7 @@ public class Machine extends iDBObject {
     }
     public String getFullDescription() {
         return //this.equals(Constants.repository_machine) ? "Репозиторий визуализатора" :
-               "Машина по адресу " + Utils.Brackets(getURL());
+               "Машина по адресу " + CommonUtils.Brackets(getURL());
     }
     public LinkedHashMap<Integer, Compiler> getCompilers() {
         return Global.db.getMapByFKi(this, Compiler.class);
diff --git a/src/GlobalData/Makefile/Makefile.java b/src/GlobalData/Makefile/Makefile.java
index 39895a31..240e817a 100644
--- a/src/GlobalData/Makefile/Makefile.java
+++ b/src/GlobalData/Makefile/Makefile.java
@@ -1,4 +1,5 @@
 package GlobalData.Makefile;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common.Utils.TextLog;
@@ -37,7 +38,7 @@ public class Makefile extends ModuleAnchestor {
         Vector<String> titles = new Vector<>();
         Vector<String> objects = new Vector<>();
         Vector<String> bodies = new Vector<>();
-        String binary = Utils.DQuotes("0"); // Utils.DQuotes(project.name);
+        String binary = CommonUtils.DQuotes("0"); // Utils.DQuotes(project.name);
         for (Module module : modules.values()) {
             //определить а активен ли модуль.
             //выбран ли он. есть ли у него компилятор.  есть ли для него программы.
@@ -61,7 +62,7 @@ public class Makefile extends ModuleAnchestor {
                 for (DBProjectFile program : programsToAssembly) {
                     //--
                     program.last_assembly_name = module.language.toString() + "_" + i + ".o";
-                    String object = Utils.DQuotes(program.last_assembly_name);
+                    String object = CommonUtils.DQuotes(program.last_assembly_name);
                     module_objects.add(object);
                     module_body +=
                             object + ":\n" +
@@ -78,7 +79,7 @@ public class Makefile extends ModuleAnchestor {
                     ++i;
                 }
                 titles.add(String.join("\n",
-                        LANG_ + "COMMAND=" + Utils.DQuotes(module_compiler.call_command) + " " + module.command,
+                        LANG_ + "COMMAND=" + CommonUtils.DQuotes(module_compiler.call_command) + " " + module.command,
                         LANG_ + "FLAGS=" + module.flags,
                         LANG_ + "OBJECTS=" + String.join(" ", module_objects),
                         ""
@@ -88,7 +89,7 @@ public class Makefile extends ModuleAnchestor {
             }
         }
         return String.join("\n",
-                "LINK_COMMAND=" + Utils.DQuotes(linker.call_command) + " " + command,
+                "LINK_COMMAND=" + CommonUtils.DQuotes(linker.call_command) + " " + command,
                 "LINK_FLAGS=" + flags + "\n",
                 String.join("\n", titles),
                 "all: " + binary,
@@ -124,7 +125,7 @@ public class Makefile extends ModuleAnchestor {
                 for (DBProjectFile program : programsToAssembly) {
                     //--
                     program.last_assembly_name = module.language.toString() + "_" + i + ".o";
-                    String object = Utils.DQuotes(program.last_assembly_name);
+                    String object = CommonUtils.DQuotes(program.last_assembly_name);
                     module_objects.add(object);
                     module_body +=
                             object + ":\n" +
@@ -141,7 +142,7 @@ public class Makefile extends ModuleAnchestor {
                     ++i;
                 }
                 titles.add(String.join("\n",
-                        LANG_ + "COMMAND=" + Utils.DQuotes(module_compiler.call_command) + " " + module.command,
+                        LANG_ + "COMMAND=" + CommonUtils.DQuotes(module_compiler.call_command) + " " + module.command,
                         LANG_ + "FLAGS=" + module.flags,
                         LANG_ + "OBJECTS=" + String.join(" ", module_objects),
                         ""
@@ -178,7 +179,7 @@ public class Makefile extends ModuleAnchestor {
             if (linker.type.equals(CompilerType.dvm)) {
                 if (!Current.getProject().languageName.getDVMLink().equals(command))
                     Log.Writeln("команда линковки " +
-                            Utils.Quotes(command) +
+                            CommonUtils.Quotes(command) +
                             " не соответствует языку текущего проекта "
                             + Current.getProject().languageName.getDescription() + "\n" +
                             "Используйте команду " + Current.getProject().languageName.getDVMLink());
diff --git a/src/GlobalData/Module/Module.java b/src/GlobalData/Module/Module.java
index 91aae0c6..0dc90ea1 100644
--- a/src/GlobalData/Module/Module.java
+++ b/src/GlobalData/Module/Module.java
@@ -1,11 +1,11 @@
 package GlobalData.Module;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import _VisualDVM.Global;
 import GlobalData.Makefile.Makefile;
 import ProjectData.LanguageName;
 public class Module extends ModuleAnchestor {
-    public int makefile_id = Constants.Nan;
+    public int makefile_id = CommonConstants.Nan;
     public LanguageName language = LanguageName.n;
     public int on = 1; //учитывать ли модуль при сборке. указание пользователя. если файлы отсутствуют - игнорится
     public Module() {
diff --git a/src/GlobalData/Module/ModuleAnchestor.java b/src/GlobalData/Module/ModuleAnchestor.java
index 5cc7d388..22313563 100644
--- a/src/GlobalData/Module/ModuleAnchestor.java
+++ b/src/GlobalData/Module/ModuleAnchestor.java
@@ -1,13 +1,13 @@
 package GlobalData.Module;
-import Common_old.Constants;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import GlobalData.Compiler.Compiler;
 public class ModuleAnchestor extends iDBObject {
     //--------------------------------------------------------------------------------------
-    public int machine_id = Constants.Nan;
-    public int compiler_id = Constants.Nan;
+    public int machine_id = CommonConstants.Nan;
+    public int compiler_id = CommonConstants.Nan;
     public String command = ""; //дополнительная команда компилятору. между вызовом и флагами.
     public String flags = ""; //последовательность флагов
     //---------------------------------------------------------------------------------------
@@ -22,11 +22,11 @@ public class ModuleAnchestor extends iDBObject {
     public String getDescription() {
         String res = "";
         if (getCompiler() != null) {
-            res += Utils.Brackets(getCompiler().getDescription());
+            res += CommonUtils.Brackets(getCompiler().getDescription());
             if (!command.isEmpty())
-                res += " " + Utils.Brackets(command);
+                res += " " + CommonUtils.Brackets(command);
             if (!flags.isEmpty())
-                res += " " + Utils.Brackets(flags);
+                res += " " + CommonUtils.Brackets(flags);
         }
         return res;
     }
diff --git a/src/GlobalData/Module/UI/ModuleAnchestorForm.java b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
index 57548ffe..180a88f7 100644
--- a/src/GlobalData/Module/UI/ModuleAnchestorForm.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
@@ -1,5 +1,5 @@
 package GlobalData.Module.UI;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
@@ -103,7 +103,7 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
     public void ProcessResult() {
         Result.machine_id = Current.getMachine().id;
         Compiler compiler = (Compiler) fields.cbCompilers.getSelectedItem();
-        Result.compiler_id = (compiler != null) ? compiler.id : Constants.Nan;
+        Result.compiler_id = (compiler != null) ? compiler.id : CommonConstants.Nan;
         Result.command = command;
         Result.flags = flags;
     }
diff --git a/src/GlobalData/RunConfiguration/RunConfiguration.java b/src/GlobalData/RunConfiguration/RunConfiguration.java
index b51d4daf..6628647f 100644
--- a/src/GlobalData/RunConfiguration/RunConfiguration.java
+++ b/src/GlobalData/RunConfiguration/RunConfiguration.java
@@ -1,10 +1,10 @@
 package GlobalData.RunConfiguration;
-import Common_old.Constants;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.Global;
 import Common.Utils.TextLog;
-import Common_old.Utils.Utils;
 import GlobalData.Compiler.Compiler;
 import GlobalData.DVMParameter.DVMParameter;
 import GlobalData.EnvironmentValue.EnvironmentValue;
@@ -23,7 +23,7 @@ public class RunConfiguration extends iDBObject {
     public int machine_id;
     //---------------------------------------->
     @Description("DEFAULT -1")
-    public int compiler_id = Constants.Nan;
+    public int compiler_id = CommonConstants.Nan;
     public String LauncherCall = ""; //например DVM или mpirun
     public String LauncherOptions = ""; //например run
     //--------------------------------------
@@ -146,16 +146,16 @@ public class RunConfiguration extends iDBObject {
     public String getDescription() {
         String res = "";
         if (!LauncherCall.isEmpty()) {
-            res += Utils.Brackets(LauncherCall);
+            res += CommonUtils.Brackets(LauncherCall);
             if (!LauncherOptions.isEmpty())
-                res += " " + Utils.Brackets(LauncherOptions);
+                res += " " + CommonUtils.Brackets(LauncherOptions);
         } else res = " — ";
         return res;
     }
     public String getLaunchScriptText(String binary_name, String task_matrix) {
         String res = "";
         if (!LauncherCall.isEmpty()) {
-            res += Utils.DQuotes(LauncherCall);
+            res += CommonUtils.DQuotes(LauncherCall);
             if (!LauncherOptions.isEmpty())
                 res += " " + LauncherOptions;
             if (!task_matrix.isEmpty())
@@ -163,14 +163,14 @@ public class RunConfiguration extends iDBObject {
         }
         if (!res.isEmpty())
             res += " ";
-        res += Utils.DQuotes("./" + binary_name);
+        res += CommonUtils.DQuotes("./" + binary_name);
         if (!args.isEmpty())
             res += " " + args;
         return res;
     }
     public String getLaunchShortDescription() {
         String res = "";
-        if (compiler_id != Constants.Nan) {
+        if (compiler_id != CommonConstants.Nan) {
             res += getCompiler().description;
             if (!LauncherOptions.isEmpty())
                 res += " " + LauncherOptions;
diff --git a/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index 6dff0115..c7db9d69 100644
--- a/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -1,5 +1,5 @@
 package GlobalData.RunConfiguration;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.DataSetControlForm;
@@ -72,7 +72,7 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
                 Result.LauncherOptions = (String) fields.cbLaunchOptions.getSelectedItem();
                 if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
                     Result.compiler_id = ((Compiler) (fields.cbLauncherCall.getSelectedItem())).id;
-                } else Result.compiler_id = Constants.Nan;
+                } else Result.compiler_id = CommonConstants.Nan;
                 //-
                 Result.dim = (int) fields.sMaxDim.getValue();
                 Result.minMatrix = fields.minMatrixBar.pack(Result.dim);
diff --git a/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java b/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
index fbe7b2cf..b222e72a 100644
--- a/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
+++ b/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
@@ -1,5 +1,5 @@
 package GlobalData.SapforProfileSetting;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import Common.Database.Objects.iDBObject;
 import GlobalData.Settings.SettingName;
@@ -10,7 +10,7 @@ public class SapforProfileSetting extends iDBObject {
     @Description("DEFAULT ''")
     public String value = "";
     @Description("DEFAULT -1")
-    public int sapforprofile_id = Constants.Nan;
+    public int sapforprofile_id = CommonConstants.Nan;
     @Override
     public boolean isVisible() {
         return Current.HasSapforProfile() && Current.getSapforProfile().id == sapforprofile_id;
diff --git a/src/GlobalData/Settings/DBSetting.java b/src/GlobalData/Settings/DBSetting.java
index 945d2deb..1c3cbb66 100644
--- a/src/GlobalData/Settings/DBSetting.java
+++ b/src/GlobalData/Settings/DBSetting.java
@@ -1,5 +1,6 @@
 package GlobalData.Settings;
 import Common.Database.Objects.DBObject;
+import Common.Utils.CommonUtils;
 import Common_old.UI.Menus_2023.StableMenuItem;
 import Common_old.Utils.Utils;
 import Repository.Component.ComponentType;
@@ -70,7 +71,7 @@ public class DBSetting extends DBObject {
                 getMenuItem().setText(Name.getDescription() + " : " + this + "%");
                 break;
             case StringField:
-                String valueToShow = Value.isEmpty()? "не задано":Utils.Quotes(toString());
+                String valueToShow = Value.isEmpty()? "не задано": CommonUtils.Quotes(toString());
                 getMenuItem().setText(Name.getDescription() + " : " + valueToShow);
                 break;
             case IntField:
diff --git a/src/GlobalData/Splitter/Splitter.java b/src/GlobalData/Splitter/Splitter.java
index 06f0780b..cade7ab1 100644
--- a/src/GlobalData/Splitter/Splitter.java
+++ b/src/GlobalData/Splitter/Splitter.java
@@ -1,5 +1,5 @@
 package GlobalData.Splitter;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import com.sun.org.glassfish.gmbal.Description;
 
@@ -8,7 +8,7 @@ public class Splitter extends DBObject {
     @Description("PRIMARY KEY, UNIQUE")
     public String name = "";
     @Description("DEFAULT -1")
-    public int position = Constants.Nan;
+    public int position = CommonConstants.Nan;
     public Splitter() {
     }
     public Splitter(JSplitPane splitPane) {
diff --git a/src/GlobalData/Tasks/CompilationTask/CompilationTask.java b/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
index 806632a9..dea7445f 100644
--- a/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
+++ b/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
@@ -1,8 +1,8 @@
 package GlobalData.Tasks.CompilationTask;
-import Common_old.Constants;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import GlobalData.Makefile.Makefile;
 import GlobalData.Module.Module;
 import GlobalData.Tasks.RunTask.RunTask;
@@ -16,7 +16,7 @@ import org.apache.commons.io.FileUtils;
 import java.io.File;
 import java.util.LinkedHashMap;
 public class CompilationTask extends Task {
-    public int makefile_id = Constants.Nan;
+    public int makefile_id = CommonConstants.Nan;
     public String binary_name = ""; //исполняемый файл.
     //---------------------------------------------------
     @Description("DEFAULT ''")
@@ -100,7 +100,7 @@ public class CompilationTask extends Task {
         String errors = getErrors();
         for (DBProjectFile file : project.db.files.Data.values()) {
             if (!file.last_assembly_name.isEmpty()) {
-                String replacement = file.last_assembly_name + " " + Utils.RBrackets(file.name);
+                String replacement = file.last_assembly_name + " " + CommonUtils.RBrackets(file.name);
                 output = output.replace(file.last_assembly_name, replacement);
                 errors = errors.replace(file.last_assembly_name, replacement);
             }
diff --git a/src/GlobalData/Tasks/QueueSystem/QueueSystem.java b/src/GlobalData/Tasks/QueueSystem/QueueSystem.java
index 157fdf9d..debc3345 100644
--- a/src/GlobalData/Tasks/QueueSystem/QueueSystem.java
+++ b/src/GlobalData/Tasks/QueueSystem/QueueSystem.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.QueueSystem;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
 public class QueueSystem {
@@ -28,9 +28,9 @@ public class QueueSystem {
             }
     }
     public String getCheckTaskCommand(Task task) {
-        return check_command + " " + Utils.DQuotes(task.PID);
+        return check_command + " " + CommonUtils.DQuotes(task.PID);
     }
     public String getCancelTaskCommand(Task task) {
-        return cancel_command + " " + Utils.DQuotes(task.PID);
+        return cancel_command + " " + CommonUtils.DQuotes(task.PID);
     }
 }
diff --git a/src/GlobalData/Tasks/RunTask/RunTask.java b/src/GlobalData/Tasks/RunTask/RunTask.java
index 51ca4aa0..52459b11 100644
--- a/src/GlobalData/Tasks/RunTask/RunTask.java
+++ b/src/GlobalData/Tasks/RunTask/RunTask.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.RunTask;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common.Utils.StringTemplate;
@@ -17,8 +17,8 @@ import java.io.File;
 import java.nio.file.Paths;
 import java.util.List;
 public class RunTask extends Task {
-    public int compilation_task_id = Constants.Nan; //нужна для бинарника
-    public int run_configuration_id = Constants.Nan;
+    public int compilation_task_id = CommonConstants.Nan; //нужна для бинарника
+    public int run_configuration_id = CommonConstants.Nan;
     @Description("DEFAULT ''")
     public String last_sts_name = "";
     @Description("DEFAULT 0")
@@ -152,7 +152,7 @@ public class RunTask extends Task {
     public boolean hasDVMPar() {
         RunConfiguration config = getRunConfiguration();
         return
-                config.compiler_id != Constants.Nan &&
+                config.compiler_id != CommonConstants.Nan &&
                         config.getCompiler().type.equals(CompilerType.dvm) &&
                         !config.getParList().isEmpty()
                 ;
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
index 3c2c8a58..566ba29c 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
@@ -1,4 +1,5 @@
 package GlobalData.Tasks.Supervisor.Local.Linux;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Utils.Utils;
 import GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
@@ -23,10 +24,10 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
         User user = task.getUser();
         return
                 String.join(" ",
-                        Utils.DQuotes(user.getStarterFile()),
-                        Utils.DQuotes(user.getLauncherFile()),
+                        CommonUtils.DQuotes(user.getStarterFile()),
+                        CommonUtils.DQuotes(user.getLauncherFile()),
                         String.valueOf(task.maxtime),
-                        Utils.DQuotes(getCoupDeGrace()),
+                        CommonUtils.DQuotes(getCoupDeGrace()),
                         task.getFullCommand()
                 );
     }
@@ -47,7 +48,7 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
             if (task.PID.isEmpty())
                 throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
             task.StartDate = (new Date()).getTime();
-            pass.ShowMessage1("Задача активна, идентификатор " + Utils.Brackets(task.PID));
+            pass.ShowMessage1("Задача активна, идентификатор " + CommonUtils.Brackets(task.PID));
             RefreshProgress();
             do {
                 Thread.sleep(getTaskCheckPeriod() * 1000L);
diff --git a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
index 5fe0f8aa..d33b0ac7 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
@@ -1,4 +1,5 @@
 package GlobalData.Tasks.Supervisor.Local;
+import Common.CommonConstants;
 import Common_old.Constants;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
@@ -22,7 +23,7 @@ public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor
     protected int exitCode;
     @Override
     protected void StartTask() throws Exception {
-        exitCode = Constants.Nan;
+        exitCode = CommonConstants.Nan;
         taskProcess = Utils.startScript(task.getLocalWorkspace(), getProjectCopy(), "start_task_script", getScriptText(), getEnvs());
         task.state = TaskState.Running;
     }
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
index 8986225b..9fd79c5b 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
@@ -1,4 +1,5 @@
 package GlobalData.Tasks.Supervisor.Local.Windows;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
 import GlobalData.Makefile.Makefile;
@@ -18,7 +19,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso
     }
     @Override
     protected String getScriptText() {
-        return Utils.DQuotes(Global.db.settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt";
+        return CommonUtils.DQuotes(Global.db.settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt";
     }
     //скорее всего как то выделить подготовку к компиляции как метод предка.
     @Override
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
index b90eb479..e2c117f9 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 Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.QueueSystem.MVS;
 import GlobalData.Tasks.TaskState;
@@ -32,7 +32,7 @@ public class MVSRunSupervisor extends ServerRunSupervisor {
         String env = String.join(" ", Current.getRunConfiguration().getEnvList());
         mvs_time = (task.maxtime / 60); //в минутах
         if (task.maxtime % 60 > 0) mvs_time += 1;
-        String res = "maxtime=" + Utils.DQuotes(mvs_time) + " ./run";
+        String res = "maxtime=" + CommonUtils.DQuotes(mvs_time) + " ./run";
         if (!env.isEmpty())
             res = env + " " + res;
         /*
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
index 2b4ec042..bb165db4 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 Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import GlobalData.Tasks.Task;
@@ -77,10 +77,10 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
     protected String getStartCommand() {
         String res =
                 String.join(" ",
-                        Utils.DQuotes(getStarter()),
-                        Utils.DQuotes(getLauncher()),
+                        CommonUtils.DQuotes(getStarter()),
+                        CommonUtils.DQuotes(getLauncher()),
                         String.valueOf(task.maxtime),
-                        Utils.DQuotes(getCoupDeGrace()),
+                        CommonUtils.DQuotes(getCoupDeGrace()),
                         task.getFullCommand()
                 );
         return res;
diff --git a/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
index c9d330f7..75b9e3cc 100644
--- a/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
@@ -1,4 +1,5 @@
 package GlobalData.Tasks.Supervisor;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
 import GlobalData.Tasks.Task;
@@ -96,7 +97,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass_2021> {
             task.state = TaskState.AbortedByUser;
             ShowTaskState();
         }
-        pass.ShowMessage1("Задача " + Utils.Brackets(task.state.getDescription()));
+        pass.ShowMessage1("Задача " + CommonUtils.Brackets(task.state.getDescription()));
         task.EndDate = (new Date()).getTime();
         pass.ShowMessage2("Получение результатов");
         AchieveResults();
@@ -119,7 +120,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass_2021> {
             if (task.PID.isEmpty())
                 throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
             task.StartDate = (new Date()).getTime();
-            pass.ShowMessage1("Задача активна, идентификатор " + Utils.Brackets(task.PID));
+            pass.ShowMessage1("Задача активна, идентификатор " + CommonUtils.Brackets(task.PID));
             RefreshProgress();
             do {
                 Thread.sleep(getTaskCheckPeriod() * 1000);
diff --git a/src/GlobalData/Tasks/Task.java b/src/GlobalData/Tasks/Task.java
index 554497bf..5dbb102a 100644
--- a/src/GlobalData/Tasks/Task.java
+++ b/src/GlobalData/Tasks/Task.java
@@ -1,4 +1,5 @@
 package GlobalData.Tasks;
+import Common.CommonConstants;
 import Common_old.Constants;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.Global;
@@ -16,8 +17,8 @@ public abstract class Task extends iDBObject {
     //</editor-fold>
     public TaskState state = TaskState.Inactive;
     //----------------------------------
-    public int machine_id = Constants.Nan;
-    public int user_id = Constants.Nan;
+    public int machine_id = CommonConstants.Nan;
+    public int user_id = CommonConstants.Nan;
     //-----------------------------------
     public String PID = "";
     public String project_path;// путь к проекту.
@@ -29,9 +30,9 @@ public abstract class Task extends iDBObject {
     public long EndDate = 0;//дата окончания выполнения
     //---------------------------------
     @Description("IGNORE")
-    public int progressStep = Constants.Nan;
+    public int progressStep = CommonConstants.Nan;
     @Description("IGNORE")
-    public int progressAll = Constants.Nan;
+    public int progressAll = CommonConstants.Nan;
     public boolean belongsToProject(db_project_info project) {
         return this.project_path.equalsIgnoreCase(project.Home.getAbsolutePath());
     }
@@ -108,11 +109,11 @@ public abstract class Task extends iDBObject {
         progressAll = progressAll_in;
     }
     public void dropProgress() {
-        progressStep = Constants.Nan;
-        progressAll = Constants.Nan;
+        progressStep = CommonConstants.Nan;
+        progressAll = CommonConstants.Nan;
     }
     public boolean hasProgress() {
-        return (progressStep != Constants.Nan) && (progressAll != Constants.Nan);
+        return (progressStep != CommonConstants.Nan) && (progressAll != CommonConstants.Nan);
     }
     //---------------------------------
     public void AnalyzeResultsTexts(db_project_info project) throws Exception {
diff --git a/src/GlobalData/User/User.java b/src/GlobalData/User/User.java
index 0d728d15..70bf4ed2 100644
--- a/src/GlobalData/User/User.java
+++ b/src/GlobalData/User/User.java
@@ -1,5 +1,5 @@
 package GlobalData.User;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import Common.Database.Objects.iDBObject;
 import GlobalData.Machine.Machine;
@@ -11,7 +11,7 @@ import java.nio.file.Paths;
 public class User extends iDBObject {
     public String login;
     public String password = "";
-    public int machine_id = Constants.Nan;
+    public int machine_id = CommonConstants.Nan;
     public UserAuthentication authentication = UserAuthentication.password;
     public String workspace = ""; //рабочая папка визуализатора пользователя на машине. полный путь.
     public UserState state = UserState.initial;
diff --git a/src/ProjectData/Files/DBProjectFile.java b/src/ProjectData/Files/DBProjectFile.java
index 8cb29588..b594429e 100644
--- a/src/ProjectData/Files/DBProjectFile.java
+++ b/src/ProjectData/Files/DBProjectFile.java
@@ -1,4 +1,5 @@
 package ProjectData.Files;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
@@ -85,7 +86,7 @@ public class DBProjectFile extends ProjectFile {
         if (data.length > 1) {
             String[] data1 = data[1].split(":");
             if (data1.length > 0) {
-                file = Utils.toW(data1[0]);//.substring(1));
+                file = CommonUtils.toW(data1[0]);//.substring(1));
 //первый символ тут всегда пробел. слеши всегда виндовые.
             }
         }
@@ -156,7 +157,7 @@ public class DBProjectFile extends ProjectFile {
         String default_options = "";
         switch (languageName) {
             case fortran:
-                default_options += " -spf -noProject -o " + Utils.DQuotes(getDepFile().getAbsolutePath());
+                default_options += " -spf -noProject -o " + CommonUtils.DQuotes(getDepFile().getAbsolutePath());
                 switch (style) {
                     case free:
                         default_options += " -f90";
@@ -390,10 +391,10 @@ public class DBProjectFile extends ProjectFile {
         father.db.Update(this);
     }
     public String getUnixName() {
-        return Utils.toU(name);
+        return CommonUtils.toU(name);
     }
     public String getQObjectName() {
-        return Utils.DQuotes(getUnixName() + ".o");
+        return CommonUtils.DQuotes(getUnixName() + ".o");
     }
 
     @Override
@@ -401,7 +402,7 @@ public class DBProjectFile extends ProjectFile {
         return name;
     }
     public String getProjectNameWithoutExtension() {
-        String extension = Utils.getExtension(file);
+        String extension = CommonUtils.getExtension(file);
         return name.substring(0, name.length() - (extension.length() + 1));
     }
     public void importSettings(DBProjectFile parent, boolean sapforStyle) throws Exception {
diff --git a/src/ProjectData/Files/ProjectFile.java b/src/ProjectData/Files/ProjectFile.java
index b26b0e15..a649ddf4 100644
--- a/src/ProjectData/Files/ProjectFile.java
+++ b/src/ProjectData/Files/ProjectFile.java
@@ -1,7 +1,7 @@
 package ProjectData.Files;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common.Database.Objects.DBObject;
-import Common_old.Utils.Utils;
 import ProjectData.LanguageName;
 
 import javax.swing.*;
@@ -48,7 +48,7 @@ public class ProjectFile extends DBObject {
             }
         }
         //-
-        switch (Utils.getExtensionByName(name_in)) {
+        switch (CommonUtils.getExtensionFromName(name_in)) {
             case "f":
             case "fdv":
             case "for":
@@ -87,7 +87,7 @@ public class ProjectFile extends DBObject {
                 fileType = FileType.forbidden;
                 break;
             case "":
-                if (Utils.isDigit(name_in)) {
+                if (CommonUtils.isDigit(name_in)) {
                     fileType = FileType.forbidden;
                 } else {
                     state = FileState.Excluded;
@@ -130,14 +130,14 @@ public class ProjectFile extends DBObject {
         return new ImageIcon(imageUrl);
     }
     public String getUnixName() {
-        return Utils.toU(file.getName());
+        return CommonUtils.toU(file.getName());
     }
     @Override
     public String toString() {
         return file.getName();
     }
     public String getQSourceName() {
-        return Utils.DQuotes(getUnixName());
+        return CommonUtils.DQuotes(getUnixName());
     }
     public String getStyleOptions() {
         if (languageName == LanguageName.fortran) {
diff --git a/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java b/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
index 20603844..3ccf119d 100644
--- a/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
+++ b/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
@@ -1,6 +1,6 @@
 package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
+import Common.Utils.CommonUtils;
 import Common_old.UI.Editor.CaretInfo;
-import Common_old.Utils.Utils;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
 import org.fife.ui.autocomplete.BasicCompletion;
@@ -18,7 +18,7 @@ public class BaseDirective extends BasicCompletion {
                 getCaretInfo().suffix_word.isEmpty() &&
                         name.getText().startsWith(getCaretInfo().prefix_word)
                         && (!name.getText().equals(getCaretInfo().prefix_word))
-                        && !Utils.isBracketsBalanced(getCaretInfo().before);
+                        && !CommonUtils.isRBracketsBalanced(getCaretInfo().before);
     }
     //итоговая функция, определяющая наличие директивы в автозаполнении
     public boolean Check() {
diff --git a/src/ProjectData/Messages/Message.java b/src/ProjectData/Messages/Message.java
index 55f18cb4..25498eb4 100644
--- a/src/ProjectData/Messages/Message.java
+++ b/src/ProjectData/Messages/Message.java
@@ -1,4 +1,5 @@
 package ProjectData.Messages;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
@@ -396,7 +397,7 @@ public class Message extends FileObject {
                     if (sum != splited.length && !message.equals("")) {
                         Utils.CopyToClipboard(message);
                         throw new PassException("Ошибка при декодировании сообщений на русском языке\n" +
-                                "message=" + Utils.Brackets(message));
+                                "message=" + CommonUtils.Brackets(message));
                     }
                     idx = 0;
                     String result = "";
diff --git a/src/ProjectData/Messages/Recommendations/MessageRecommendation.java b/src/ProjectData/Messages/Recommendations/MessageRecommendation.java
index b7848fe0..f832de9c 100644
--- a/src/ProjectData/Messages/Recommendations/MessageRecommendation.java
+++ b/src/ProjectData/Messages/Recommendations/MessageRecommendation.java
@@ -1,6 +1,6 @@
 package ProjectData.Messages.Recommendations;
 import Common.Database.Objects.iDBObject;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.sun.org.glassfish.gmbal.Description;
@@ -19,18 +19,18 @@ public class MessageRecommendation extends iDBObject {
     public MessageRecommendation(PassCode_2021 passCode_in) {
         type = RecommendationType.Transformation;
         argName = passCode_in.toString();
-        text = "Выполните преобразование " + Utils.Quotes(passCode_in.getDescription());
+        text = "Выполните преобразование " + CommonUtils.Quotes(passCode_in.getDescription());
     }
     public MessageRecommendation(SettingName settingName_in, String settingValue_in) {
         type = RecommendationType.Setting;
         argName = settingName_in.toString();
         argValue = settingValue_in;
         if (argValue.equals("1"))
-            text = "Включите настройку SAPFOR " + Utils.Quotes(settingName_in.getDescription());
+            text = "Включите настройку SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
         else if (argValue.equals("0"))
-            text = "Отключите настройку SAPFOR " + Utils.Quotes(settingName_in.getDescription());
+            text = "Отключите настройку SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
         else
-            text = "Задайте значение " + Utils.DQuotes(argValue) + " для настройки SAPFOR " + Utils.Quotes(settingName_in.getDescription());
+            text = "Задайте значение " + CommonUtils.DQuotes(argValue) + " для настройки SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
     }
     public MessageRecommendation(String text_in) {
         type = RecommendationType.Text;
diff --git a/src/ProjectData/Project/db_project_info.java b/src/ProjectData/Project/db_project_info.java
index 328ee33c..b44c1588 100644
--- a/src/ProjectData/Project/db_project_info.java
+++ b/src/ProjectData/Project/db_project_info.java
@@ -1,4 +1,6 @@
 package ProjectData.Project;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
@@ -65,7 +67,7 @@ public class db_project_info extends DBObject {
     public String Log = "";//текст выдаваемый сапфором
     //-----------------------------------------------
     @Description("DEFAULT -1")
-    public long creationDate = Constants.Nan; //--------------------------------------------------NEW.
+    public long creationDate = CommonConstants.Nan; //--------------------------------------------------NEW.
     @Description("DEFAULT ''")
     public String compilation_output = "";
     @Description("DEFAULT ''")
@@ -88,19 +90,19 @@ public class db_project_info extends DBObject {
     public int maxdim = 0;
     //<editor-fold desc="Метрика">
     @Description("DEFAULT -1")
-    public int numLines = Constants.Nan;
+    public int numLines = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int numSPF = Constants.Nan;
+    public int numSPF = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int numDVM = Constants.Nan;
+    public int numDVM = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int numArrays = Constants.Nan;
+    public int numArrays = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int numLoops = Constants.Nan;
+    public int numLoops = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int numFunctions = Constants.Nan;
+    public int numFunctions = CommonConstants.Nan;
     @Description("DEFAULT -1")
-    public int numAddicted = Constants.Nan;
+    public int numAddicted = CommonConstants.Nan;
     //-------------------------------------
     //параметры графа функций. храним для каждого проекта.
     @Description("DEFAULT 500")
@@ -309,10 +311,10 @@ public class db_project_info extends DBObject {
     }
     public boolean IsMCopy() {
         String lname = name.toLowerCase();
-        return (lname.startsWith("m") && Utils.isDigit(lname.substring(1)));
+        return (lname.startsWith("m") && CommonUtils.isDigit(lname.substring(1)));
     }
     public String getTitle() {
-        return name + " " + Utils.DQuotes(description);
+        return name + " " + CommonUtils.DQuotes(description);
     }
     public File getProjFile() {
         return Paths.get(Home.getAbsolutePath(), Constants.data, Constants.spf).toFile();
@@ -398,13 +400,13 @@ public class db_project_info extends DBObject {
         allIncludes.clear();
         files_order.clear();
         functionsGraph.Clear();
-        numLines = Constants.Nan;
-        numSPF = Constants.Nan;
-        numDVM = Constants.Nan;
-        numArrays = Constants.Nan;
-        numFunctions = Constants.Nan;
-        numAddicted = Constants.Nan;
-        numLoops = Constants.Nan;
+        numLines = CommonConstants.Nan;
+        numSPF = CommonConstants.Nan;
+        numDVM = CommonConstants.Nan;
+        numArrays = CommonConstants.Nan;
+        numFunctions = CommonConstants.Nan;
+        numAddicted = CommonConstants.Nan;
+        numLoops = CommonConstants.Nan;
         Log = "";
         Scenario = "";
         declaratedArrays.clear();
@@ -528,10 +530,10 @@ public class db_project_info extends DBObject {
         return numLoops == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetGraphLoops) : String.valueOf(numLoops);
     }
     public String FunctionsCount() {
-        return numFunctions == Constants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetGraphFunctions) : String.valueOf(numFunctions);
+        return numFunctions == CommonConstants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetGraphFunctions) : String.valueOf(numFunctions);
     }
     public String AddictedCount() {
-        return numAddicted == Constants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetIncludeDependencies) : String.valueOf(numAddicted);
+        return numAddicted == CommonConstants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetIncludeDependencies) : String.valueOf(numAddicted);
     }
     public boolean UpdateLinesCount() {
         try {
@@ -673,8 +675,8 @@ public class db_project_info extends DBObject {
     public boolean FolderNotExists(File new_directory, File subdir, TextLog passLog) {
         for (File pf : getSubdirectoriesSimple(subdir)) {
             if (pf.getName().equals(new_directory.getName())) {
-                passLog.Writeln("В папке " + Utils.Brackets(subdir.getAbsolutePath()) + "\n" +
-                        "уже существует папка с именем " + Utils.Brackets(new_directory.getName()));
+                passLog.Writeln("В папке " + CommonUtils.Brackets(subdir.getAbsolutePath()) + "\n" +
+                        "уже существует папка с именем " + CommonUtils.Brackets(new_directory.getName()));
                 return false;
             }
         }
@@ -713,8 +715,8 @@ public class db_project_info extends DBObject {
     }
     public boolean CheckAttachmentFile(File f, TextLog Log) {
         Utils.validateFileShortNewName(f.getName(), Log);
-        if (Utils.getFileSizeMegaBytes(f) > 2)
-            Log.Writeln_("Размер вложения " + Utils.Brackets(f.getName()) + " превышает 2 Мb");
+        if (CommonUtils.getFileSizeMegaBytes(f) > 2)
+            Log.Writeln_("Размер вложения " + CommonUtils.Brackets(f.getName()) + " превышает 2 Мb");
         return Log.isEmpty();
     }
     public boolean CheckAllAttachments(TextLog Log) {
@@ -843,7 +845,7 @@ public class db_project_info extends DBObject {
             for (String key_ : versions.keySet()) {
                 String[] data_ = key_.split(letter);
                 String last = data_[data_.length - 1];
-                if (Utils.isDigit(last)) {
+                if (CommonUtils.isDigit(last)) {
                     int vn = Integer.parseInt(last);
                     if (vn > max_vn)
                         max_vn = vn;
@@ -1123,7 +1125,7 @@ public class db_project_info extends DBObject {
             String[] splited = packed_messages.split("\\|");
             int numberOfFiles = Integer.parseInt(splited[idx++]);
             for (int i = 0; i < numberOfFiles; ++i) {
-                String message_file = Utils.toW(splited[idx++]); //для ключа.
+                String message_file = CommonUtils.toW(splited[idx++]); //для ключа.
                 int numberOfMessages = Integer.parseInt(splited[idx++]);
                 if (!db.files.Data.containsKey(message_file)) {
                     throw new PassException("Ошибка при распаковке сообщений: файл: [" +
diff --git a/src/ProjectData/SapforData/Arrays/ArrayDecl.java b/src/ProjectData/SapforData/Arrays/ArrayDecl.java
index f79dbb9f..01cd5b50 100644
--- a/src/ProjectData/SapforData/Arrays/ArrayDecl.java
+++ b/src/ProjectData/SapforData/Arrays/ArrayDecl.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Arrays;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 // это то что отображается в боковом графе файла. не путать с сапфоровским ProjectArray
@@ -13,6 +13,6 @@ public class ArrayDecl extends FileObjectWithMessages {
     }
     @Override
     public String Description() {
-        return array_loc.getDescription() + " массив " + Utils.Brackets(array_name);
+        return array_loc.getDescription() + " массив " + CommonUtils.Brackets(array_name);
     }
 }
diff --git a/src/ProjectData/SapforData/Arrays/ProjectArray.java b/src/ProjectData/SapforData/Arrays/ProjectArray.java
index 209f0a8f..d129b0ff 100644
--- a/src/ProjectData/SapforData/Arrays/ProjectArray.java
+++ b/src/ProjectData/SapforData/Arrays/ProjectArray.java
@@ -1,4 +1,5 @@
 package ProjectData.SapforData.Arrays;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
@@ -103,7 +104,7 @@ public class ProjectArray extends DBObject {
         int numDeclPlaces = Integer.parseInt(localSplited[2]);
         int idxPl = 3;
         for (int i = 0; i < numDeclPlaces; ++i, idxPl += 2) {
-            String declFile = Utils.toW(localSplited[idxPl]);
+            String declFile = CommonUtils.toW(localSplited[idxPl]);
             DBProjectFile file = Current.getProject().db.files.Data.get(declFile);
             int declLine = Integer.parseInt(localSplited[idxPl + 1]);
             //declPlaces.add(new Pair<>(declFile, declLine));
@@ -318,7 +319,7 @@ public class ProjectArray extends DBObject {
                     default:
                         break;
                 }
-                res += Utils.ending(i == binary.length() - 1);
+                res += CommonUtils.ending(i == binary.length() - 1);
             }
         }
         return res;
diff --git a/src/ProjectData/SapforData/FileObject.java b/src/ProjectData/SapforData/FileObject.java
index d38e7a07..246fb929 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 Common.Database.Objects.iDBObject;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import com.sun.org.glassfish.gmbal.Description;
 //объект принадлежащий файлу и относящийся к его строке.
@@ -18,7 +18,7 @@ public abstract class FileObject extends iDBObject {
     }
     @Override
     public String getSelectionText() {
-        return "файл " + Utils.Brackets(file) + " строка: " + line;
+        return "файл " + CommonUtils.Brackets(file) + " строка: " + line;
     }
     public DBProjectFile getFather() {
         return Current.getProject().db.files.Data.get(file);
diff --git a/src/ProjectData/SapforData/Functions/FuncCall.java b/src/ProjectData/SapforData/Functions/FuncCall.java
index a4433077..5f5cc2f0 100644
--- a/src/ProjectData/SapforData/Functions/FuncCall.java
+++ b/src/ProjectData/SapforData/Functions/FuncCall.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions;
+import Common.Utils.CommonUtils;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -25,14 +25,14 @@ public class FuncCall extends FileObjectWithMessages {
     }
     @Override
     public String Description() {
-        return "вызов " + Utils.Brackets(funcName);
+        return "вызов " + CommonUtils.Brackets(funcName);
     }
     @Override
     public void Select(boolean flag) {
         if (Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
             super.Select(flag);
         } else {
-            UI.Info("Для подстановки функций требуется выполнить проход " + Utils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
+            UI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
         }
     }
 }
diff --git a/src/ProjectData/SapforData/Functions/FuncCallH.java b/src/ProjectData/SapforData/Functions/FuncCallH.java
index 7a74ca34..8c0ac5be 100644
--- a/src/ProjectData/SapforData/Functions/FuncCallH.java
+++ b/src/ProjectData/SapforData/Functions/FuncCallH.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions;
+import Common.Utils.CommonUtils;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -29,7 +29,7 @@ public class FuncCallH extends FuncCall {
     }
     @Override
     public String getSelectionText() {
-        return "вызов " + Utils.Brackets(funcName) + " в строке " + line;
+        return "вызов " + CommonUtils.Brackets(funcName) + " в строке " + line;
     }
     @Override
     public void SelectAllChildren(boolean select) {
@@ -41,7 +41,7 @@ public class FuncCallH extends FuncCall {
         if (Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
             super.Select(flag);
         } else {
-            UI.Info("Для подстановки функций требуется выполнить проход " + Utils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
+            UI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
         }
     }
 }
diff --git a/src/ProjectData/SapforData/Functions/FuncInfo.java b/src/ProjectData/SapforData/Functions/FuncInfo.java
index 4358fa4d..41d7e641 100644
--- a/src/ProjectData/SapforData/Functions/FuncInfo.java
+++ b/src/ProjectData/SapforData/Functions/FuncInfo.java
@@ -1,4 +1,5 @@
 package ProjectData.SapforData.Functions;
+import Common.Utils.CommonUtils;
 import Common.Utils.Index;
 import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
@@ -52,7 +53,7 @@ public class FuncInfo extends FileObjectWithMessages {
     //--
     @Override
     public String getSelectionText() {
-        return type.getDescription() + " " + Utils.Brackets(funcName);
+        return type.getDescription() + " " + CommonUtils.Brackets(funcName);
     }
     public boolean isMain() {
         return type.equals(FunctionType.Main);
@@ -77,6 +78,6 @@ public class FuncInfo extends FileObjectWithMessages {
     }
     @Override
     public String Description() {
-        return type.getDescription() + " " + Utils.Brackets(funcName);
+        return type.getDescription() + " " + CommonUtils.Brackets(funcName);
     }
 }
diff --git a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
index 8cc4782e..65558868 100644
--- a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
@@ -1,9 +1,9 @@
 package ProjectData.SapforData.Functions.UI.Graph;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.Menus.VisualiserMenuItem;
 import Common_old.UI.Menus.StyledPopupMenu;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
@@ -32,7 +32,7 @@ public class FunctionsGraphMenu extends StyledPopupMenu {
     @Override
     public void CheckElementsVisibility() {
         if (Current.HasSelectedFunction()) {
-            changeCurrent.setText("Назначить процедуру " + Utils.DQuotes(Current.getSelectionFunction().funcName) + " текущей.");
+            changeCurrent.setText("Назначить процедуру " + CommonUtils.DQuotes(Current.getSelectionFunction().funcName) + " текущей.");
             changeCurrent.setEnabled(true);
         } else {
             changeCurrent.setText("Невозможно назначить текущую процедуру: узел графа не выбран");
diff --git a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
index dba4b538..197729a2 100644
--- a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Functions.UI.Graph;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import ProjectData.SapforData.Functions.FuncCoordinates;
 import ProjectData.SapforData.Functions.FuncInfo;
 import ProjectData.SapforData.Functions.FunctionType;
@@ -243,7 +243,7 @@ public class FunctionsGraphUI extends mxGraph {
                                         break;
                                     case Standard:
                                     case NotFound:
-                                        UI.Info("процедура " + Utils.Brackets(func_name) + " " + fi.type.getDescription());
+                                        UI.Info("процедура " + CommonUtils.Brackets(func_name) + " " + fi.type.getDescription());
                                         break;
                                 }
                                 break;
diff --git a/src/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java b/src/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java
index cd62214a..daf60482 100644
--- a/src/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Functions.UI.Graph;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import com.mxgraph.swing.mxGraphComponent;
 import javafx.util.Pair;
 
@@ -44,7 +44,7 @@ public class GraphInfo {
         Vector<String> edges = new Vector<>();
         for (String name : vertexMap.keySet()) {
             for (String neighbor : vertexMap.get(name)) {
-                edges.add(Utils.Brackets(name + "," + neighbor));
+                edges.add(CommonUtils.Brackets(name + "," + neighbor));
             }
         }
     }
diff --git a/src/ProjectData/SapforData/Includes/DependencyInfo.java b/src/ProjectData/SapforData/Includes/DependencyInfo.java
index 5037f79b..4f797cae 100644
--- a/src/ProjectData/SapforData/Includes/DependencyInfo.java
+++ b/src/ProjectData/SapforData/Includes/DependencyInfo.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Includes;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import ProjectData.SapforData.FileObject;
 public class DependencyInfo extends FileObject {
     public DependencyInfo(String file_in) {
@@ -7,7 +7,7 @@ public class DependencyInfo extends FileObject {
     }
     @Override
     public String getSelectionText() {
-        return "включение: " + Utils.Brackets(file);
+        return "включение: " + CommonUtils.Brackets(file);
     }
     //мб на будущее расширить, в какой строке находится команда икнлудить файл.
     // но это уже к Сапфору
diff --git a/src/ProjectData/SapforData/Regions/ParallelRegion.java b/src/ProjectData/SapforData/Regions/ParallelRegion.java
index 2d76a7b8..cf92c329 100644
--- a/src/ProjectData/SapforData/Regions/ParallelRegion.java
+++ b/src/ProjectData/SapforData/Regions/ParallelRegion.java
@@ -1,8 +1,8 @@
 package ProjectData.SapforData.Regions;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
-import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.Arrays.Distribution.AlignRule;
 import ProjectData.SapforData.Arrays.Distribution.DataDirective;
@@ -39,7 +39,7 @@ public class ParallelRegion extends DBObject {
         //распаковка Lines -----------------------------------------------
         //---------------------------------------------------------------
         for (int i = 0; i < lines_size; ++i) {
-            String line_file = Utils.toW(localSplited[1]);
+            String line_file = CommonUtils.toW(localSplited[1]);
             int line_list_size = Integer.parseInt(localSplited[2]);
             Vector<Pair<Integer, Integer>> current_lines = new Vector<>(line_list_size);
             for (int k = 0; k < line_list_size; ++k) {
diff --git a/src/Repository/BugReport/BugReportInterface.java b/src/Repository/BugReport/BugReportInterface.java
index fc4c8474..f01dc348 100644
--- a/src/Repository/BugReport/BugReportInterface.java
+++ b/src/Repository/BugReport/BugReportInterface.java
@@ -1,8 +1,8 @@
 package Repository.BugReport;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common.Utils.TextLog;
-import Common_old.Utils.Utils;
 import Repository.RepositoryServer;
 import Repository.Subscribes.Subscriber;
 
@@ -61,7 +61,7 @@ public class BugReportInterface {
         return true;
     }
     public static String getMailTitlePrefix(BugReport object) {
-        return "Ошибка " + Utils.Brackets(object.id) + ", автор " + Utils.Brackets(object.sender_name) + " : ";
+        return "Ошибка " + CommonUtils.Brackets(object.id) + ", автор " + CommonUtils.Brackets(object.sender_name) + " : ";
     }
     public static Vector<String> getRecipients(BugReport object) {
         Vector<String> res = new Vector<>();
diff --git a/src/Repository/Component/Component.java b/src/Repository/Component/Component.java
index 20fa4626..43faadf2 100644
--- a/src/Repository/Component/Component.java
+++ b/src/Repository/Component/Component.java
@@ -1,4 +1,6 @@
 package Repository.Component;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
@@ -14,9 +16,9 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 public abstract class Component extends DBObject implements Loggable {
     public String date_text = Constants.dateNaN;
-    public long version = Constants.Nan;
-    public long actual_version = Constants.Nan;
-    public long minimal_version = Constants.Nan;
+    public long version = CommonConstants.Nan;
+    public long actual_version = CommonConstants.Nan;
+    public long minimal_version = CommonConstants.Nan;
     //--
     public String code = "";
     public String actual_code = "";
@@ -26,7 +28,7 @@ public abstract class Component extends DBObject implements Loggable {
     VFileChooser fileChooser = null; ///для ручной установки.
     public VFileChooser getFileChooser() {
         return (fileChooser == null) ? (fileChooser = new VFileChooser("выбор файла для компонента " +
-                Utils.Brackets(getComponentType().getDescription()), Utils.getExtension(getFile())))
+                CommonUtils.Brackets(getComponentType().getDescription()), CommonUtils.getExtension(getFile())))
                 : fileChooser;
     }
     //--
@@ -34,7 +36,7 @@ public abstract class Component extends DBObject implements Loggable {
         return String.valueOf(version);
     }
     public void CheckIfNeedsUpdateOrPublish() {
-        if (actual_version != Constants.Nan) {
+        if (actual_version != CommonConstants.Nan) {
             if (version < minimal_version) setState(ComponentState.Old_version);
             else {
                 ComponentState new_state =
@@ -48,7 +50,7 @@ public abstract class Component extends DBObject implements Loggable {
         setState(ComponentState.Undefined);
         if (getFile().exists()) {
             GetVersionInfo();
-            if (version == Constants.Nan)
+            if (version == CommonConstants.Nan)
                 setState(ComponentState.Unknown_version);
         } else setState(ComponentState.Not_found);
     }
@@ -84,8 +86,8 @@ public abstract class Component extends DBObject implements Loggable {
         return getComponentType();
     }
     public boolean isValidVersion(TextLog Log, String desc) {
-        if (version == Constants.Nan) {
-            Log.Writeln_("Не определена версия " + desc + " компонента " + Utils.Brackets(getComponentType().getDescription()));
+        if (version == CommonConstants.Nan) {
+            Log.Writeln_("Не определена версия " + desc + " компонента " + CommonUtils.Brackets(getComponentType().getDescription()));
             return false;
         }
         return true;
diff --git a/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java b/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
index fea9038d..69f656ee 100644
--- a/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
+++ b/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
@@ -1,4 +1,5 @@
 package Repository.Component.PerformanceAnalyzer;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import analyzer.common.MessageJtoJ;
@@ -102,7 +103,7 @@ public class PerformanceAnalyzer extends Component {
                 return null;
             });
             Utils.startScript(Global.TempDirectory, Global.ComponentsDirectory, "analyzer",
-                    "java -jar -Dprism.order=sw "+ Utils.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort()+ " --version" );
+                    "java -jar -Dprism.order=sw "+ CommonUtils.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort()+ " --version" );
             //-
             server_thread.join();
         } catch (Exception ex) {
@@ -124,7 +125,7 @@ public class PerformanceAnalyzer extends Component {
                 try {
 
                     Utils.startScript(Global.TempDirectory, Global.ComponentsDirectory, "analyzer",
-                            "java -jar -Dprism.order=sw "+ Utils.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort());
+                            "java -jar -Dprism.order=sw "+ CommonUtils.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort());
                     //-
                 } catch (Exception ex) {
                     ex.printStackTrace();
diff --git a/src/Repository/Component/Sapfor/Sapfor.java b/src/Repository/Component/Sapfor/Sapfor.java
index c8243ce2..39ceac4c 100644
--- a/src/Repository/Component/Sapfor/Sapfor.java
+++ b/src/Repository/Component/Sapfor/Sapfor.java
@@ -1,4 +1,6 @@
 package Repository.Component.Sapfor;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
@@ -137,7 +139,7 @@ public abstract class Sapfor extends OSDComponent {
             Visualizer_2.UnpackVersionInfo(this, getResult());
         } catch (Exception e) {
             Global.Log.PrintException(e);
-            UI.Error("Не удалось получить версию компонента " + Utils.DQuotes(getComponentType().getDescription()));
+            UI.Error("Не удалось получить версию компонента " + CommonUtils.DQuotes(getComponentType().getDescription()));
         }
     }
     public abstract String getUpdateCommand();
@@ -165,9 +167,9 @@ public abstract class Sapfor extends OSDComponent {
         RunAnalysis("SPF_StatisticAnalyzer",
                 -1,
                 "",
-                Utils.DQuotes(src.getAbsolutePath()) +
+                CommonUtils.DQuotes(src.getAbsolutePath()) +
                         " "
-                        + Utils.DQuotes(dst.getAbsolutePath())
+                        + CommonUtils.DQuotes(dst.getAbsolutePath())
         );
     }
     public void Restart() throws Exception {
@@ -181,7 +183,7 @@ public abstract class Sapfor extends OSDComponent {
     public void cd(File directory_in) throws Exception {
         if (RunAnalysis("SPF_ChangeDirectory", -1, directory_in.getAbsolutePath(), "") != 0)
             throw new PassException("Sapfor: Не удалось перейти в папку "
-                    + Utils.Brackets(directory_in.getAbsolutePath()) +
+                    + CommonUtils.Brackets(directory_in.getAbsolutePath()) +
                     "\n" + "Код возврата: " + getErrorCode());
     }
     public String getResult() {
@@ -253,7 +255,7 @@ public abstract class Sapfor extends OSDComponent {
                     }
                 } else if (z == 1) file_text = sub;
                 else if (z == 2) {
-                    ModifiedFiles.put(Utils.toW(sub), file_text);
+                    ModifiedFiles.put(CommonUtils.toW(sub), file_text);
                     file_text = null;
                 }
                 codeIdx += count;
@@ -444,7 +446,7 @@ public abstract class Sapfor extends OSDComponent {
                                         Vector<String> resultLines
     ) throws Exception {
         Process process = null;
-        int exit_code = Constants.Nan;
+        int exit_code = CommonConstants.Nan;
         //---
         File data_workspace = new File(workspace, Constants.data);
         Utils.CheckDirectory(data_workspace);
@@ -455,14 +457,14 @@ public abstract class Sapfor extends OSDComponent {
         //---
         File file = new File(data_workspace, name + (Global.isWindows ? ".bat" : ".sh"));
         FileUtils.write(file,
-                Utils.DQuotes(sapfor_drv)
+                CommonUtils.DQuotes(sapfor_drv)
                         + (flags.isEmpty() ? "" : (" " + flags))
                         + " -noLogo"
                         + " " + command +
                         " 1>" +
-                        Utils.DQuotes(outputFile.getAbsolutePath()) +
+                        CommonUtils.DQuotes(outputFile.getAbsolutePath()) +
                         " 2>" +
-                        Utils.DQuotes(errorsFile.getAbsolutePath()),
+                        CommonUtils.DQuotes(errorsFile.getAbsolutePath()),
                 Charset.defaultCharset());
         if (!file.setExecutable(true))
             throw new Exception("Не удалось сделать файл скрипта " + name + " исполняемым!");
@@ -557,7 +559,7 @@ public abstract class Sapfor extends OSDComponent {
         return false;
     }
     public static int readVersionFromCode(File versionFile) {
-        int res = Constants.Nan;
+        int res = CommonConstants.Nan;
         if (versionFile.exists()) {
             try {
                 List<String> data = FileUtils.readLines(versionFile);
diff --git a/src/Repository/Component/Visualizer_2.java b/src/Repository/Component/Visualizer_2.java
index c168db69..16bbc23e 100644
--- a/src/Repository/Component/Visualizer_2.java
+++ b/src/Repository/Component/Visualizer_2.java
@@ -1,4 +1,5 @@
 package Repository.Component;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -119,7 +120,7 @@ public class Visualizer_2 extends OSDComponent {
             case "NOT_FOUND":
             case "WRONG":
             case "SEG_FAULT":
-                throw new PassException("Команда серверу SAPFOR вернула " + Utils.Brackets(response));
+                throw new PassException("Команда серверу SAPFOR вернула " + CommonUtils.Brackets(response));
             default:
                 break;
         }
diff --git a/src/Repository/RepositoryClient.java b/src/Repository/RepositoryClient.java
index 515e1e76..cb54d9ba 100644
--- a/src/Repository/RepositoryClient.java
+++ b/src/Repository/RepositoryClient.java
@@ -1,4 +1,5 @@
 package Repository;
+import Common.Utils.CommonUtils;
 import Common_old.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
@@ -21,7 +22,7 @@ public abstract class RepositoryClient {
         try {
             if (isPrintOn()) {
                 FileWriter testLog = new FileWriter(getClass().getSimpleName() + "_Log.txt", true);
-                String dmessage = Utils.Brackets(new Date()) + " " + message;
+                String dmessage = CommonUtils.Brackets(new Date()) + " " + message;
                 System.out.println(dmessage);
                 testLog.write(dmessage + "\n");
                 testLog.close();
@@ -59,7 +60,7 @@ public abstract class RepositoryClient {
         return ServerCommand(code_in, "", null);
     }
     protected void ServerConnectionError(ServerCode code_in, String logText) throws Exception {
-        throw new PassException(Utils.Brackets(new Date().toString())+" Ошибка взаимодействия с сервером " + code_in);
+        throw new PassException(CommonUtils.Brackets(new Date().toString())+" Ошибка взаимодействия с сервером " + code_in);
     }
     public abstract void perform() throws Exception;
     public void Perform(){
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index 9a5ea1bf..f03a95eb 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -1,4 +1,5 @@
 package Repository;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Database;
@@ -73,7 +74,7 @@ public abstract class RepositoryServer<D extends Database> {
         if (printOn) {
             try {
                 Log = new FileWriter("Log.txt", true);
-                String dmessage = Utils.Brackets("SESSION -> ") + new Date() +
+                String dmessage = CommonUtils.Brackets("SESSION -> ") + new Date() +
                         " " + message;
                 Log.write(dmessage + "\n");
                 Log.close();
@@ -150,7 +151,7 @@ public abstract class RepositoryServer<D extends Database> {
                             Transport.send(message);
                             done = true;
                         } catch (Exception ex) {
-                            System.out.println("Исключение во время отправки сообщения абоненту " + Utils.Brackets(target));
+                            System.out.println("Исключение во время отправки сообщения абоненту " + CommonUtils.Brackets(target));
                             ex.printStackTrace();
                             Utils.sleep(1000);
                         } finally {
@@ -209,17 +210,17 @@ public abstract class RepositoryServer<D extends Database> {
                             switch (code) {
                                 //<editor-fold desc="файлы и почта">
                                 case ReadFile:
-                                    Print("Отправить клиенту текст файла по пути " + Utils.Brackets(request.arg));
+                                    Print("Отправить клиенту текст файла по пути " + CommonUtils.Brackets(request.arg));
                                     response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.ReadAllText(new File(request.arg)));
                                     break;
                                 case SendFile:
                                     //нам пришел файл.
-                                    Print("Получить от клиента файл, и распаковать его по пути " + Utils.Brackets(request.arg));
+                                    Print("Получить от клиента файл, и распаковать его по пути " + CommonUtils.Brackets(request.arg));
                                     request.Unpack(); //распаковка идет по его аргу-пути назначения
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     break;
                                 case ReceiveFile:
-                                    Print("Отправить клиенту файл по пути " + Utils.Brackets(request.arg));
+                                    Print("Отправить клиенту файл по пути " + CommonUtils.Brackets(request.arg));
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     File file = new File(request.arg);
                                     response.object = file.exists() ? Utils.packFile(file) : null;
diff --git a/src/Repository/Server/ComponentsServer.java b/src/Repository/Server/ComponentsServer.java
index 650849ce..16c0a622 100644
--- a/src/Repository/Server/ComponentsServer.java
+++ b/src/Repository/Server/ComponentsServer.java
@@ -1,5 +1,6 @@
 package Repository.Server;
 import Common.Database.Objects.DBObject;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
 import GlobalData.Account.Account;
@@ -307,14 +308,14 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                             File program = Paths.get(project.getAbsolutePath(), fileName).toFile();
                             //--
                             File convertedProgram = Paths.get(program.getParent(),
-                                    Utils.getFileNameWithoutExtension(program) + ".DVMH." +
+                                    CommonUtils.getFileNameWithoutExtension(program) + ".DVMH." +
                                             (projectLanguage.equals(LanguageName.fortran) ? "f" : "c")
                             ).toFile();
                             String command =
-                                    Utils.DQuotes(server_dvm_drv) + " " +
+                                    CommonUtils.DQuotes(server_dvm_drv) + " " +
                                             projectLanguage.getDVMCompile() + "dv " +
                                             options + " "
-                                            + Utils.DQuotes(program.getName());
+                                            + CommonUtils.DQuotes(program.getName());
                             //--
                             File fileWorkspace = program.getParentFile();
                             Process process = Utils.startScript(workspace, fileWorkspace, Utils.getDateName("convert_script"), command);
diff --git a/src/Repository/Server/ServerExchangeUnit_2021.java b/src/Repository/Server/ServerExchangeUnit_2021.java
index df39ab6d..82dd5bd9 100644
--- a/src/Repository/Server/ServerExchangeUnit_2021.java
+++ b/src/Repository/Server/ServerExchangeUnit_2021.java
@@ -1,4 +1,5 @@
 package Repository.Server;
+import Common.Utils.CommonUtils;
 import Common_old.Utils.Utils;
 
 import java.io.File;
@@ -35,7 +36,7 @@ public class ServerExchangeUnit_2021 implements Serializable {
         Utils.unpackFile((byte[]) object, file);
     }
     public void Print() {
-        System.out.println("codeName=" + Utils.Brackets(codeName));
+        System.out.println("codeName=" + CommonUtils.Brackets(codeName));
         System.out.println(arg);
     }
 }
diff --git a/src/Repository/Subscribes/UI/SubscriberForm.java b/src/Repository/Subscribes/UI/SubscriberForm.java
index 3f4808c6..1f0f6d41 100644
--- a/src/Repository/Subscribes/UI/SubscriberForm.java
+++ b/src/Repository/Subscribes/UI/SubscriberForm.java
@@ -1,4 +1,5 @@
 package Repository.Subscribes.UI;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
@@ -25,7 +26,7 @@ public class SubscriberForm extends DBObjectDialog<Subscriber, SubscriberFields>
         if (fields.tfAddress.getText().isEmpty())
             Log.Writeln_("Адрес электронной почты не может быть пустым");
         if (!title_text.equals("Регистрация") && (fields.tfAddress.isEditable() && Global.componentsServer.db.subscribers.Data.containsKey(fields.tfAddress.getText()))) {
-            Log.Writeln_("Адрес электронной почты " + Utils.Brackets(fields.tfAddress.getText()) + " уже есть в списке.");
+            Log.Writeln_("Адрес электронной почты " + CommonUtils.Brackets(fields.tfAddress.getText()) + " уже есть в списке.");
         }
     }
     @Override
diff --git a/src/TestingSystem/Common/Group/Group.java b/src/TestingSystem/Common/Group/Group.java
index 84292ece..84bf3326 100644
--- a/src/TestingSystem/Common/Group/Group.java
+++ b/src/TestingSystem/Common/Group/Group.java
@@ -1,4 +1,5 @@
 package TestingSystem.Common.Group;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
@@ -65,7 +66,7 @@ public class Group extends riDBObject {
             int i = 1;
             for (ProjectFile program : programs.get(language)) {
                 //--
-                String object = Utils.DQuotes(language + "_" + i + ".o");
+                String object = CommonUtils.DQuotes(language + "_" + i + ".o");
                 module_objects.add(object);
                 module_body +=
                         object + ":\n" +
@@ -82,7 +83,7 @@ public class Group extends riDBObject {
                 ++i;
             }
             titles.add(String.join("\n",
-                    LANG_ + "COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
+                    LANG_ + "COMMAND=" + CommonUtils.DQuotes(dvm_drv) + " " +
                             language.getDVMCompile(),
                     LANG_ + "FLAGS=" + flags_in,
                     LANG_ + "OBJECTS=" + String.join(" ", module_objects),
@@ -98,12 +99,12 @@ public class Group extends riDBObject {
         Vector<String> titles = new Vector<>();
         Vector<String> objects = new Vector<>();
         Vector<String> bodies = new Vector<>();
-        String binary = Utils.DQuotes("0");
+        String binary = CommonUtils.DQuotes("0");
         //----->>
         generateForLanguage(dvm_drv, programs, language, titles, objects, bodies, flags_in);
         //----->>
         return String.join("\n",
-                "LINK_COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
+                "LINK_COMMAND=" + CommonUtils.DQuotes(dvm_drv) + " " +
                         language.getDVMLink(),
                 "LINK_FLAGS=" + flags_in + "\n",
                 String.join("\n", titles),
diff --git a/src/TestingSystem/Common/MachineProcess/MachineProcess.java b/src/TestingSystem/Common/MachineProcess/MachineProcess.java
index 6b0a28e2..53ee3454 100644
--- a/src/TestingSystem/Common/MachineProcess/MachineProcess.java
+++ b/src/TestingSystem/Common/MachineProcess/MachineProcess.java
@@ -1,4 +1,5 @@
 package TestingSystem.Common.MachineProcess;
+import Common.CommonConstants;
 import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
@@ -15,7 +16,7 @@ import java.util.Vector;
 public class MachineProcess extends DBObject {
     public String id = "";
     public String machineAddress = "";
-    public int machinePort = Constants.Nan;
+    public int machinePort = CommonConstants.Nan;
     public String userName = "";
     public String userPassword = "";
     public String userWorkspace = "";
@@ -104,13 +105,13 @@ public class MachineProcess extends DBObject {
                     Current.Mode.MachineQueue;
             CommonUtils.jsonToFile(properties, new File(workspace, "properties"));
             Vector<String> args = new Vector<>();
-            args.add(Utils.DQuotes(machineAddress));
-            args.add(Utils.DQuotes(machinePort));
-            args.add(Utils.DQuotes(userName));
-            args.add(Utils.DQuotes(userPassword));
-            args.add(Utils.DQuotes(userWorkspace));
-            args.add(Utils.DQuotes(testingSystemRoot));
-            args.add(Utils.DQuotes(Global.testingServer.name));
+            args.add(CommonUtils.DQuotes(machineAddress));
+            args.add(CommonUtils.DQuotes(machinePort));
+            args.add(CommonUtils.DQuotes(userName));
+            args.add(CommonUtils.DQuotes(userPassword));
+            args.add(CommonUtils.DQuotes(userWorkspace));
+            args.add(CommonUtils.DQuotes(testingSystemRoot));
+            args.add(CommonUtils.DQuotes(Global.testingServer.name));
             //--
             Utils.startScript(workspace, workspace,
                     "start",
diff --git a/src/TestingSystem/Common/Test/Test.java b/src/TestingSystem/Common/Test/Test.java
index 56c2a2a8..041d0372 100644
--- a/src/TestingSystem/Common/Test/Test.java
+++ b/src/TestingSystem/Common/Test/Test.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common.Test;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
@@ -27,7 +27,7 @@ public class Test extends riDBObject {
     @Description("DEFAULT ''")
     public String args = ""; //аргументы командной строки. на всякий случай поле зарезервирую. пусть будут.
     @Description("DEFAULT -1")
-    public int group_id = Constants.Nan;
+    public int group_id = CommonConstants.Nan;
     @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
diff --git a/src/TestingSystem/Common/TestingPackageToKill/TestingPackageToKill.java b/src/TestingSystem/Common/TestingPackageToKill/TestingPackageToKill.java
index 32ed2679..48f839e0 100644
--- a/src/TestingSystem/Common/TestingPackageToKill/TestingPackageToKill.java
+++ b/src/TestingSystem/Common/TestingPackageToKill/TestingPackageToKill.java
@@ -1,8 +1,8 @@
 package TestingSystem.Common.TestingPackageToKill;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common.Database.Objects.iDBObject;
 public class TestingPackageToKill extends iDBObject {
-    public int packageId = Constants.Nan;
+    public int packageId = CommonConstants.Nan;
     public int type = 0; // 0 - dvm /1 - sapfor
     public TestingPackageToKill() {
     }
diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
index c805a2dd..afb38b9d 100644
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -1,4 +1,6 @@
 package TestingSystem.Common;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
@@ -62,7 +64,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
         if (testingPackage.needsEmail == 1) {
             EmailMessage message = new EmailMessage();
             message.subject = "Состояние пакета тестирования "+packageDescription()+ " "+
-                     Utils.Brackets(testingPackage.id) + " изменилось на " + Utils.Brackets(testingPackage.state.getDescription());
+                     CommonUtils.Brackets(testingPackage.id) + " изменилось на " + CommonUtils.Brackets(testingPackage.state.getDescription());
             message.text = testingPackage.description;
             message.targets.add(testingPackage.sender_address);
             ServerCommand(ServerCode.Email, message);
@@ -108,7 +110,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
                 try {
                     if (Connect()) {
                         int ptk_id = (int) ServerCommand(getCheckIfNeedsKillCode(), testingPackage.id);
-                        if (ptk_id != Constants.Nan) {
+                        if (ptk_id != CommonConstants.Nan) {
                             Print("package " + testingPackage.id + " NEEDS TO KILL");
                             Kill();
                             UpdatePackageState(TasksPackageState.Aborted);
@@ -215,12 +217,12 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
         machine = new Machine(machineAddress, machineAddress, machinePort, MachineType.Server);
         user = new User(userName, userPassword, userWorkspace);
         //---
-        Print("machineAddress=" + Utils.Brackets(machineAddress));
-        Print("machinePort=" + Utils.Brackets(String.valueOf(machinePort)));
-        Print("userName=" + Utils.Brackets(userName));
-        Print("userPassword=" + Utils.Brackets(userPassword));
-        Print("userWorkspace=" + Utils.Brackets(userWorkspace));
-        Print("root=" + Utils.Brackets(Global.Home));
+        Print("machineAddress=" + CommonUtils.Brackets(machineAddress));
+        Print("machinePort=" + CommonUtils.Brackets(String.valueOf(machinePort)));
+        Print("userName=" + CommonUtils.Brackets(userName));
+        Print("userPassword=" + CommonUtils.Brackets(userPassword));
+        Print("userWorkspace=" + CommonUtils.Brackets(userWorkspace));
+        Print("root=" + CommonUtils.Brackets(Global.Home));
         Print("serverName=" + serverName);
         Print("=====");
         //----
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index 436c8b37..dbfc6cb1 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -1,4 +1,5 @@
 package TestingSystem.Common;
+import Common.CommonConstants;
 import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common.Database.Objects.DBObject;
@@ -127,7 +128,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     public TestingServer() {
         super(TestsDatabase.class);
         name = Utils.getDateName("testingServer");
-        System.out.println("ServerName=" + Utils.Brackets(name));
+        System.out.println("ServerName=" + CommonUtils.Brackets(name));
     }
     //основа
     @Override
@@ -178,7 +179,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 EmailMessage message = Log.isEmpty() ?
                         new EmailMessage(
                                 "Запущено автоматическое тестирование версии " + request.arg + " системы SAPFOR",
-                                "Пакет "+ Utils.Brackets(autoPackage.id), new Vector<>()) :
+                                "Пакет "+ CommonUtils.Brackets(autoPackage.id), new Vector<>()) :
                         new EmailMessage(
                                 "Не удалось запустить автоматическое тестирование версии " + request.arg + " системы SAPFOR",
                                 Log.toString(),
@@ -295,7 +296,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 pathname.isFile()
                         && !pathname.getName().equals("settings")
                         && !pathname.getName().equals("test-analyzer.sh")
-                        && Utils.getExtension(pathname).startsWith(languageName.getDVMCompile()));
+                        && CommonUtils.getExtension(pathname).startsWith(languageName.getDVMCompile()));
         ;
         if (files != null) {
             groupFiles = new Vector<>(Arrays.asList(files));
@@ -392,7 +393,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     }
     private void DVMPackageNeedsKill() {
         response = new ServerExchangeUnit_2021(ServerCode.OK);
-        response.object = Constants.Nan;
+        response.object = CommonConstants.Nan;
         int packageId = (int) request.object;
         for (TestingPackageToKill packageToKill : db.testingPackagesToKill.Data.values()) {
             if ((packageToKill.packageId == packageId) && (packageToKill.type == 0)) {
@@ -403,7 +404,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     }
     private void SapforPackageNeedsKill() throws Exception {
         response = new ServerExchangeUnit_2021(ServerCode.OK);
-        response.object = Constants.Nan;
+        response.object = CommonConstants.Nan;
         int packageId = (int) request.object;
         for (TestingPackageToKill packageToKill : db.testingPackagesToKill.Data.values()) {
             if ((packageToKill.packageId == packageId) && (packageToKill.type == 1)) {
@@ -483,11 +484,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         Vector<DVMPackage_json> jsons = new Vector<>();
         for (int package_id : packages_ids) {
             if (!db.dvmPackages.containsKey(package_id))
-                throw new RepositoryRefuseException("Пакета задач DVM " + Utils.Brackets(package_id) + " не существует.");
+                throw new RepositoryRefuseException("Пакета задач DVM " + CommonUtils.Brackets(package_id) + " не существует.");
             DVMPackage dvmPackage = db.dvmPackages.get(package_id);
             File json = dvmPackage.getJsonFile();
             if (!json.exists())
-                throw new RepositoryRefuseException("Не найден JSON файл для пакета задач DVM " + Utils.Brackets(package_id));
+                throw new RepositoryRefuseException("Не найден JSON файл для пакета задач DVM " + CommonUtils.Brackets(package_id));
             jsons.add((DVMPackage_json) CommonUtils.jsonFromFile(json, DVMPackage_json.class));
         }
         response = new ServerExchangeUnit_2021(ServerCode.OK);
@@ -498,11 +499,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         Vector<SapforPackage_json> jsons = new Vector<>();
         for (int package_id : packages_ids) {
             if (!db.sapforPackages.containsKey(package_id))
-                throw new RepositoryRefuseException("Пакета задач SAPFOR " + Utils.Brackets(package_id) + " не существует.");
+                throw new RepositoryRefuseException("Пакета задач SAPFOR " + CommonUtils.Brackets(package_id) + " не существует.");
             SapforPackage sapforPackage = db.sapforPackages.get(package_id);
             File json = sapforPackage.getJsonFile();
             if (!json.exists())
-                throw new RepositoryRefuseException("Не найден JSON файл для пакета задач SAPFOR " + Utils.Brackets(package_id));
+                throw new RepositoryRefuseException("Не найден JSON файл для пакета задач SAPFOR " + CommonUtils.Brackets(package_id));
             jsons.add((SapforPackage_json) CommonUtils.jsonFromFile(json, SapforPackage_json.class));
         }
         response = new ServerExchangeUnit_2021(ServerCode.OK);
@@ -562,7 +563,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Global.TempDirectory,
                 "get_version",
                 "wget --user dvmhuser --password dvmh2013  -P " +
-                        Utils.DQuotes(Global.TempDirectory.getAbsolutePath()) +
+                        CommonUtils.DQuotes(Global.TempDirectory.getAbsolutePath()) +
                         "  http://svn.dvm-system.org/svn/dvmhrepo/sapfor/experts/Sapfor_2017/_src/Utils/version.h"
         ).waitFor();
         if (!versionFile.exists())
@@ -582,7 +583,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Global.TempDirectory,
                 "get_version",
                 "wget --user dvmhuser --password dvmh2013  -P " +
-                        Utils.DQuotes(Global.TempDirectory.getAbsolutePath()) +
+                        CommonUtils.DQuotes(Global.TempDirectory.getAbsolutePath()) +
                         "  http://svn.dvm-system.org/svn/dvmhrepo/sapfor/experts/Sapfor_2017/_src/Utils/version.h"
         ).waitFor();
         if (!versionFile.exists())
diff --git a/src/TestingSystem/Common/TestsDatabase.java b/src/TestingSystem/Common/TestsDatabase.java
index 5f5632c0..59777998 100644
--- a/src/TestingSystem/Common/TestsDatabase.java
+++ b/src/TestingSystem/Common/TestsDatabase.java
@@ -1,4 +1,6 @@
 package TestingSystem.Common;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common.Database.SQLITE.SQLiteDatabase;
 import _VisualDVM.Global;
@@ -194,7 +196,7 @@ public class TestsDatabase extends SQLiteDatabase {
                 if (Sapfor.getMinMaxDim(Sapfor.getTempCopy(new File(sapfor.call_command)), tempProject, test)) {
                     Update(test);
                 } else
-                    throw new RepositoryRefuseException("Не удалось определить размерность теста " + Utils.Brackets(test.description));
+                    throw new RepositoryRefuseException("Не удалось определить размерность теста " + CommonUtils.Brackets(test.description));
                 break;
             case c:
                 test.max_dim = Utils.getCTestMaxDim(testFile);
@@ -222,12 +224,12 @@ public class TestsDatabase extends SQLiteDatabase {
         if (oldGroup == null) {
             Insert(group);
             for (File file : files) {
-                String testDescription = Utils.getNameWithoutExtension(file.getName()) + "_" + group.language.getDVMCompile();
+                String testDescription = CommonUtils.getNameWithoutExtension(file.getName()) + "_" + group.language.getDVMCompile();
                 CreateTestFromSingleFile(account, sapfor, group, file, testDescription);
             }
         } else {
             for (File file : files) {
-                String testDescription = Utils.getNameWithoutExtension(file.getName()) + "_" + group.language.getDVMCompile();
+                String testDescription = CommonUtils.getNameWithoutExtension(file.getName()) + "_" + group.language.getDVMCompile();
                 Test oldTest = tests.getTestByDescription(oldGroup.id, testDescription);
                 if (oldTest == null) {
                     CreateTestFromSingleFile(account, sapfor, oldGroup, file, testDescription);
@@ -287,10 +289,10 @@ public class TestsDatabase extends SQLiteDatabase {
 
     }
     public Integer getInstalledSapforMaxVersion() {
-        int max_version = Constants.Nan;
+        int max_version = CommonConstants.Nan;
         for (ServerSapfor sapfor : serverSapfors.Data.values()) {
             if (sapfor.state.equals(ServerSapforState.Done)) {
-                int version = Constants.Nan;
+                int version = CommonConstants.Nan;
                 try {
                     version = Integer.parseInt(sapfor.version);
                 } catch (Exception ex) {
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
index 6e98cecc..d3eeb88a 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMPackage;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
@@ -38,7 +38,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                       Compiler compiler,
                       Vector<DVMConfiguration> configurations,
                       int neeedsEmail_in) {
-        id = Constants.Nan;
+        id = CommonConstants.Nan;
         //-
         sender_name = account.name;
         sender_address = account.email;
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java b/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
index e47790e6..1e6d5cdd 100644
--- a/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMTasks;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
@@ -36,9 +36,9 @@ public class DVMCompilationTask extends DVMTask {
     public static String checkEnvironments(String environmentsSet_in) {
         if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
             if (environmentsSet_in.isEmpty())
-                return "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
+                return "DVMH_NO_DIRECT_COPY=" + CommonUtils.DQuotes("1");
             else
-                return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
+                return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + CommonUtils.DQuotes("1");
         } else
             return environmentsSet_in;
     }
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java b/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
index fc5f1ab1..8a791fe4 100644
--- a/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
@@ -1,4 +1,5 @@
 package TestingSystem.DVM.DVMTasks;
+import Common.CommonConstants;
 import Common_old.Constants;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
@@ -16,7 +17,7 @@ import java.nio.file.Paths;
 import java.util.Vector;
 public class DVMRunTask extends DVMTask {
     @Expose
-    public int dvmcompilationtask_id = Constants.Nan;
+    public int dvmcompilationtask_id = CommonConstants.Nan;
     @Expose
     public String matrix = "";
     @Expose
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMTask.java b/src/TestingSystem/DVM/DVMTasks/DVMTask.java
index f13ca676..abaa4e3a 100644
--- a/src/TestingSystem/DVM/DVMTasks/DVMTask.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMTask.java
@@ -1,4 +1,5 @@
 package TestingSystem.DVM.DVMTasks;
+import Common.CommonConstants;
 import Common_old.Constants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.iDBObject;
@@ -17,13 +18,13 @@ import java.nio.file.Paths;
 import java.util.Vector;
 public class DVMTask extends iDBObject {
     @Expose
-    public int dvm_package_id = Constants.Nan;
+    public int dvm_package_id = CommonConstants.Nan;
     @Expose
-    public int group_id = Constants.Nan;
+    public int group_id = CommonConstants.Nan;
     @Expose
     public String group_description = "";
     @Expose
-    public int test_id = Constants.Nan;
+    public int test_id = CommonConstants.Nan;
     @Expose
     public String test_description = "";
     @Expose
@@ -85,7 +86,7 @@ public class DVMTask extends iDBObject {
     }
     public String getResultFile(File resultFile) {
         String res = "";
-        if (dvm_package_id == Constants.Nan) res = "задача ещё не выполнялась";
+        if (dvm_package_id == CommonConstants.Nan) res = "задача ещё не выполнялась";
         else {
             if (resultFile.exists()) {
                 try {
diff --git a/src/TestingSystem/DVM/DVMTestingPlanner.java b/src/TestingSystem/DVM/DVMTestingPlanner.java
index 18e3f078..c10c5e68 100644
--- a/src/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/DVMTestingPlanner.java
@@ -1,4 +1,5 @@
 package TestingSystem.DVM;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
 import GlobalData.Tasks.TaskState;
@@ -61,12 +62,12 @@ public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
             int i = 1;
             for (ProjectFile program : language_programs) {
                 //--
-                String object = Utils.DQuotes(language + "_" + i + ".o");
+                String object = CommonUtils.DQuotes(language + "_" + i + ".o");
                 module_objects.add(object);
                 module_body += object + ":\n" + "\t" + String.join(" ", Utils.MFVar(LANG_ + "COMMAND"), Utils.MFVar(LANG_ + "FLAGS"), program.getStyleOptions(), "-c", program.getQSourceName(), "-o", object + "\n\n");
                 ++i;
             }
-            titles.add(String.join("\n", LANG_ + "COMMAND=" + Utils.DQuotes(dvm_drv) + " " + language.getDVMCompile(), LANG_ + "FLAGS=" + flags, LANG_ + "OBJECTS=" + String.join(" ", module_objects), ""));
+            titles.add(String.join("\n", LANG_ + "COMMAND=" + CommonUtils.DQuotes(dvm_drv) + " " + language.getDVMCompile(), LANG_ + "FLAGS=" + flags, LANG_ + "OBJECTS=" + String.join(" ", module_objects), ""));
             objects.add(Utils.MFVar(LANG_ + "OBJECTS"));
             bodies.add(module_body);
         }
@@ -77,13 +78,13 @@ public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
         Vector<String> titles = new Vector<>();
         Vector<String> objects = new Vector<>();
         Vector<String> bodies = new Vector<>();
-        String binary = Utils.DQuotes("0");
+        String binary = CommonUtils.DQuotes("0");
         //----->>
         for (LanguageName languageName : programs.keySet()) {
             generateForLanguage(dvm_drv, languageName, programs.get(languageName), titles, objects, bodies, flags);
         }
         //----->>
-        return String.join("\n", "LINK_COMMAND=" + Utils.DQuotes(dvm_drv) + " " + test_language.getDVMLink(), "LINK_FLAGS=" + flags + "\n", String.join("\n", titles), "all: " + binary, binary + " : " + String.join(" ", objects), "\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary, String.join(" ", bodies));
+        return String.join("\n", "LINK_COMMAND=" + CommonUtils.DQuotes(dvm_drv) + " " + test_language.getDVMLink(), "LINK_FLAGS=" + flags + "\n", String.join("\n", titles), "all: " + binary, binary + " : " + String.join(" ", objects), "\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary, String.join(" ", bodies));
     }
     public void getTasksInfo(List<? extends DVMTask> tasks, String file_name) throws Exception {
         LinkedHashMap<Integer, DVMTask> sorted_tasks = new LinkedHashMap<>();
@@ -137,16 +138,16 @@ public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
     public void perform() throws Exception {
         Print("Проверка сервера...");
         String currentServerName = (String) ServerCommand(ServerCode.GetServerName);
-        Print("имя текущего сервера " + Utils.Brackets(currentServerName));
-        Print("имя сервера, создавшего нить " + Utils.Brackets(serverName));
+        Print("имя текущего сервера " + CommonUtils.Brackets(currentServerName));
+        Print("имя сервера, создавшего нить " + CommonUtils.Brackets(serverName));
         if (!serverName.equals(currentServerName)) {
             Finalize("Несоответствующий сервер");
         }
-        Print("Запрос активных пакетов для машины " + Utils.Brackets(machine.getURL()));
+        Print("Запрос активных пакетов для машины " + CommonUtils.Brackets(machine.getURL()));
         testingPackage = null;
         Vector<DVMPackage> activePackages = (Vector<DVMPackage>) ServerCommand(getActivePackagesCode(), machine.getURL(), null);
         if (activePackages.isEmpty())
-            Finalize("Не найдено активных пакетов для машины " + Utils.Brackets(machine.getURL()));
+            Finalize("Не найдено активных пакетов для машины " + CommonUtils.Brackets(machine.getURL()));
         for (DVMPackage activePackage : activePackages)
             PerformPackage(activePackage);
     }
diff --git a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 58587046..5b2237cf 100644
--- a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -1,4 +1,5 @@
 package TestingSystem.DVM;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
@@ -171,11 +172,11 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
     @Override
     protected void PackageStart() throws Exception {
         String plannerStartCommand = String.join(" ",
-                Utils.DQuotes(getPlanner()),
-                Utils.DQuotes(user.workspace),
-                Utils.DQuotes(packageRemoteWorkspace.full_name),
-                Utils.DQuotes(testingPackage.kernels),
-                Utils.DQuotes(testingPackage.drv));
+                CommonUtils.DQuotes(getPlanner()),
+                CommonUtils.DQuotes(user.workspace),
+                CommonUtils.DQuotes(packageRemoteWorkspace.full_name),
+                CommonUtils.DQuotes(testingPackage.kernels),
+                CommonUtils.DQuotes(testingPackage.drv));
         user.connection.startShellProcess(packageRemoteWorkspace, "planner_output",
                 "ulimit -s unlimited", plannerStartCommand);
         //---
@@ -186,7 +187,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
         }
         testingPackage.PID = user.connection.readFromFile(PID).replace("\n", "").replace("\r", "");
         //---
-        System.out.println("PID=" + Utils.Brackets(testingPackage.PID));
+        System.out.println("PID=" + CommonUtils.Brackets(testingPackage.PID));
         RemoteFile STARTED = new RemoteFile(packageRemoteWorkspace, "STARTED");
         while (!user.connection.Exists(STARTED)) {
             Print("waiting for package start...");
@@ -233,7 +234,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
         Utils.CheckDirectory(packageLocalWorkspace);
         RemoteFile remote_results_archive = new RemoteFile(packageRemoteWorkspace, "results.zip");
         File results_archive = new File(packageLocalWorkspace, "results.zip");
-        user.connection.performScript(packageRemoteWorkspace, "zip -r " + Utils.DQuotes("results.zip") + " " + Utils.DQuotes("results"));
+        user.connection.performScript(packageRemoteWorkspace, "zip -r " + CommonUtils.DQuotes("results.zip") + " " + CommonUtils.DQuotes("results"));
         //---
         if (user.connection.Exists(remote_results_archive)) {
             user.connection.getSingleFile(remote_results_archive.full_name, results_archive.getAbsolutePath());
diff --git a/src/TestingSystem/DVM/UserConnection.java b/src/TestingSystem/DVM/UserConnection.java
index 52a5c4cc..bd5a0e25 100644
--- a/src/TestingSystem/DVM/UserConnection.java
+++ b/src/TestingSystem/DVM/UserConnection.java
@@ -1,4 +1,6 @@
 package TestingSystem.DVM;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
@@ -118,7 +120,7 @@ public class UserConnection {
         if ((maxSize == 0) || getFileKBSize(src.full_name) <= maxSize) {
             getSingleFile(src.full_name, dst.getAbsolutePath());
         } else {
-            Utils.WriteToFile(dst, "Размер файла превышает " + maxSize + " KB.\n" + "Файл не загружен. Его можно просмотреть на машине по адресу\n" + Utils.Brackets(src.full_name));
+            Utils.WriteToFile(dst, "Размер файла превышает " + maxSize + " KB.\n" + "Файл не загружен. Его можно просмотреть на машине по адресу\n" + CommonUtils.Brackets(src.full_name));
         }
     }
     public void putSingleFile(File src, RemoteFile dst) throws Exception {
@@ -131,8 +133,8 @@ public class UserConnection {
     //-
     public void RMDIR(String dir) throws Exception {
         if (!dir.isEmpty() && !dir.equals("/") && !dir.equals("\\") && !dir.equals("*")) {
-            Command("rm -rf " + Utils.DQuotes(dir));
-        } else throw new PassException("Недопустимый путь для удаления папки " + Utils.DQuotes(dir));
+            Command("rm -rf " + CommonUtils.DQuotes(dir));
+        } else throw new PassException("Недопустимый путь для удаления папки " + CommonUtils.DQuotes(dir));
     }
     //-
     public void SynchronizeSubDirsR(File local_dir, RemoteFile remote_dir) throws Exception {
@@ -220,9 +222,9 @@ public class UserConnection {
                 sftpChannel.rm(file.full_name);
         }
         //--
-        writeToFile("cd " + Utils.DQuotes(directory.full_name) + "\n" + String.join("\n", commands), script_file);
+        writeToFile("cd " + CommonUtils.DQuotes(directory.full_name) + "\n" + String.join("\n", commands), script_file);
         //--
-        Command(Utils.DQuotes(script_file.full_name) + " 1>" + Utils.DQuotes(out.full_name) + " 2>" + Utils.DQuotes(err.full_name));
+        Command(CommonUtils.DQuotes(script_file.full_name) + " 1>" + CommonUtils.DQuotes(out.full_name) + " 2>" + CommonUtils.DQuotes(err.full_name));
         return new Pair<>(out, err);
     }
     public void putResource(RemoteFile dstDirectory, String resource_name) throws Exception {
@@ -232,7 +234,7 @@ public class UserConnection {
     }
     boolean compileModule(RemoteFile modulesDirectory, String module_name) throws Exception {
         String flags = module_name.equals("planner") ? getAvailibleCPPStandard(modulesDirectory) : "";
-        String command = "g++ -O3 " + flags + " " + Utils.DQuotes(module_name + ".cpp") + " -o " + Utils.DQuotes(module_name);
+        String command = "g++ -O3 " + flags + " " + CommonUtils.DQuotes(module_name + ".cpp") + " -o " + CommonUtils.DQuotes(module_name);
         RemoteFile binary = new RemoteFile(modulesDirectory, module_name);
         //--
         if (Exists(binary))
@@ -302,7 +304,7 @@ public class UserConnection {
                 getSingleFile(src.full_name, dst.getAbsolutePath());
                 return true;
             } else {
-                Utils.WriteToFile(dst, "Размер файла превышает " + maxSize + " KB.\n" + "Файл не загружен. Его можно просмотреть на машине по адресу\n" + Utils.Brackets(src.full_name));
+                Utils.WriteToFile(dst, "Размер файла превышает " + maxSize + " KB.\n" + "Файл не загружен. Его можно просмотреть на машине по адресу\n" + CommonUtils.Brackets(src.full_name));
             }
         }
         return false;
@@ -379,7 +381,7 @@ public class UserConnection {
             BufferedReader in = new BufferedReader(new InputStreamReader(execChannel.getInputStream()));
             String line = null;
             while ((line = in.readLine()) != null) {
-                System.out.println(Utils.Brackets(line));
+                System.out.println(CommonUtils.Brackets(line));
             }
         }
         execChannel.disconnect();
@@ -466,10 +468,10 @@ public class UserConnection {
     }
     public String startShellProcess(RemoteFile directory, String outFileName, String... commands) throws Exception {
         Vector<String> commands_ = new Vector<>();
-        commands_.add("cd " + Utils.DQuotes(directory.full_name));
+        commands_.add("cd " + CommonUtils.DQuotes(directory.full_name));
         for (int i = 0; i < commands.length; ++i) {
             if (i == commands.length - 1) {
-                commands_.add(commands[i] + " 1>" + Utils.DQuotes(outFileName));
+                commands_.add(commands[i] + " 1>" + CommonUtils.DQuotes(outFileName));
             } else {
                 commands_.add(commands[i]);
             }
@@ -478,7 +480,7 @@ public class UserConnection {
         if (Exists(script_file))
             sftpChannel.rm(script_file.full_name);
         writeToFile(String.join("\n", commands_), script_file);
-        String start_command = Utils.DQuotes(script_file.full_name);
+        String start_command = CommonUtils.DQuotes(script_file.full_name);
         //--
         RemoteFile outFile = new RemoteFile(directory, outFileName);
         if (Exists(outFile))
@@ -522,7 +524,7 @@ public class UserConnection {
     public String CheckModulesVersion() throws Exception {
         RemoteFile modulesDirectory = new RemoteFile(user.workspace, "modules");
         RemoteFile version = new RemoteFile(modulesDirectory, "version.h");
-        int current_version = Constants.Nan;
+        int current_version = CommonConstants.Nan;
         int actual_version = Constants.planner_version;
         if (Exists(version)) {
             try {
diff --git a/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java b/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
index 37de680e..cc70a18f 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.Json;
-import Common_old.Constants;
+import Common.CommonConstants;
 import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
@@ -10,7 +10,7 @@ import java.util.Vector;
 //на самом деле уже settings. конфиграция = группы + параметры
 public class SapforConfiguration_json implements Serializable {
     @Expose
-    public int id = Constants.Nan;
+    public int id = CommonConstants.Nan;
     @Expose
     public String name = "";
     @Expose
diff --git a/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java b/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
index 57ce88d1..6a2d8966 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.Json;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.UI.VisualCache.SapforConfigurationCache;
 import Common_old.UI.VisualCache.VisualCaches;
 import TestingSystem.Common.Test.Test;
@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Vector;
 public class SapforTestingSet_json implements Serializable {
     @Expose
-    public int id = Constants.Nan;
+    public int id = CommonConstants.Nan;
     @Expose
     public List<SapforTest_json> tests = new Vector<>();
     @Expose
diff --git a/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
index 689a1398..b69f2c14 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
@@ -1,4 +1,6 @@
 package TestingSystem.SAPFOR.Json;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
@@ -54,7 +56,7 @@ public class SapforVersion_json implements Serializable {
         state = SapforVersionState.Empty;
         comparisonState = VersionComparisonState.Unknown;
         //--
-        String relativePath = Global.isWindows ? Utils.toW(version) : version;
+        String relativePath = Global.isWindows ? CommonUtils.toW(version) : version;
         Home = Paths.get(configurationRoot.getAbsolutePath(), relativePath).toFile();
         files = new LinkedHashMap<>();
         //--
@@ -133,7 +135,7 @@ public class SapforVersion_json implements Serializable {
     public MessageError unpackMessage(String line_in) throws Exception {
         MessageError res = new MessageError();
         res.file = "";
-        res.line = Constants.Nan;
+        res.line = CommonConstants.Nan;
         res.value = "";
         String line = line_in.substring(9);
         int i = 0;
@@ -250,7 +252,7 @@ public class SapforVersion_json implements Serializable {
     //--
     public void createProject(File rootHome) throws Exception {
         project = null;
-        String version_ = Global.isWindows ? Utils.toW(version) : Utils.toU(version);
+        String version_ = Global.isWindows ? CommonUtils.toW(version) : CommonUtils.toU(version);
         project = new db_project_info();
         project.Home = Paths.get(rootHome.getAbsolutePath(), version_).toFile();
         project.name = project.Home.getName();
@@ -303,6 +305,6 @@ public class SapforVersion_json implements Serializable {
     }
     @Override
     public String toString() {
-        return Home.getName() + " : " + Utils.Brackets(description) + " файлы: " + files.size();
+        return Home.getName() + " : " + CommonUtils.Brackets(description) + " файлы: " + files.size();
     }
 }
diff --git a/src/TestingSystem/SAPFOR/PerformSapforTask.java b/src/TestingSystem/SAPFOR/PerformSapforTask.java
index 17f9bff5..69fcd776 100644
--- a/src/TestingSystem/SAPFOR/PerformSapforTask.java
+++ b/src/TestingSystem/SAPFOR/PerformSapforTask.java
@@ -1,4 +1,5 @@
 package TestingSystem.SAPFOR;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
@@ -71,7 +72,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
                 "transformation",
                 sapfor_drv,
                 parentTask,
-                code.getTestingCommand() + " -F " + Utils.DQuotes(task.getAbsolutePath()),
+                code.getTestingCommand() + " -F " + CommonUtils.DQuotes(task.getAbsolutePath()),
                 target.flags,
                 Constants.out_file,
                 Constants.err_file
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
index caf45430..eda77f32 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforPackage;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
@@ -21,7 +21,7 @@ import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 public class SapforPackage extends TestingPackage<SapforPackage_json> {
-    public int sapforId = Constants.Nan; // так как сапфор на машине.
+    public int sapforId = CommonConstants.Nan; // так как сапфор на машине.
     //--------------
     public SapforPackage() {
     }
@@ -62,7 +62,7 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
     public SapforPackage(Account account, ServerSapfor serverSapfor, Vector<SapforConfiguration> configurations,
                          int neeedsEmail_in,
                          TextLog Log) throws Exception {
-        id = Constants.Nan;
+        id = CommonConstants.Nan;
         sender_name = account.name;
         sender_address = account.email;
         //-
diff --git a/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java b/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
index 570ba960..b534b2c0 100644
--- a/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
+++ b/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
@@ -1,8 +1,8 @@
 package TestingSystem.SAPFOR.SapforSettings;
 import Common.Database.Objects.DBObject;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common.Utils.TextLog;
-import Common_old.Utils.Utils;
 import TestingSystem.Common.Settings.Settings;
 import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -79,7 +79,7 @@ public class SapforSettings extends Settings {
             if (code.isSapforStart()) {
                 if (i > first) {
                     Log.Writeln_("Неверные настройки:" + id + ": проход" +
-                            Utils.Brackets(code.getDescription()) +
+                            CommonUtils.Brackets(code.getDescription()) +
                             " может быть только первым!");
                     res=false;
                 }
@@ -87,14 +87,14 @@ public class SapforSettings extends Settings {
             if (code.isSapforTerminal()) {
                 if (i < last) {
                     Log.Writeln_("Неверные настройки:" + id + ": проход " +
-                            Utils.Brackets(code.getDescription()) +
+                            CommonUtils.Brackets(code.getDescription()) +
                             " может быть только последним!");
                     res= false;
                 }
             }
             if (matches.contains(code)) {
                 Log.Writeln_("Неверные настройки:" + id + ": проход " +
-                        Utils.Brackets(code.getDescription()) +
+                        CommonUtils.Brackets(code.getDescription()) +
                         " запрещено применять более одного раза!");
                 res=false;
             } else matches.add(code);
diff --git a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
index 16a26a95..24d2410b 100644
--- a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
+++ b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforSettingsCommand;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
@@ -7,7 +7,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 import com.sun.org.glassfish.gmbal.Description;
 public class SapforSettingsCommand  extends riDBObject {
     @Description("DEFAULT -1")
-    public int sapforsettings_id = Constants.Nan;
+    public int sapforsettings_id = CommonConstants.Nan;
     public PassCode_2021 passCode = PassCode_2021.SPF_RemoveDvmDirectives;
     @Override
     public boolean isVisible() {
diff --git a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index c37f719e..cbe61dd0 100644
--- a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -1,7 +1,7 @@
 package TestingSystem.SAPFOR.SapforTask;
-import Common_old.Constants;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common.Database.Objects.DBObject;
-import Common_old.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import TestingSystem.SAPFOR.Json.*;
 import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackageTreeNode;
@@ -19,13 +19,13 @@ import java.util.Vector;
 public class SapforTask extends DBObject {
     //------------------------------------>>
     @Expose
-    public long id = Constants.Nan;
+    public long id = CommonConstants.Nan;
     @Expose
     public int set_id = 0;
     @Expose
-    public int sapfor_configuration_id = Constants.Nan;
+    public int sapfor_configuration_id = CommonConstants.Nan;
     @Expose
-    public long sapfortaskspackage_id = Constants.Nan;
+    public long sapfortaskspackage_id = CommonConstants.Nan;
     //------------------------------------->>
     @Expose
     public String test_description = "";
@@ -102,10 +102,10 @@ public class SapforTask extends DBObject {
     public String getVersionsChain() {
         Vector<String> versionsLines = new Vector<>();
         for (int i = 1; i < versions.size(); ++i) {
-            versionsLines.add(Utils.Brackets(versions.get(i).description));
+            versionsLines.add(CommonUtils.Brackets(versions.get(i).description));
         }
         if (!variants.isEmpty()) {
-            versionsLines.add(Utils.Brackets(PassCode_2021.CreateParallelVariants.getDescription()));
+            versionsLines.add(CommonUtils.Brackets(PassCode_2021.CreateParallelVariants.getDescription()));
         }
         return String.join("→", versionsLines);
     }
@@ -167,7 +167,7 @@ public class SapforTask extends DBObject {
     @Override
     public String toString() {
         return
-                "#" + id + " группа " + Utils.Brackets(group_description) + " тест " + Utils.Brackets(test_description) + " параметры " + Utils.Brackets(sapfor_configuration_id);
+                "#" + id + " группа " + CommonUtils.Brackets(group_description) + " тест " + CommonUtils.Brackets(test_description) + " параметры " + CommonUtils.Brackets(sapfor_configuration_id);
         //   getUniqueKey();
     }
     public String getPassesInfo() {
@@ -176,7 +176,7 @@ public class SapforTask extends DBObject {
         Vector<String> strings = new Vector<>();
         for (String code_s : data) {
             PassCode_2021 code = PassCode_2021.valueOf(code_s);
-            strings.add(Utils.Brackets(code.getDescription()));
+            strings.add(CommonUtils.Brackets(code.getDescription()));
         }
         return String.join("→", strings);
     }
@@ -224,9 +224,9 @@ public class SapforTask extends DBObject {
     }
     //-
     public SapforTask(SapforTestingSet_json testingSet, SapforTest_json test, SapforConfiguration_json sapforConfiguration_json) {
-        id = Constants.Nan;
+        id = CommonConstants.Nan;
         set_id = testingSet.id;
-        sapfortaskspackage_id = Constants.Nan;
+        sapfortaskspackage_id = CommonConstants.Nan;
         //-- unique key--
         group_description = test.group_description;
         test_description = test.description;
diff --git a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
index 27078e63..4c2f4400 100644
--- a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -1,4 +1,5 @@
 package TestingSystem.SAPFOR;
+import Common.CommonConstants;
 import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
@@ -225,8 +226,8 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         getServerSapforForCompilation();
         if (sapfor != null) {
             //---
-            max_version = Constants.Nan;
-            current_version = Constants.Nan;
+            max_version = CommonConstants.Nan;
+            current_version = CommonConstants.Nan;
             //--
             SyncronizeRepository();
             max_version = (int) ServerCommand(ServerCode.GetMaxSapforVersion);
@@ -271,7 +272,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         }
     }
     void EmailSapforAssembly(int version, boolean done, File out, File err) throws Exception {
-        String version_s = (version == Constants.Nan) ? "?" : String.valueOf(version);
+        String version_s = (version == CommonConstants.Nan) ? "?" : String.valueOf(version);
         String status = done ? "Успешно" : "С ошибками";
         //-
         EmailMessage message = new EmailMessage(
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
index ad1271e1..a2e0aca3 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
@@ -1,7 +1,7 @@
 package TestingSystem.SAPFOR.ServerSapfor;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import ProjectData.LanguageName;
 import com.sun.org.glassfish.gmbal.Description;
 
@@ -45,6 +45,6 @@ public class ServerSapfor extends riDBObject {
         return call_command;
     }
     public String getVersionCommand() {
-        return Utils.DQuotes(call_command) + " " + version_command;
+        return CommonUtils.DQuotes(call_command) + " " + version_command;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/AddBugReport.java b/src/Visual_DVM_2021/Passes/All/AddBugReport.java
index 0344b95f..5d09d2af 100644
--- a/src/Visual_DVM_2021/Passes/All/AddBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/AddBugReport.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Database;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import GlobalData.Account.AccountRole;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
@@ -85,7 +85,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
     }
     @Override
     protected boolean validate() {
-        double size = Utils.getFileSizeMegaBytes(BugReportInterface.getArchiveFile(target));
+        double size = CommonUtils.getFileSizeMegaBytes(BugReportInterface.getArchiveFile(target));
         if (size > 100) {
             Log.Writeln_("Размер запакованного вложения " + size + " Мб превышает 100 Мб");
             return false;
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java b/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
index 4cd82e2d..45c0b6c5 100644
--- a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
+++ b/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
 import Common_old.Utils.Utils;
 import GlobalData.DVMParameter.DVMParameter;
@@ -19,9 +20,9 @@ public class AddDVMParameterForTesting extends Pass_2021<String> {
                     if (name.isEmpty())
                         Log.Writeln("Имя параметра DVM системы не может быть пустым.");
                     if (Utils.isLinuxSystemCommand(name))
-                        Log.Writeln(Utils.DQuotes(name) + " является системной командой Linux");
+                        Log.Writeln(CommonUtils.DQuotes(name) + " является системной командой Linux");
                     if (Utils.isLinuxSystemCommand(value))
-                        Log.Writeln(Utils.DQuotes(value) + " является системной командой Linux");
+                        Log.Writeln(CommonUtils.DQuotes(value) + " является системной командой Linux");
                 }
                 @Override
                 public void ProcessResult() {
diff --git a/src/Visual_DVM_2021/Passes/All/AddFile.java b/src/Visual_DVM_2021/Passes/All/AddFile.java
index eff0706d..42c63e8d 100644
--- a/src/Visual_DVM_2021/Passes/All/AddFile.java
+++ b/src/Visual_DVM_2021/Passes/All/AddFile.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import Common_old.UI.UI;
@@ -24,12 +25,12 @@ public class AddFile extends ChangeFilePass<DBProjectFile> {
             src = (File) args[0];
             mode = Mode.Import;
             fileName = src.getName();
-            if (Utils.ContainsCyrillic(fileName)) {
-                Log.Writeln_("Имя файла " + Utils.Brackets(fileName) + " содержит кириллицу.");
+            if (CommonUtils.ContainsCyrillic(fileName)) {
+                Log.Writeln_("Имя файла " + CommonUtils.Brackets(fileName) + " содержит кириллицу.");
                 return false;
             }
             if (Utils.ContainsForbiddenName(fileName)) {
-                Log.Writeln_("Имя файла " + Utils.Brackets(fileName)
+                Log.Writeln_("Имя файла " + CommonUtils.Brackets(fileName)
                         + " содержит запрещенные символы." +
                         "\n" + Constants.all_forbidden_characters_string);
                 return false;
@@ -46,12 +47,12 @@ public class AddFile extends ChangeFilePass<DBProjectFile> {
             //->
             dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();
             if (dst.exists()) {
-                Log.Writeln_("Файл с именем " + Utils.Brackets(fileName) + " уже существует");
+                Log.Writeln_("Файл с именем " + CommonUtils.Brackets(fileName) + " уже существует");
                 return false;
             }
             target = new DBProjectFile(dst, project);
             if (target.fileType.equals(FileType.forbidden)) {
-                Log.Writeln_("Расширение " + Utils.Brackets(Utils.getExtension(dst)) + " недопустимо");
+                Log.Writeln_("Расширение " + CommonUtils.Brackets(CommonUtils.getExtension(dst)) + " недопустимо");
                 return false;
             }
             return true;
diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java b/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
index ccd1e118..56583420 100644
--- a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
+++ b/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -49,7 +50,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
         Command(new ServerExchangeUnit_2021(ServerCode.GetObjectCopyByPK, "", new Pair<>(BugReport.class, target.id)));
         target.SynchronizeFields((BugReport) response.object);
         oldValue = (String) BugReport.class.getField(fieldName).get(target);
-        newValue = oldValue + "\n" + Utils.Brackets(Utils.print_date(
+        newValue = oldValue + "\n" + CommonUtils.Brackets(Utils.print_date(
                 new Date())) + " " + Current.getAccount().name
                 + " : " + addition;
         //2. дописываем нужное поле.
@@ -84,7 +85,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
         }
         passes.get(PassCode_2021.Email).Do(
                 new EmailMessage(
-                        message_header + " " + Utils.Brackets(Current.getAccount().name),
+                        message_header + " " + CommonUtils.Brackets(Current.getAccount().name),
                         message_text,
                         BugReportInterface.getRecipients(target)
                 )
diff --git a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java b/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
index 7687dc9e..07e7002c 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.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
-import Common_old.Utils.Utils;
 import ProjectData.SapforData.Functions.FuncInfo;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
@@ -31,7 +31,7 @@ public class ApplyCurrentFunction extends Pass_2021 {
                     Current.set(Current.Function, fi);
                     return true;
                 } else {
-                    Log.Writeln_("Проект не содержит процедуры с именем " + Utils.Brackets(func_name));
+                    Log.Writeln_("Проект не содержит процедуры с именем " + CommonUtils.Brackets(func_name));
                 }
             }
         }
diff --git a/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java b/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
index ac2ef1af..cc5a850f 100644
--- a/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
+++ b/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import GlobalData.Machine.Machine;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.User.User;
@@ -22,7 +22,7 @@ public class ArchivesBackupPass extends ConnectionPass<File> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        String workspace_path = Utils.toU(Paths.get(user.connection.sftpChannel.getHome(), Global.properties.BackupWorkspace).toString());
+        String workspace_path = CommonUtils.toU(Paths.get(user.connection.sftpChannel.getHome(), Global.properties.BackupWorkspace).toString());
         RemoteFile workspace = new RemoteFile(workspace_path, true);
         user.connection.MKDIR(workspace);
         RemoteFile dst = new RemoteFile(workspace.full_name, src.getName());
diff --git a/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java b/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
index 8cf8e3a8..6d461696 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Constants;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Database;
 import _VisualDVM.Global;
@@ -45,7 +46,7 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
     }
     protected void createTarget() {
         target = new DVMPackage();
-        target.id = Constants.Nan;
+        target.id = CommonConstants.Nan;
         //-
         target.sender_name = Current.getAccount().name;
         target.sender_address = Current.getAccount().email;
@@ -167,7 +168,7 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
         src_jsons = new Vector<>();
         for (DVMPackage src : srcPackages) {
             if (src.state.equals(TasksPackageState.Draft)) {
-                Log.Writeln_("Пакет " + Utils.Brackets(src.id) + " является черновиком.");
+                Log.Writeln_("Пакет " + CommonUtils.Brackets(src.id) + " является черновиком.");
                 return false;
             }
             src_ids.add(src.id);
diff --git a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
index 9618ae55..bede669b 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
@@ -1,10 +1,10 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Constants;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Database.Database;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Common.TasksPackageState;
@@ -105,7 +105,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
         Vector<SapforPackage_json> src_jsons = new Vector<>();
         for (SapforPackage src : srcPackages) {
             if (src.state.equals(TasksPackageState.Draft)) {
-                Log.Writeln_("Пакет " + Utils.Brackets(src.id) + " является черновиком.");
+                Log.Writeln_("Пакет " + CommonUtils.Brackets(src.id) + " является черновиком.");
                 return false;
             }
             src_ids.add(src.id);
@@ -128,7 +128,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
         inexistingConfigurations = new Vector<>();
         //--
         target = new SapforPackage();
-        target.id = Constants.Nan;
+        target.id = CommonConstants.Nan;
         //-
         target.sender_name = Current.getAccount().name;
         target.sender_address = Current.getAccount().email;
diff --git a/src/Visual_DVM_2021/Passes/All/CombineFiles.java b/src/Visual_DVM_2021/Passes/All/CombineFiles.java
index fbfe812b..46d40c30 100644
--- a/src/Visual_DVM_2021/Passes/All/CombineFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CombineFiles.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
 import Common_old.Utils.Utils;
@@ -46,7 +47,7 @@ public class CombineFiles extends Transformation {
     @Override
     protected void body() throws Exception {
         result = Paths.get(target.last_version.Home.getAbsolutePath(),
-                Global.isWindows ? fd.Result : Utils.toU(fd.Result)).toFile();
+                Global.isWindows ? fd.Result : CommonUtils.toU(fd.Result)).toFile();
         //-----------------------
         //получить список хедеров.
         //-----------------------
@@ -55,13 +56,13 @@ public class CombineFiles extends Transformation {
         //-----------------------------
         result_lines.add("!-Found " + target.allIncludes.size() + " headers");
         for (String name : target.allIncludes.keySet()) {
-            all_includes.add("      include " + Utils.Quotes(Utils.toU(name)));
-            result_lines.add("!      include " + Utils.Quotes(Utils.toU(name)));
+            all_includes.add("      include " + CommonUtils.Quotes(CommonUtils.toU(name)));
+            result_lines.add("!      include " + CommonUtils.Quotes(CommonUtils.toU(name)));
         }
         result_lines.add("!-Collapse-" + target.files_order.size() + " files");
         int i = 1;
         for (String name : target.files_order) {
-            result_lines.add("! -- " + i + ". " + Utils.Brackets(name));
+            result_lines.add("! -- " + i + ". " + CommonUtils.Brackets(name));
             ++i;
         }
         result_lines.add("!--------------------");
@@ -75,8 +76,8 @@ public class CombineFiles extends Transformation {
                     String header = Utils.extractHeaderName(line);
                     if (header != null) {
                         if (file.relativeHeaders.containsKey(header))
-                            result_lines.add("      include " + Utils.Quotes(
-                                    Utils.toU(
+                            result_lines.add("      include " + CommonUtils.Quotes(
+                                    CommonUtils.toU(
                                     file.relativeHeaders.get(header).name)));
                     } else
                         result_lines.add(line);
diff --git a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
index f594bc1d..6ed01e92 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -25,8 +25,8 @@ public class CompareDVMRunTasks extends Pass_2021<Vector<DVMRunTask>> {
         //--
         target = Global.testingServer.db.dvmRunTasks.getCheckedItems();
         if (target.size() == 2) {
-            if (UI.Question("Назначить задачу " + Utils.Brackets(target.get(0).getPK()) + " эталоном" +
-                    "\n(в случае отказа, будет назначена задача " + Utils.Brackets(target.get(1).getPK()) + ")")) {
+            if (UI.Question("Назначить задачу " + CommonUtils.Brackets(target.get(0).getPK()) + " эталоном" +
+                    "\n(в случае отказа, будет назначена задача " + CommonUtils.Brackets(target.get(1).getPK()) + ")")) {
                 master = target.get(0);
                 slave = target.get(1);
             } else {
@@ -37,11 +37,11 @@ public class CompareDVMRunTasks extends Pass_2021<Vector<DVMRunTask>> {
         } else if (target.size() == 1) {
             master = target.get(0);
             slave = null;
-            return UI.Question("Отобразить задачу " + Utils.Brackets(master.getPK()));
+            return UI.Question("Отобразить задачу " + CommonUtils.Brackets(master.getPK()));
         } else if ((target.size() == 0) && (Current.HasDVMRunTask())) {
             master = Current.getDVMRunTask();
             slave = null;
-            return UI.Question("Отобразить задачу " + Utils.Brackets(master.getPK()));
+            return UI.Question("Отобразить задачу " + CommonUtils.Brackets(master.getPK()));
         } else {
             Log.Writeln_("Для сравнения требуется отметить две задачи.\nДля отображения требуется отметить одну задачу,или выделить её.");
             return false;
diff --git a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
index a447a02f..cb84f7b1 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -25,8 +25,8 @@ public class CompareSapforPackages extends Pass_2021<Vector<SapforPackage>> {
         //--
         target = Global.testingServer.db.sapforPackages.getCheckedItems();
         if (target.size() == 2) {
-            if (UI.Question("Назначить пакет " + Utils.Brackets(target.get(0).getPK()) + " эталоном" +
-                    "\n(в случае отказа, будет назначен пакет " + Utils.Brackets(target.get(1).getPK()) + ")")) {
+            if (UI.Question("Назначить пакет " + CommonUtils.Brackets(target.get(0).getPK()) + " эталоном" +
+                    "\n(в случае отказа, будет назначен пакет " + CommonUtils.Brackets(target.get(1).getPK()) + ")")) {
                 master = target.get(0);
                 slave = target.get(1);
             } else {
@@ -37,11 +37,11 @@ public class CompareSapforPackages extends Pass_2021<Vector<SapforPackage>> {
         } else if (target.size() == 1) {
             master = target.get(0);
             slave = null;
-            return UI.Question("Отобразить пакет " + Utils.Brackets(master.getPK()));
+            return UI.Question("Отобразить пакет " + CommonUtils.Brackets(master.getPK()));
         } else if ((target.size() == 0) && (Current.HasSapforPackage())) {
             master = Current.getSapforPackage();
             slave = null;
-            return UI.Question("Отобразить пакет " + Utils.Brackets(master.getPK()));
+            return UI.Question("Отобразить пакет " + CommonUtils.Brackets(master.getPK()));
         } else {
             Log.Writeln_("Для сравнения требуется отметить два пакета.\nДля отображения требуется отметить один пакет,или выделить его");
             return false;
diff --git a/src/Visual_DVM_2021/Passes/All/Compile.java b/src/Visual_DVM_2021/Passes/All/Compile.java
index 2fcecd09..5524f04b 100644
--- a/src/Visual_DVM_2021/Passes/All/Compile.java
+++ b/src/Visual_DVM_2021/Passes/All/Compile.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -33,7 +34,7 @@ public class Compile extends Pass_2021<db_project_info> {
             subpass = null;
             compilationTask = null;
             if (Current.getUser().state != UserState.ready_to_work)
-                Log.Writeln_("Пользователь " + Utils.Brackets(Current.getUser().login) +
+                Log.Writeln_("Пользователь " + CommonUtils.Brackets(Current.getUser().login) +
                         " не проинициализирован\nПерейдите на вкладку 'Настройки компиляции и запуска',\n" +
                         " и выполните команду 'Инициализация пользователя'\n");
             Current.getMakefile().Validate(Log);
@@ -71,7 +72,7 @@ public class Compile extends Pass_2021<db_project_info> {
                 break;
             case Undefined:
             case MVS_cluster:
-                throw new PassException("Компиляция не реализована для типа машины " + Utils.DQuotes(Current.getMachine().type));
+                throw new PassException("Компиляция не реализована для типа машины " + CommonUtils.DQuotes(Current.getMachine().type));
             default:
                 subpass = passes.get(PassCode_2021.RemoteCompilation);
                 break;
diff --git a/src/Visual_DVM_2021/Passes/All/CopyProject.java b/src/Visual_DVM_2021/Passes/All/CopyProject.java
index ace4972d..29dc7bc7 100644
--- a/src/Visual_DVM_2021/Passes/All/CopyProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CopyProject.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.Dialog;
@@ -33,7 +34,7 @@ public class CopyProject extends CurrentProjectPass {
                 public void validateFields() {
                     Utils.validateFileShortNewName(fields.tfName.getText(), Log);
                     if (!fields.tfParent.getText().isEmpty()) {
-                        if (Utils.ContainsCyrillic(fields.tfParent.getText()))
+                        if (CommonUtils.ContainsCyrillic(fields.tfParent.getText()))
                             Log.Writeln_("Путь к целевой папке не может содержать кириллицу!");
                     } else Log.Writeln_("Путь к целевой папке не может быть пустым!");
                     if (Log.isEmpty()) {
diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
index d6a018d5..47d82e5b 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.Text.FileNameForm;
-import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.ChangeFilePass;
 import Visual_DVM_2021.Passes.PassException;
 
@@ -22,11 +22,11 @@ public class CreateEmptyDirectory extends ChangeFilePass {
             //->
             dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();
             if (dst.exists()) {
-                Log.Writeln("Файл с именем " + Utils.Brackets(fileName) + " уже существует");
+                Log.Writeln("Файл с именем " + CommonUtils.Brackets(fileName) + " уже существует");
                 return false;
             }
             if (fileName.equalsIgnoreCase(Constants.data)) {
-                Log.Writeln(Utils.Brackets(Constants.data) + " является зарезервированным именем!");
+                Log.Writeln(CommonUtils.Brackets(Constants.data) + " является зарезервированным именем!");
                 return false;
             }
             return true;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java b/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
index 6e318a7b..11ce3695 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import _VisualDVM.Global;
 import Common_old.UI.Windows.Dialog.Text.FileNameForm;
-import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Pass_2021;
@@ -28,7 +28,7 @@ public class CreateEmptyProject extends Pass_2021<File> {
             project_name = ff.Result;
             target = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), project_name).toFile();
             if (target.exists())
-                Log.Writeln("Файл\n" + Utils.Brackets(target.getAbsolutePath()) + "\nуже существует");
+                Log.Writeln("Файл\n" + CommonUtils.Brackets(target.getAbsolutePath()) + "\nуже существует");
             return Log.isEmpty();
         }
         return false;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
index a8d5eb63..976778f1 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import Common_old.Utils.Files.VDirectoryChooser;
@@ -34,15 +35,15 @@ public class CreateGroupFromDirectory extends PublishTests {
         }
         //---------------
         if (!dir.isDirectory()) {
-            Log.Writeln_(Utils.Brackets(dir) + "\nне является папкой!");
+            Log.Writeln_(CommonUtils.Brackets(dir) + "\nне является папкой!");
             return false;
         }
         if (dir.getName().equals(Constants.data)) {
-            Log.Writeln_(Utils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
+            Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
             return false;
         }
         if (!Utils.validateProjectFile(dir, Log)) {
-            Log.Writeln_("Имя папки " + Utils.Brackets(dir.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
+            Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
             return false;
         }
         //--
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
index 907cc744..5ea1f53a 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import Common_old.Utils.Files.VFileChooser;
@@ -34,11 +35,11 @@ public class CreateGroupFromFiles extends PublishTests{
         Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
         //---------------
         if (dir.getName().equals(Constants.data)) {
-            Log.Writeln_(Utils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
+            Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
             return false;
         }
         if (!Utils.validateProjectFile(dir, Log)) {
-            Log.Writeln_("Имя папки " + Utils.Brackets(dir.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
+            Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
             return false;
         }
         if (passes.get(PassCode_2021.PublishGroup).Do(dir.getName().toUpperCase())) {
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
index 7f02ebbc..aa1a87b0 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import Common_old.Utils.Files.VDirectoryChooser;
@@ -89,17 +90,17 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
         int other_project_files = 0;
         //---
         if (dir.getName().equalsIgnoreCase(Constants.data)) {
-            Log.Writeln_("Папка " + Utils.Brackets(dir) + " является служебной папкой визуализатора.");
+            Log.Writeln_("Папка " + CommonUtils.Brackets(dir) + " является служебной папкой визуализатора.");
             return false;
         }
         //--
-        if (Utils.ContainsCyrillic(dir.getName()) || Utils.ContainsForbiddenName(dir.getName())) {
-            Log.Writeln_("Имя папки " + Utils.Brackets(dir.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
+        if (CommonUtils.ContainsCyrillic(dir.getName()) || Utils.ContainsForbiddenName(dir.getName())) {
+            Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
             return false;
         }
         //--
         if (files == null) {
-            Log.Writeln_("Не удалось получить список файлов для папки " + Utils.Brackets(dir) + ".");
+            Log.Writeln_("Не удалось получить список файлов для папки " + CommonUtils.Brackets(dir) + ".");
             return false;
         }
         //---
@@ -113,7 +114,7 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
                         !Utils.isVersion(file)) {
                     subdirs++;
                 }
-            } else if (file.isFile() && !Utils.ContainsCyrillic(file.getName()) && !Utils.ContainsForbiddenName(file.getName())) {
+            } else if (file.isFile() && !CommonUtils.ContainsCyrillic(file.getName()) && !Utils.ContainsForbiddenName(file.getName())) {
                 //если файл. все недопустимые файлы просто игнорируются.
                 ProjectFile projectFile = new ProjectFile(file);
                 if (isNotExcluded(projectFile)) {
@@ -142,7 +143,7 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
         }
         //--
         if (subdirs > 0) {
-            Log.Writeln_("Папка " + Utils.Brackets(dir) + " содержит вложенные подпапки,\n" +
+            Log.Writeln_("Папка " + CommonUtils.Brackets(dir) + " содержит вложенные подпапки,\n" +
                     "не являющиеся версиями или данными визуализатора");
             return false;
         }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
index ef7fb4d6..65ec2f66 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import Common_old.Utils.Utils;
@@ -36,14 +37,14 @@ public class CreateTestFromFile extends Pass_2021<Test> {
         File file_in = (File) args[0];
         group = (Group) args[1];
         //--
-        if (Utils.ContainsCyrillic(file_in.getName()) || Utils.ContainsForbiddenName(file_in.getName())) {
-            Log.Writeln_("Имя файла " + Utils.Brackets(file_in.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
+        if (CommonUtils.ContainsCyrillic(file_in.getName()) || Utils.ContainsForbiddenName(file_in.getName())) {
+            Log.Writeln_("Имя файла " + CommonUtils.Brackets(file_in.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
             return false;
         }
         //--
         projectFile = new ProjectFile(file_in);
         if (!projectFile.fileType.equals(FileType.program) || !projectFile.languageName.equals(group.language)) {
-            Log.Writeln_("Не удалось распознать файл " +Utils.Brackets(file_in.getName()) +
+            Log.Writeln_("Не удалось распознать файл " + CommonUtils.Brackets(file_in.getName()) +
                     " как программу на языке " + group.language.getDescription());
             return false;
         }
@@ -52,7 +53,7 @@ public class CreateTestFromFile extends Pass_2021<Test> {
         target.sender_address = Current.getAccount().email;
         target.sender_name = Current.getAccount().name;
         target.group_id = group.id;
-        target.description = Utils.getNameWithoutExtension(file_in.getName());
+        target.description = CommonUtils.getNameWithoutExtension(file_in.getName());
         target.files = file_in.getName();
         return true;
     }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
index 2376fc00..6b2d21ff 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.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 Common_old.Utils.Utils;
 import ProjectData.Project.db_project_info;
 import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -45,7 +45,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
             return false;
         }
         //---
-        return UI.Question("В группу " + Utils.Brackets(group.description) +
+        return UI.Question("В группу " + CommonUtils.Brackets(group.description) +
                 "\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
index 03be0fc6..04cd301d 100644
--- a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.PassMenuItem;
@@ -47,10 +48,10 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
                 return false;
             }
             for (DBProjectFile program : programsToConvert) {
-                if (Utils.getFileSizeMegaBytes(program.file) > 1) {
-                    Log.Writeln_("Размер файла кода " + Utils.Brackets(program.name) + " превышает 1 Мб.");
+                if (CommonUtils.getFileSizeMegaBytes(program.file) > 1) {
+                    Log.Writeln_("Размер файла кода " + CommonUtils.Brackets(program.name) + " превышает 1 Мб.");
                     return false;
-                } else programsNames.add(Utils.toU(program.name));
+                } else programsNames.add(CommonUtils.toU(program.name));
             }
             workspace = Utils.getTempFileName("convertation");
             FileUtils.forceMkdir(workspace);
@@ -63,7 +64,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
                 return false;
             }
             ;
-            if (Utils.getFileSizeMegaBytes(archive) > 500) {
+            if (CommonUtils.getFileSizeMegaBytes(archive) > 500) {
                 Log.Writeln_("Размер архива проекта превышает 500 МБ");
                 return false;
             }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java b/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
index 225878e7..e7817dba 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -25,7 +26,7 @@ public class DeleteDirectory extends ChangeFilePass {
                 Log.Writeln("Нельзя удалять домашнюю папку проекта.");
                 return false;
             }
-            return (UI.Warning("Удалить папку\n" + Utils.Brackets(target_dir.getAbsolutePath())
+            return (UI.Warning("Удалить папку\n" + CommonUtils.Brackets(target_dir.getAbsolutePath())
                     + "\n и всё её содержимое."));
         } else Log.Writeln_("Папка не выделена.");
         return false;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteFile.java b/src/Visual_DVM_2021/Passes/All/DeleteFile.java
index c8608321..6122b833 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteFile.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteFile.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -15,7 +16,7 @@ public class DeleteFile extends ChangeFilePass<DBProjectFile> {
         resetArgs();
         return (Current.Check(Log, Current.SelectedFile)) &&
                 UI.Warning("Удалить файл "
-                        + Utils.Brackets((target = Current.getSelectedFile()).name));
+                        + CommonUtils.Brackets((target = Current.getSelectedFile()).name));
     }
     @Override
     protected void performPreparation() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java b/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
index 16e20e43..654505b1 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -22,7 +23,7 @@ public class DeleteVersion extends Pass_2021<db_project_info> {
             if (((target = Current.getVersion()) != null) && (!Current.hasUI() ||
                     UI.Warning("Удалить " +
                             ((Current.HasProject() && target.Home.equals(Current.getProject().Home)) ? "текущий проект" : "версию ")
-                            + Utils.Brackets(target.name)))) {
+                            + CommonUtils.Brackets(target.name)))) {
                 current = true;
                 return true;
             }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadProject.java b/src/Visual_DVM_2021/Passes/All/DownloadProject.java
index 60b0d4b3..f5b77386 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadProject.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -26,8 +27,8 @@ public class DownloadProject extends CurrentConnectionPass {
             if ((user.connection.getFileKBSize(src.full_name)) <= maxSize) {
                 ShowMessage2("Запаковка папки проекта..");
                 user.connection.Command(
-                        "cd " + Utils.DQuotes(src.full_name),
-                        "zip -r " + Utils.DQuotes(remote_archive.full_name) + " ./"
+                        "cd " + CommonUtils.DQuotes(src.full_name),
+                        "zip -r " + CommonUtils.DQuotes(remote_archive.full_name) + " ./"
                 );
                 //  try {
                 ShowMessage2("Загрузка проекта..");
@@ -52,7 +53,7 @@ public class DownloadProject extends CurrentConnectionPass {
         File project = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
                 Utils.getDateName(src.name)).toFile();
         if (passes.get(PassCode_2021.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) {
-            if (UI.Question("Проект " + Utils.Brackets(src.name) + " успешно загружен. Открыть его"))
+            if (UI.Question("Проект " + CommonUtils.Brackets(src.name) + " успешно загружен. Открыть его"))
                 passes.get(PassCode_2021.OpenCurrentProject).Do(project);
         }
     }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTest.java b/src/Visual_DVM_2021/Passes/All/DownloadTest.java
index a09318f7..f7b62997 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadTest.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadTest.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -49,7 +50,7 @@ public class DownloadTest extends TestingSystemPass<Test> {
                 Global.visualiser.getWorkspace().getAbsolutePath(), false
         ))
             if (UI.Question("Тестовый проект успешно загружен под именем\n" +
-                    Utils.Brackets(target.getHomePath().getName()) +
+                    CommonUtils.Brackets(target.getHomePath().getName()) +
                     "\nОткрыть его"))
                 passes.get(PassCode_2021.OpenCurrentProject).Do(target.getHomePath());
     }
diff --git a/src/Visual_DVM_2021/Passes/All/EditAccount.java b/src/Visual_DVM_2021/Passes/All/EditAccount.java
index 967ac5dd..387be464 100644
--- a/src/Visual_DVM_2021/Passes/All/EditAccount.java
+++ b/src/Visual_DVM_2021/Passes/All/EditAccount.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -33,7 +34,7 @@ public class EditAccount extends Email {
             Vector<String> rec = new Vector<>();
             rec.add(email);
             password = String.valueOf(getRandomIntegerBetweenRange(1111, 9999));
-            return super.canStart(new EmailMessage("Код подтверждения визуализатора для: " + Utils.Brackets(name), password, rec));
+            return super.canStart(new EmailMessage("Код подтверждения визуализатора для: " + CommonUtils.Brackets(name), password, rec));
         }
         return false;
     }
diff --git a/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java b/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
index 8e426c05..44f43dcc 100644
--- a/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
+++ b/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.Transformation;
 import org.apache.commons.io.FileUtils;
@@ -14,10 +14,10 @@ public class EraseBadSymbols extends Transformation {
             String file_text = FileUtils.readFileToString(file.file);
             StringBuilder res_text = new StringBuilder();
             for (char c : file_text.toCharArray()) {
-                if (Utils.isEnglishLetter(c) || Character.isDigit(c) || Utils.isSign(c)) {
+                if (CommonUtils.isEnglishLetter(c) || Character.isDigit(c) || CommonUtils.isSign(c)) {
                     res_text.append(c);
-                } else if (Utils.isRussianLetter(c))
-                    res_text.append(Utils.Translit(c));
+                } else if (CommonUtils.isRussianLetter(c))
+                    res_text.append(CommonUtils.Translit(c));
                 else res_text.append(' ');
             }
             File dst = Paths.get(target.last_version.Home.getAbsolutePath(), Global.isWindows ? file.name : file.name.replace('\\', '/')).toFile();
diff --git a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
index 4ae5a4f7..3faba53c 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
@@ -249,7 +250,7 @@ public class ExportDVMPackageToExcel extends Pass_2021<Vector<DVMPackage>> {
         return res;
     }
     String formatMatrix(String matrix) {
-        return Utils.DQuotes(matrix.trim());
+        return CommonUtils.DQuotes(matrix.trim());
     }
     void createStyles() {
         styles = new Vector<>();
@@ -396,7 +397,7 @@ public class ExportDVMPackageToExcel extends Pass_2021<Vector<DVMPackage>> {
     protected void performDone() throws Exception {
         super.performDone();
         if (Desktop.isDesktopSupported()) {
-            if (UI.Question("Таблица сформирована в файле\n" + Utils.DQuotes(res.getAbsolutePath()) + ".\nОткрыть её"
+            if (UI.Question("Таблица сформирована в файле\n" + CommonUtils.DQuotes(res.getAbsolutePath()) + ".\nОткрыть её"
             )) {
                 Desktop.getDesktop().open(res);
             }
diff --git a/src/Visual_DVM_2021/Passes/All/GCOV.java b/src/Visual_DVM_2021/Passes/All/GCOV.java
index 2ee39e8e..5a6caee9 100644
--- a/src/Visual_DVM_2021/Passes/All/GCOV.java
+++ b/src/Visual_DVM_2021/Passes/All/GCOV.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
@@ -82,10 +83,10 @@ public class GCOV extends Precompilation {
             Utils.forceDeleteWithCheck(gcov);
             name_to_kill = "gcov.exe";
             StartProcess("gcov -b " +
-                    Utils.DQuotes(
+                    CommonUtils.DQuotes(
                             Paths.get(workspace.getAbsolutePath(), uname))
                     + "  -o " +
-                    Utils.DQuotes(
+                    CommonUtils.DQuotes(
                             Paths.get(workspace.getAbsolutePath(), gcno)
                     ), 40);
             if (gcov.exists()) {
diff --git a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
index e2dd9417..703dafec 100644
--- a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
@@ -36,12 +37,12 @@ public class LocalInitaliseUser extends ProcessPass<User> {
             //-
             PerformScript(
                     String.join("\n",
-                            "cd " + Utils.DQuotes(target.getLocalModulesDir()),
+                            "cd " + CommonUtils.DQuotes(target.getLocalModulesDir()),
                             "g++ starter -o starter",
                             "chmod 0777 starter"
                     ));
             PerformScript(String.join("\n",
-                    "cd " + Utils.DQuotes(target.getLocalModulesDir()),
+                    "cd " + CommonUtils.DQuotes(target.getLocalModulesDir()),
                     "g++ launcher.cpp  -o launcher",
                     "chmod 0777 launcher"
             ));
diff --git a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java b/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
index 80f62fda..6feba750 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.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -29,8 +29,8 @@ public class OpenBugReportTestProject extends Pass_2021<BugReport> {
                 root = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
                         target.id).toFile();
                 project = Paths.get(root.getAbsolutePath(),
-                        Global.isWindows ? Utils.toW(target.project_version)
-                                : Utils.toU(target.project_version)).toFile();
+                        Global.isWindows ? CommonUtils.toW(target.project_version)
+                                : CommonUtils.toU(target.project_version)).toFile();
                 return true;
             }else {
                 Log.Writeln_("Отчёт об ошибке не содержит прикреплённого проекта!");
diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
index 9c6277b7..cb51c228 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
@@ -53,18 +54,18 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
                 mode = Mode.ProjectInfo;
                 target = (db_project_info) arg;
                 dir = target.Home;
-                Global.Log.Print(DebugPrintLevel.Project, "готовая версия " + Utils.Brackets(dir.getAbsolutePath()));
+                Global.Log.Print(DebugPrintLevel.Project, "готовая версия " + CommonUtils.Brackets(dir.getAbsolutePath()));
                 return needsOpen();
             }
         }
         if ((dir != null) && needsOpen()) {
-            Global.Log.Print(DebugPrintLevel.Project, Utils.Brackets(dir.toString()));
+            Global.Log.Print(DebugPrintLevel.Project, CommonUtils.Brackets(dir.toString()));
             if (!dir.isDirectory()) {
-                Log.Writeln_(Utils.Brackets(dir) + "\nне является папкой!");
+                Log.Writeln_(CommonUtils.Brackets(dir) + "\nне является папкой!");
                 return false;
             }
             if (dir.getName().equals(Constants.data)) {
-                Log.Writeln_(Utils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
+                Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
                 return false;
             }
             return Utils.validateProjectFolder(dir, Log) && Utils.containsSource(dir, true);
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
index 049d4ec0..82bb9a47 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
+++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Windows.Dialog.Dialog;
@@ -29,7 +29,7 @@ public class PickCompilerEnvironments extends Pass_2021<String> {
     protected boolean canStart(Object... args) throws Exception {
         if (Current.Check(Log, Current.RunConfiguration)) {
             RunConfiguration configuration = Current.getRunConfiguration();
-            if (configuration.compiler_id == Constants.Nan) {
+            if (configuration.compiler_id == CommonConstants.Nan) {
                 Log.Writeln_("Отсутвует DVM компилятор, связанный с текущей конфигурацией запуска.\n" +
                         "Если конфигурация содержит вызов DVM компилятора, но была создана на версии 801 и ниже,\n" +
                         "войдите в окно её редактирования,нажмите ОК, а затем повторите попытку.");
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
index b5bdb52f..3e9c8b23 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
+++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.Windows.Dialog.Dialog;
-import Common_old.Utils.Utils;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
@@ -54,7 +54,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass_2021<String> {
         Vector<String> envs = new Vector<>();
         for (CompilerEnvironment compilerEnv : compiler.environments.Data.values()) {
             if (compilerEnv.isSelected())
-                envs.add(compilerEnv.name + "=" + Utils.DQuotes(compilerEnv.value));
+                envs.add(compilerEnv.name + "=" + CommonUtils.DQuotes(compilerEnv.value));
         }
         target = String.join(" ", envs);
     }
diff --git a/src/Visual_DVM_2021/Passes/All/Precompilation.java b/src/Visual_DVM_2021/Passes/All/Precompilation.java
index bb2ad10a..3392fffe 100644
--- a/src/Visual_DVM_2021/Passes/All/Precompilation.java
+++ b/src/Visual_DVM_2021/Passes/All/Precompilation.java
@@ -1,4 +1,6 @@
 package Visual_DVM_2021.Passes.All;
+import Common.CommonConstants;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
@@ -89,7 +91,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
         prepareForParse();           //---->
         //-
         performanceTime = 0;
-        exitCode = Constants.Nan;
+        exitCode = CommonConstants.Nan;
         //------------------
         workspace = Paths.get(Global.TempDirectory.getAbsolutePath(), Utils.getDateName("precompilation")).toFile();
         FileUtils.forceMkdir(workspace);
@@ -138,8 +140,8 @@ public class Precompilation extends Pass_2021<db_project_info> {
     protected static void unpackPrecompilationMessages(db_project_info target, String text) throws Exception {
         boolean messageStarted = false;
         String messageFile = "";
-        int messageLine = Constants.Nan;
-        int messageType = Constants.Nan;
+        int messageLine = CommonConstants.Nan;
+        int messageType = CommonConstants.Nan;
         Vector<String> messageText = new Vector<>();
         String[] nw = text.split("\n");
         for (String S : nw) {
@@ -155,7 +157,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
                     messageText.add(S.substring(6));
                     messageType = 2;
                 }
-                if (messageType != Constants.Nan) {
+                if (messageType != CommonConstants.Nan) {
                     target.db.files.Data.get(messageFile).CreateAndAddNewMessage(messageType, String.join("\n", messageText), messageLine, Constants.compiler_group);
                     messageStarted = false;
                 } else {
@@ -165,12 +167,12 @@ public class Precompilation extends Pass_2021<db_project_info> {
             } else {
                 //анализ начала строки.
                 for (String name : target.db.files.Data.keySet()) {
-                    if (S.startsWith(Utils.toU(name))) {
+                    if (S.startsWith(CommonUtils.toU(name))) {
                         String[] data = S.split(":");
                         if (data.length > 1) {
                             messageFile = name;
                             messageLine = Integer.parseInt(data[1]);
-                            messageType = Constants.Nan;
+                            messageType = CommonConstants.Nan;
                             messageText = new Vector<>();
                             messageStarted = true;
                         }
@@ -184,7 +186,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
     protected void body() throws Exception {
         if (Global.isWindows) {
             name_to_kill = "make.exe";
-            StartProcess(Utils.DQuotes(Global.db.settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + Global.db.settings.get(SettingName.Kernels).toString(),
+            StartProcess(CommonUtils.DQuotes(Global.db.settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + Global.db.settings.get(SettingName.Kernels).toString(),
                     target.compilation_maxtime);
         } else
             StartProcess("make -j " + Global.db.settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
@@ -221,7 +223,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
     protected void performFinish() throws Exception {
         for (DBProjectFile file : target.db.files.Data.values()) {
             if (!file.last_assembly_name.isEmpty()) {
-                String replacement = file.last_assembly_name + " " + Utils.RBrackets(file.name);
+                String replacement = file.last_assembly_name + " " + CommonUtils.RBrackets(file.name);
                 output = output.replace(file.last_assembly_name, replacement);
             }
         }
diff --git a/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java b/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
index f3f8efb1..65f73b78 100644
--- a/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
+++ b/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
@@ -45,7 +46,7 @@ public class PrepareForModulesAssembly extends Transformation {
         //--создать
         Vector<String> total_lines = new Vector<>();
         for (String name : target.files_order) {
-            total_lines.add("      include " + Utils.Quotes(Utils.toU(name)));
+            total_lines.add("      include " + CommonUtils.Quotes(CommonUtils.toU(name)));
         }
         FileUtils.writeLines(total, total_lines, false);
         //-------------------------------
diff --git a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
index 180b25d4..2c625e69 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
 import Repository.BugReport.BugReportState;
@@ -54,7 +54,7 @@ public class PublishBugReport extends Pass_2021<BugReport> {
         passes.get(PassCode_2021.SendBugReport).Do();
         Global.componentsServer.db.Update(target);
         //3- рассылка
-        EmailMessage message = new EmailMessage("Обнаружена ошибка " + Utils.Brackets(target.id),
+        EmailMessage message = new EmailMessage("Обнаружена ошибка " + CommonUtils.Brackets(target.id),
                 BugReportInterface.getNewMailText(target),
                 BugReportInterface.getRecipients(target));
         if (!target.project_version.isEmpty()) {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishComponent.java b/src/Visual_DVM_2021/Passes/All/PublishComponent.java
index 4dae154b..95c5a22a 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishComponent.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -70,9 +71,9 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
     protected void ServerAction() throws Exception {
         String change_description = (f.Result == null) ? "не указаны" : f.Result;
         String change_record_header = String.join(" ",
-                Utils.Brackets(Utils.print_date(new Date())) + ":",
-                Current.getAccount().name + Utils.RBrackets(Current.getAccount().email),
-                "публикует версию", Utils.DQuotes(target.version)
+                CommonUtils.Brackets(Utils.print_date(new Date())) + ":",
+                Current.getAccount().name + CommonUtils.RBrackets(Current.getAccount().email),
+                "публикует версию", CommonUtils.DQuotes(target.version)
         );
         String change_record = String.join("\n", change_record_header, "Изменения:",
                 change_description,
@@ -102,9 +103,9 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
         if ((f.Result != null)) {
             version_mail_header = String.join(" ",
                     "Опубликована версия",
-                    Utils.DQuotes(target.version),
+                    CommonUtils.DQuotes(target.version),
                     "компонента",
-                    Utils.DQuotes(target.getComponentType().getDescription()));
+                    CommonUtils.DQuotes(target.getComponentType().getDescription()));
             EmailMessage message =
                     new EmailMessage(version_mail_header,
                             f.Result,
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTests.java b/src/Visual_DVM_2021/Passes/All/PublishTests.java
index 82073dcf..c28fcdc9 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTests.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTests.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Common.Group.Group;
@@ -66,7 +66,7 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
             return false;
         }
         //---
-        return UI.Question("В группу " + Utils.Brackets(group.description) +
+        return UI.Question("В группу " + CommonUtils.Brackets(group.description) +
                 "\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java b/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
index 792b63b9..8171e8dd 100644
--- a/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass;
@@ -15,7 +16,7 @@ public class RemoteSingleCommand extends CurrentConnectionPass<String> {
     @Override
     protected void ServerAction() throws Exception {
         RemoteFile file = new RemoteFile(user.connection.sftpChannel.getHome(), Utils.getDateName("out"));
-        user.connection.Command(command + " 1>" + Utils.DQuotes(file.full_name));
+        user.connection.Command(command + " 1>" + CommonUtils.DQuotes(file.full_name));
         if (user.connection.Exists(file)) {
             target = user.connection.readFromFile(file);
             user.connection.sftpChannel.rm(file.full_name);
diff --git a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java b/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
index c4d84bd4..61b48704 100644
--- a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.Text.FileNameForm;
@@ -33,7 +34,7 @@ public class RenameDirectory extends ChangeFilePass {
                 fileName = ff.Result;
                 dst = Paths.get(target_dir.getParentFile().getAbsolutePath(), fileName).toFile();
                 if (dst.exists()) {
-                    Log.Writeln("Файл с именем " + Utils.Brackets(fileName) + " уже существует");
+                    Log.Writeln("Файл с именем " + CommonUtils.Brackets(fileName) + " уже существует");
                     return false;
                 }
                 if (target_dir.equals(project.Home)) {
diff --git a/src/Visual_DVM_2021/Passes/All/RenameFile.java b/src/Visual_DVM_2021/Passes/All/RenameFile.java
index b8eab04b..a6d73c57 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.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.Text.FileNameForm;
-import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
 import Visual_DVM_2021.Passes.ChangeFilePass;
@@ -29,12 +29,12 @@ public class RenameFile extends ChangeFilePass<DBProjectFile> {
                 //->
                 dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();
                 if (dst.exists()) {
-                    Log.Writeln_("Файл с именем " + Utils.Brackets(fileName) + " уже существует");
+                    Log.Writeln_("Файл с именем " + CommonUtils.Brackets(fileName) + " уже существует");
                     return false;
                 }
                 target = new DBProjectFile(dst, project);
                 if (target.fileType == FileType.forbidden)
-                    Log.Writeln_("Расширение " + Utils.Brackets(Utils.getExtension(dst)) + " недопустимо");
+                    Log.Writeln_("Расширение " + CommonUtils.Brackets(CommonUtils.getExtension(dst)) + " недопустимо");
                 return true;
             }
         }
diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
index 108642f3..8200db7d 100644
--- a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import Common_old.UI.UI;
@@ -43,11 +44,11 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
         Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
         //---------------
         if (dir.getName().equals(Constants.data)) {
-            Log.Writeln_(Utils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
+            Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
             return false;
         }
         if (!Utils.validateProjectFile(dir, Log)) {
-            Log.Writeln_("Имя папки " + Utils.Brackets(dir.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
+            Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
             return false;
         }
         if (files.isEmpty()) {
@@ -58,7 +59,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
         LinkedHashMap<String, File> filesByNames = new LinkedHashMap<>(); //выделенные файлы, сортированные по именам.
         //--
         for (File file : files) {
-            String name = Utils.getNameWithoutExtension(file.getName()).toLowerCase();
+            String name = CommonUtils.getNameWithoutExtension(file.getName()).toLowerCase();
             if (!filesByNames.containsKey(name)) {
                 filesByNames.put(name, file);
             }
diff --git a/src/Visual_DVM_2021/Passes/All/Run.java b/src/Visual_DVM_2021/Passes/All/Run.java
index 47a01170..03c2ff85 100644
--- a/src/Visual_DVM_2021/Passes/All/Run.java
+++ b/src/Visual_DVM_2021/Passes/All/Run.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -65,7 +66,7 @@ public class Run extends Pass_2021<db_project_info> {
                 break;
             case Undefined:
             case MVS_cluster:
-                throw new PassException("Запуск не реализован для типа машины " + Utils.DQuotes(Current.getMachine().type));
+                throw new PassException("Запуск не реализован для типа машины " + CommonUtils.DQuotes(Current.getMachine().type));
                 /*
             case MVS_cluster:
                 subpass = passes.get(PassCode_2021.MVSRun);
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java b/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java
index 32369139..1fde4182 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 Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.SapforAnalysis;
 public class SPF_GetFileLineInfo extends SapforAnalysis {
@@ -27,7 +27,7 @@ public class SPF_GetFileLineInfo extends SapforAnalysis {
         for (int i = 0; i < data_.length; ++i) {
             String s = data_[i];
             if (i % 2 == 0) {
-                file_ = target.db.files.Data.get(Utils.toW(s));
+                file_ = target.db.files.Data.get(CommonUtils.toW(s));
             } else {
                 String[] local = s.split("_");
                 int num = Integer.parseInt(local[0]);
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
index 70d1c2b4..bab53165 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.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common.Utils.Index;
-import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.Functions.FuncCall;
 import ProjectData.SapforData.Functions.FuncInfo;
@@ -54,7 +54,7 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
         int numOfFiles = Integer.parseInt(splited[idx.Inc()]);
         Vector<String> done_programs = new Vector<>();
         for (int i = 0; i < numOfFiles; ++i) {
-            String fileName = Utils.toW(splited[idx.Inc()]);
+            String fileName = CommonUtils.toW(splited[idx.Inc()]);
             int functions_count = Integer.parseInt(splited[idx.Inc()]);
             DBProjectFile file = target.db.files.Data.get(fileName);
             if (!done_programs.contains(fileName)) {
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java
index 0ea5e66d..d8f0a4d8 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.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.Utils.Index;
-import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.Loops.Loop;
 import Visual_DVM_2021.Passes.SapforAnalysis;
@@ -41,7 +41,7 @@ public class SPF_GetGraphLoops extends SapforAnalysis {
         Vector<String> done_programs = new Vector<>();
         String[] splitedPackedGraph = packed.split("\\|");
         for (int i = 0; i < splitedPackedGraph.length; i += 2) {
-            String name_ = Utils.toW(splitedPackedGraph[i]);
+            String name_ = CommonUtils.toW(splitedPackedGraph[i]);
             String[] packedLoopInfo = splitedPackedGraph[i + 1].split("#");
             Index idx = new Index();
             int nests_ = Integer.parseInt(packedLoopInfo[idx.Inc()]);
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java b/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java
index aa7b0eae..498428c0 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -38,7 +39,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
         FileInfo fileInfo = null;
         String[] data_ = packed.split("@");
         for (int i = 0; i < data_.length; ++i) {
-            String s = Utils.toW(data_[i]);
+            String s = CommonUtils.toW(data_[i]);
             if (i % 2 == 0) {
                 if (target.db.files.Data.containsKey(s)) {
                     fileInfo = new FileInfo(s);
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
index 5b8afddc..94bfbb60 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 Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.Functions.FuncCall;
 import ProjectData.SapforData.Functions.FuncInfo;
@@ -42,7 +42,7 @@ public class SPF_InlineProcedures extends SapforTransformation {
                 );
                 return false;
             }
-            Options = Utils.toU(String.join("|", Result));
+            Options = CommonUtils.toU(String.join("|", Result));
             Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
             SPF_ParseFilesWithOrder.silent = true;
             return passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do(false);
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java b/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java
index 8d02dbf9..610aca4b 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 Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.Functions.FuncCallH;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -72,7 +72,7 @@ public class SPF_InlineProceduresH extends SapforTransformation {
                     Result.add(call.isSelected() ? "1" : "0");
                 }
             }
-            Options = Utils.toU(String.join("|", Result));
+            Options = CommonUtils.toU(String.join("|", Result));
             Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
             SPF_ParseFilesWithOrder.silent = true;
             return passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do();
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java b/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java
index bc8e84ce..a6b4dd62 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_old.UI.Selectable;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import ProjectData.SapforData.Includes.DependencyInfo;
 import ProjectData.SapforData.Includes.FileInfo;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -35,7 +35,7 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
                 Log.Writeln_("Не отмечено ни одного заголовка для подстановки");
                 return false;
             }
-            Options = Utils.toU(String.join("|", Result));
+            Options = CommonUtils.toU(String.join("|", Result));
             return true;
         }
         return false;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
index d840e119..2c4b7390 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -72,7 +73,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
                     case HasNotes:
                     case HasWarnings:
                         if (f.isActiveProgram())
-                            projLines.add(Utils.toU(f.getDepFile().getAbsolutePath()));
+                            projLines.add(CommonUtils.toU(f.getDepFile().getAbsolutePath()));
                         goodCount++;
                         break;
                     case HasErrors:
@@ -94,7 +95,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
             }
             if (goodCount == 0) {
                 Log.Writeln_("Не найдено ни одного успешно проанализированного файла на языке проекта :" +
-                        Utils.DQuotes(target.languageName.getDescription()));
+                        CommonUtils.DQuotes(target.languageName.getDescription()));
                 return false;
             }
             return true;
@@ -104,7 +105,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
     @Override
     protected void unpack(String packed) throws Exception {
         for (String fileName_ : packed.split("\\|"))
-            target.files_order.add(Utils.toW(fileName_));
+            target.files_order.add(CommonUtils.toW(fileName_));
     }
     @Override
     protected void performPreparation() throws Exception {
@@ -125,7 +126,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
         //---------------------------
         for (DBProjectFile f : target.db.files.Data.values()) {
             if (f.isActiveProgram()) {
-                projLines.add(Utils.toU(f.file.getAbsolutePath()));
+                projLines.add(CommonUtils.toU(f.file.getAbsolutePath()));
                 f.CreateParserOptions();
             }
         }
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java b/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java
index 8b765fc1..2402cbc6 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import GlobalData.Tasks.RunTask.RunTask;
 import Visual_DVM_2021.Passes.SilentSapforPass;
 
@@ -22,9 +22,9 @@ public class SPF_StatisticAnalyzer extends SilentSapforPass {
                 code().toString(),
                 -Global.messagesServer.getPort(),
                 Global.packSapforSettings(),
-                Utils.DQuotes(task.getLocalStsFile().getAbsolutePath()) +
+                CommonUtils.DQuotes(task.getLocalStsFile().getAbsolutePath()) +
                         " "
-                        + Utils.DQuotes(target.getStsFile().getAbsolutePath()));
+                        + CommonUtils.DQuotes(target.getStsFile().getAbsolutePath()));
     }
     @Override
     protected boolean isGoodCode() {
diff --git a/src/Visual_DVM_2021/Passes/All/SaveGraph.java b/src/Visual_DVM_2021/Passes/All/SaveGraph.java
index 50de409b..0f21a8e1 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveGraph.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveGraph.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Pass_2021;
@@ -42,7 +42,7 @@ public class SaveGraph extends Pass_2021<File> {
     protected void body() throws Exception {
         target = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), "Graph.png").toFile();
         if (target.exists() && !target.delete())
-            throw new PassException("Не удается удалить предыдущий файл " + Utils.Brackets(target.getAbsolutePath()));
+            throw new PassException("Не удается удалить предыдущий файл " + CommonUtils.Brackets(target.getAbsolutePath()));
         //-
         mxGraph graph = graphForm.control.getGraph();
         BufferedImage image = mxCellRenderer.createBufferedImage(graph,
@@ -63,6 +63,6 @@ public class SaveGraph extends Pass_2021<File> {
     }
     @Override
     protected void showDone() throws Exception {
-        UI.Info("Граф успешно сохранен в файл: " + Utils.Brackets(target.getAbsolutePath()));
+        UI.Info("Граф успешно сохранен в файл: " + CommonUtils.Brackets(target.getAbsolutePath()));
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/SaveProfile.java b/src/Visual_DVM_2021/Passes/All/SaveProfile.java
index fdb2f870..17fb14f0 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveProfile.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveProfile.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
+import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import GlobalData.SapforProfile.SapforProfile;
 import Visual_DVM_2021.Passes.AddObjectPass;
 
@@ -23,7 +23,7 @@ public class SaveProfile extends AddObjectPass<SapforProfile> {
         //1. проверить нет ли уже такой последовательности настроек.
         SapforProfile profile = Global.db.checkProfileForCurrentSettings();
         if (profile != null) {
-            Log.Writeln_("Текущий набор настроек уже сохранён как профиль " + Utils.Brackets(profile.description));
+            Log.Writeln_("Текущий набор настроек уже сохранён как профиль " + CommonUtils.Brackets(profile.description));
             return false;
         }
         return super.canStart(args);
diff --git a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java b/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
index 1e990983..f346c55a 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
 import Common_old.Utils.Utils;
@@ -50,7 +51,7 @@ public class ShowComponentChangesLog extends ComponentsRepositoryPass<Component>
         for (int i = lines.size() - 1; i >= 0; i--)
             res.add(lines.get(i));
         ff.ShowDialog("Журнал изменений компонента " +
-                        Utils.Brackets(target.getComponentType().getDescription()),
+                        CommonUtils.Brackets(target.getComponentType().getDescription()),
                 String.join("\n", res)
         );
     }
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java b/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
index 60ea766a..495f59b2 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -120,7 +121,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
                     message_header += target.executor + " назначается исполнителем";
                     break;
                 case "state":
-                    message_header += "состояние изменилось на " + Utils.Brackets(target.state.getDescription());
+                    message_header += "состояние изменилось на " + CommonUtils.Brackets(target.state.getDescription());
                     break;
             }
             passes.get(PassCode_2021.Email).Do(
diff --git a/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java b/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java
index 5376dcbd..005b2e0a 100644
--- a/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java
+++ b/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes;
-import Common_old.Constants;
+import Common.CommonConstants;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
 import TestingSystem.Common.TestingPackage.TestingPackage;
@@ -35,7 +35,7 @@ public abstract class DeleteTestingPackages<P extends TestingPackage> extends De
         if (super.canStart(args) && checkActivity()) {
             for (Object key : target) {
                 int id = (int) key;
-                if (id == Constants.Nan) {
+                if (id == CommonConstants.Nan) {
                     delete_draft = true;
                 } else {
                     target_.add(id);
@@ -57,7 +57,7 @@ public abstract class DeleteTestingPackages<P extends TestingPackage> extends De
     }
     void DeleteDraftOnly() throws Exception {
         showPreparation();
-        getDb().tables.get(d).Data.remove(Constants.Nan);
+        getDb().tables.get(d).Data.remove(CommonConstants.Nan);
         getDb().tables.get(d).ShowUI();
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/Pass_2021.java b/src/Visual_DVM_2021/Passes/Pass_2021.java
index 8460c168..a1429efc 100644
--- a/src/Visual_DVM_2021/Passes/Pass_2021.java
+++ b/src/Visual_DVM_2021/Passes/Pass_2021.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.DebugPrintLevel;
@@ -269,7 +270,7 @@ public class Pass_2021<T> {
         return false;
     }
     public void Interrupt() throws Exception {
-        UI.Info("Проход " + Utils.Brackets(getDescription()) + " не разрешено прерывать.");
+        UI.Info("Проход " + CommonUtils.Brackets(getDescription()) + " не разрешено прерывать.");
     }
     public boolean needsConfirmations() {
         return false;
@@ -382,11 +383,11 @@ public class Pass_2021<T> {
             Global.Log.Print(DebugPrintLevel.Passes,
                     getDescription() +
                             " окончен за " + timer.Print() +
-                            " состояние " + Utils.Brackets(state.getDescription())
+                            " состояние " + CommonUtils.Brackets(state.getDescription())
             );
             if (!Log.isEmpty() && Current.hasUI())
                 UI.Error(
-                        "проход " + Utils.Brackets(getDescription()) + "\n" + state.getDescription() + "\n\n" +
+                        "проход " + CommonUtils.Brackets(getDescription()) + "\n" + state.getDescription() + "\n\n" +
                                 Log.toString());
         }
         //------------------------------->
@@ -407,17 +408,17 @@ public class Pass_2021<T> {
                     form.fields.ProgressBar.setValue((data.length > 1) ? Integer.parseInt(data[1]) : 0);
                     break;
             }
-        } else System.out.println(Utils.Brackets(message));
+        } else System.out.println(CommonUtils.Brackets(message));
     }
     public void ShowMessage1(String message) {
         if (form != null)
             form.fields.Label1.setText((message.length() > 1) ? message : "");
-        else System.out.println(Utils.Brackets(message));
+        else System.out.println(CommonUtils.Brackets(message));
     }
     public void ShowMessage2(String message) {
         if (form != null)
             form.fields.Label2.setText((message.isEmpty() ? "" : message));
-        else System.out.println(Utils.Brackets(message));
+        else System.out.println(CommonUtils.Brackets(message));
     }
     public void ShowProgress(int total, int current, boolean auto) {
         if (form != null) {
diff --git a/src/Visual_DVM_2021/Passes/ProcessPass.java b/src/Visual_DVM_2021/Passes/ProcessPass.java
index caa7a831..7b12efa0 100644
--- a/src/Visual_DVM_2021/Passes/ProcessPass.java
+++ b/src/Visual_DVM_2021/Passes/ProcessPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes;
-import Common_old.Constants;
+import Common.CommonConstants;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
 
@@ -11,13 +11,13 @@ import java.util.LinkedHashMap;
 import java.util.Vector;
 public abstract class ProcessPass<T> extends Pass_2021<T> {
     public Process process = null;
-    public int exit_code = Constants.Nan;
+    public int exit_code = CommonConstants.Nan;
     public LinkedHashMap<String, String> envs = new LinkedHashMap<>();
     public Vector<String> output = new Vector<>();
     protected String process_path = "";
     public void CreateProcess(String exec_path_in, File workspace, String ... command) throws Exception {
         output.clear();
-        exit_code = Constants.Nan;
+        exit_code = CommonConstants.Nan;
         process_path = exec_path_in;
         ProcessBuilder procBuilder = new ProcessBuilder(process_path);
         //-
diff --git a/src/Visual_DVM_2021/UI/Interface/Loggable.java b/src/Visual_DVM_2021/UI/Interface/Loggable.java
index cce924a7..7a1c2655 100644
--- a/src/Visual_DVM_2021/UI/Interface/Loggable.java
+++ b/src/Visual_DVM_2021/UI/Interface/Loggable.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.UI.Interface;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.DebugPrintLevel;
 import Common_old.UI.UI;
@@ -25,7 +26,7 @@ public interface Loggable {
     default void Print(String message) {
         try {
             FileWriter Log = new FileWriter(getLogFile(), true);
-            String datedMessage = Utils.Brackets(new Date()) + " " + message;
+            String datedMessage = CommonUtils.Brackets(new Date()) + " " + message;
             Log.write(datedMessage + "\n");
             Log.close();
         } catch (Exception ignored) {
@@ -33,7 +34,7 @@ public interface Loggable {
     }
     default void Print(DebugPrintLevel level, String message) {
         if (level.isEnabled())
-            Print(Utils.Brackets(level.getDescription()) + " " + message);
+            Print(CommonUtils.Brackets(level.getDescription()) + " " + message);
     }
     default void PrintException(Exception ex) {
         StringWriter out = new StringWriter();
@@ -43,6 +44,6 @@ public interface Loggable {
         Print(out.toString());
         if (Current.hasUI())
             UI.Error("Возникло исключение. Подробности в файле журнала\n" +
-                    Utils.Brackets(getLogFile().getAbsolutePath()));
+                    CommonUtils.Brackets(getLogFile().getAbsolutePath()));
     }
 }
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
index 6401440d..7ee83f13 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.UI.Main;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Editor.BaseEditor;
@@ -6,7 +7,6 @@ import Common_old.UI.Editor.Viewer;
 import Common_old.UI.Menus_2023.VisualiserMenuBar;
 import Common_old.UI.TextField.StyledTextField;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
@@ -434,9 +434,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
     }
     @Override
     public void ShowAccount() {
-        lAccountName.setText(Utils.Brackets(Current.getAccount().name));
-        lAccountMail.setText(Utils.Brackets(Current.getAccount().email));
-        lAccountRole.setText(Utils.Brackets(Current.getAccount().role.getDescription()));
+        lAccountName.setText(CommonUtils.Brackets(Current.getAccount().name));
+        lAccountMail.setText(CommonUtils.Brackets(Current.getAccount().email));
+        lAccountRole.setText(CommonUtils.Brackets(Current.getAccount().role.getDescription()));
         switch (Current.getAccount().role) {
             case Undefined:
               ///  UI.Clear(accountPanel);
diff --git a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
index 51c57f81..7c1e6f5a 100644
--- a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
@@ -105,7 +105,7 @@ public abstract class ComparisonForm<T> {
     //предполагаем что оба объекта есть и мы можем получить с них текст.
     protected void Compare() throws Exception {
         events_on = false;
-        current_diff_line = Constants.Nan;
+        current_diff_line = CommonConstants.Nan;
         colors.clear();
         //-----------------------------------------------------------------------------------------------
         Body.setText("");
@@ -169,7 +169,7 @@ public abstract class ComparisonForm<T> {
     }
     public void Show() throws Exception {
         events_on = false;
-        current_diff_line = Constants.Nan;
+        current_diff_line = CommonConstants.Nan;
         colors.clear();
         //----------------------------------------------------------------------------------------------
         Body.setText("");
@@ -259,7 +259,7 @@ public abstract class ComparisonForm<T> {
             //</editor-fold>
             slave.master = this;
             bPrevious.addActionListener(e -> {
-                if (current_diff_line != Constants.Nan) {
+                if (current_diff_line != CommonConstants.Nan) {
                     if (current_diff_line > 0)
                         current_diff_line--;
                     else
@@ -268,7 +268,7 @@ public abstract class ComparisonForm<T> {
                 }
             });
             bNext.addActionListener(e -> {
-                if (current_diff_line != Constants.Nan) {
+                if (current_diff_line != CommonConstants.Nan) {
                     if (current_diff_line < colors.size() - 1)
                         current_diff_line++;
                     else
diff --git a/src/Visual_DVM_2021/UI/Main/FileForm.java b/src/Visual_DVM_2021/UI/Main/FileForm.java
index 79456fe8..8a616b5e 100644
--- a/src/Visual_DVM_2021/UI/Main/FileForm.java
+++ b/src/Visual_DVM_2021/UI/Main/FileForm.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.Constants;
+import Common.CommonConstants;
 import _VisualDVM.Global;
 import Common_old.UI.Editor.Viewer;
 import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
@@ -29,7 +29,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
     //контролы в столбцах
     //https://stackoverflow.com/questions/7137786/how-can-i-put-a-control-in-the-jtableheader-of-a-jtable
     //todo _ временно
-    public static int current_file_line = Constants.Nan;
+    public static int current_file_line = CommonConstants.Nan;
     private final Viewer compilationOutput;
     private final Viewer runOutput;
     private final Viewer gcovLog;
diff --git a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
index 8217d23e..52f70003 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.UI.Main;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
@@ -82,8 +83,8 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
             if (isReady()) {
                 if (getMaster().isReady()) {
                     boolean ExtensionsOn = Global.db.settings.get(SettingName.ExtensionsOn).toBoolean();
-                    String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils.getFileNameWithoutExtension(getMaster().file.file);
-                    String name2 = ExtensionsOn ? file.file.getName() : Utils.getFileNameWithoutExtension(file.file);
+                    String name1 = ExtensionsOn ? getMaster().file.file.getName() : CommonUtils.getFileNameWithoutExtension(getMaster().file.file);
+                    String name2 = ExtensionsOn ? file.file.getName() : CommonUtils.getFileNameWithoutExtension(file.file);
                     if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
                         if (name1.equalsIgnoreCase(name2))
                             master.DoComparePass(true);
@@ -112,7 +113,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
     @Override
     protected void showObject() {
         lObjectName.setText(object.toString());
-        lObjectName.setToolTipText(object.Home.getName() + " : " + Utils.Brackets(object.description));
+        lObjectName.setToolTipText(object.Home.getName() + " : " + CommonUtils.Brackets(object.description));
         cbFile.removeAllItems();
         for (ProjectFile file : object.files.values())
             cbFile.addItem(file);
@@ -161,8 +162,8 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
                         return true;
                     }
                 } else {
-                    if (Utils.getNameWithoutExtension(projectFile.file.getName()).equals(
-                            Utils.getNameWithoutExtension(file_name))) {
+                    if (CommonUtils.getNameWithoutExtension(projectFile.file.getName()).equals(
+                            CommonUtils.getNameWithoutExtension(file_name))) {
                         cbFile.setSelectedIndex(i);
                         return true;
                     }
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 9f9ff141..750df075 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Main;
-import Common_old.Constants;
+import Common.CommonConstants;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.TextField.StyledTextField;
@@ -268,42 +268,42 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     }
     public void RestoreLastCredentials() {
         Credentials credentials = (Credentials) Current.get(Current.Credentials);
-        if (credentials.machine_id != Constants.Nan) {
+        if (credentials.machine_id != CommonConstants.Nan) {
             if (Global.db.machines.containsKey(credentials.machine_id)) {
                 Global.db.machines.ShowUI(credentials.machine_id);
                 if (Global.db.users.containsKey(credentials.user_id)) {
                     Global.db.users.ShowUI(credentials.user_id);
                 } else {
-                    credentials.user_id = Constants.Nan;
+                    credentials.user_id = CommonConstants.Nan;
                     Global.db.UpdateCredentials();
                 }
                 if (Global.db.compilers.containsKey(credentials.compiler_id)) {
                     Global.db.compilers.ShowUI(credentials.compiler_id);
                 } else {
-                    credentials.compiler_id = Constants.Nan;
+                    credentials.compiler_id = CommonConstants.Nan;
                     Global.db.UpdateCredentials();
                 }
                 //-
                 if (Global.db.makefiles.containsKey(credentials.makefile_id)) {
                     Global.db.makefiles.ShowUI(credentials.makefile_id);
                 } else {
-                    credentials.makefile_id = Constants.Nan;
+                    credentials.makefile_id = CommonConstants.Nan;
                     Global.db.UpdateCredentials();
                 }
                 //-
                 if (Global.db.runConfigurations.containsKey(credentials.runconfiguration_id)) {
                     Global.db.runConfigurations.ShowUI(credentials.runconfiguration_id);
                 } else {
-                    credentials.runconfiguration_id = Constants.Nan;
+                    credentials.runconfiguration_id = CommonConstants.Nan;
                     Global.db.UpdateCredentials();
                 }
             } else {
-                credentials.machine_id = Constants.Nan;
-                credentials.user_id = Constants.Nan;
-                credentials.compiler_id = Constants.Nan;
-                credentials.remotesapfor_id = Constants.Nan;
-                credentials.makefile_id = Constants.Nan;
-                credentials.runconfiguration_id = Constants.Nan;
+                credentials.machine_id = CommonConstants.Nan;
+                credentials.user_id = CommonConstants.Nan;
+                credentials.compiler_id = CommonConstants.Nan;
+                credentials.remotesapfor_id = CommonConstants.Nan;
+                credentials.makefile_id = CommonConstants.Nan;
+                credentials.runconfiguration_id = CommonConstants.Nan;
                 Global.db.UpdateCredentials();
             }
         }
diff --git a/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
index eb3327b8..ed5b0468 100644
--- a/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.UI.Main;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
@@ -35,8 +36,8 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
                 if (isReady()) {
                     if (getMaster().isReady()) {
                         boolean ExtensionsOn = Global.db.settings.get(SettingName.ExtensionsOn).toBoolean();
-                        String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils.getFileNameWithoutExtension(getMaster().file.file);
-                        String name2 = ExtensionsOn ? file.file.getName() : Utils.getFileNameWithoutExtension(file.file);
+                        String name1 = ExtensionsOn ? getMaster().file.file.getName() : CommonUtils.getFileNameWithoutExtension(getMaster().file.file);
+                        String name2 = ExtensionsOn ? file.file.getName() : CommonUtils.getFileNameWithoutExtension(file.file);
                         if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
                             if (name1.equalsIgnoreCase(name2))
                                 master.DoComparePass(true);
@@ -89,8 +90,8 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
                     return true;
                 }
             } else {
-                if (Utils.getNameWithoutExtension(projectFile.file.getName()).equals(
-                        Utils.getNameWithoutExtension(file_in.file.getName()))) {
+                if (CommonUtils.getNameWithoutExtension(projectFile.file.getName()).equals(
+                        CommonUtils.getNameWithoutExtension(file_in.file.getName()))) {
                     cbFile.setSelectedIndex(i);
                     return true;
                 }
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 9e40b536..8def3ca6 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -272,8 +272,8 @@ public class Global {
         visualizer_2.Connect();
         visualizer_2.refreshPid();
         //если делать раньше, то не удастся убить сервер.
-        if (Utils.ContainsCyrillic(Global.Home)) {
-            UI.Info("В пути к корневой папке " + Utils.DQuotes(Global.Home) + "\n" +
+        if (CommonUtils.ContainsCyrillic(Global.Home)) {
+            UI.Info("В пути к корневой папке " + CommonUtils.DQuotes(Global.Home) + "\n" +
                     "Найдены русские буквы.\n" +
                     "Визуализатор завершает работу."); //
             FinishApplication();
@@ -391,7 +391,7 @@ public class Global {
     public static void Init(String... args) {
         System.out.println("VisualSapfor.jar started..");
         Home = System.getProperty("user.dir"); //если Linux, дает без слеша в конце !!!
-        System.out.println("home directory is" + Utils.Brackets(Home));
+        System.out.println("home directory is" + CommonUtils.Brackets(Home));
         //---
         SynschronizeProperties();
         Current.mode = properties.Mode;