diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 547221a0..4bfd0fb9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,158 +7,346 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ConfigurationAutoSwitcher.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/Passes/All/ActualizePackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizePackages.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/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.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/nDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/nDBObject.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/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/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/Visual/CommonUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/HyperlinksStyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/HyperlinksStyledList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DBObjectFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DBObjectFilter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DragDrop/FileDrop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DragDrop/FileDrop.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TableMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/TextComboBoxMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TextComboBoxMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/TextEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TextEditorMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Selectable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Selectable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DateRenderer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DateRenderer_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Themes/VisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Themes/VisualiserTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/DataTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/DataTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/GraphTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/GraphTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VFileChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Form.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Form.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/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/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/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/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/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/CloneCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneCurrentDVMConfiguration.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/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/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/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/CreateDVMPackageFromCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateDVMPackageFromCurrentProject.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/ExtractRecipients.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExtractRecipients.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/FinishApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/FinishApplication.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/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/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/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/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/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/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/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/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/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/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/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/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_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_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_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_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_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_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/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/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/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/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/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/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/ShowVersionsFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowVersionsFiles.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/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/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/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/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/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/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/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.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/ConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.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/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/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SortPassesByStats.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SortPassesByStats.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/UI/PassForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/Compiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/Compiler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/Machine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/Machine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/Makefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/Makefile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/Module.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/DBSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/DBSetting.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Splitter/SplittersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Splitter/SplittersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/QueueSystem/QueueSystem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/QueueSystem/QueueSystem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Task.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserFields.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/ProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/ProjectFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/ChangeSettingPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/ChangeSettingPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Component.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Instruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Instruction.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/OSDComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/OSDComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualizer_2.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/EmailMessage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/EmailMessage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryClient.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerExchangeUnit_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerExchangeUnit_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Group.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Controls/PassButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Controls/PassButton.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Validators/DVMHelpParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/DVMHelpParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Validators/PathValidator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/PathValidator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Validators/ShellParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/ShellParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/CaretInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/CaretInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FormWithSplitters.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FormWithSplitters.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/AttachementsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/AttachementsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainEditorMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassMenuItem.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StableMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StableMenuItem.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CommentFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CommentFields.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DescriptionFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DescriptionFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DebugForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DebugForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectsChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectsChooser.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TabToolBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TabToolBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/WelcomeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/WelcomeForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TasksComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java
index 0f05e438..63282c63 100644
--- a/src/Common/Database/Database.java
+++ b/src/Common/Database/Database.java
@@ -1,6 +1,6 @@
 package Common.Database;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Database.Tables.DBTable;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DataSet;
@@ -84,7 +84,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("Таблица " + CommonUtils.Brackets(table.Name) + " уже содержит объект с ключом " + CommonUtils.Brackets(object.getPK().toString()));
+            throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.Name) + " уже содержит объект с ключом " + Utils_.Brackets(object.getPK().toString()));
         insert(table, object);
         table.Data.put(object.getPK(), object);
         return object;
@@ -111,7 +111,7 @@ public abstract class Database {
             table.Data.remove(o.getPK());
             return o;
         } else
-            throw new RepositoryRefuseException("Таблица " + CommonUtils.Brackets(table.Name) + " не содержит объект с ключом " + CommonUtils.Brackets(to_delete.getPK().toString()));
+            throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.Name) + " не содержит объект с ключом " + Utils_.Brackets(to_delete.getPK().toString()));
     }
     public DBObject DeleteByPK(Class object_class, Object key) throws Exception {
         DBTable table = tables.get(object_class);
@@ -121,7 +121,7 @@ public abstract class Database {
             table.Data.remove(key);
             return o;
         } else
-            throw new RepositoryRefuseException("Таблица " + CommonUtils.Brackets(table.Name) + " не содержит объект с ключом " + CommonUtils.Brackets(key.toString()));
+            throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.Name) + " не содержит объект с ключом " + Utils_.Brackets(key.toString()));
     }
     // не работает с автоинкрементом.
     public DBObject getObjectCopyByPK(Class table_class, Object pk) throws Exception {
@@ -178,7 +178,7 @@ public abstract class Database {
                 if (fk_class.getField(owner.getFKName()).get(o).equals(owner.getPK())) res.add((DBObject) o);
             }
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         return res;
     }
@@ -207,7 +207,7 @@ public abstract class Database {
                 if (fk_class.getField(owner.getFKName()).get(f).equals(owner.getPK())) res.put((K) f.getPK(), f);
             }
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         return res;
     }
@@ -222,7 +222,7 @@ public abstract class Database {
                 if (fk_class.getField(owner.getFKName()).get(o).equals(owner.getPK())) res.add(o.toString());
             }
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         return res;
     }
@@ -243,7 +243,7 @@ public abstract class Database {
                     res.put((G) (fk_class.getField(group_field).get(f)), f);
             }
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         return res;
     }
diff --git a/src/Common/Database/Objects/DBObject.java b/src/Common/Database/Objects/DBObject.java
index aadf020f..720cefda 100644
--- a/src/Common/Database/Objects/DBObject.java
+++ b/src/Common/Database/Objects/DBObject.java
@@ -1,5 +1,5 @@
 package Common.Database.Objects;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Selectable;
 import Common.Utils.Index;
 import com.sun.org.glassfish.gmbal.Description;
@@ -34,7 +34,7 @@ public abstract class DBObject implements Selectable, Serializable {
     }
     public abstract Object getPK();
     public String getBDialogName() {
-        return CommonUtils.Brackets(getDialogName());
+        return Utils_.Brackets(getDialogName());
     }
     public String getDialogName() {
         return getPK().toString();
diff --git a/src/Common/Database/Objects/nDBObject.java b/src/Common/Database/Objects/nDBObject.java
index 68d1dd99..dc871ec1 100644
--- a/src/Common/Database/Objects/nDBObject.java
+++ b/src/Common/Database/Objects/nDBObject.java
@@ -1,5 +1,5 @@
 package Common.Database.Objects;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import com.sun.org.glassfish.gmbal.Description;
 public abstract class nDBObject extends DBObject {
     @Description("PRIMARY KEY, UNIQUE")
@@ -13,7 +13,7 @@ public abstract class nDBObject extends DBObject {
         return "";
     }
     public void genName() {
-        id = CommonUtils.getDateName(getClass().getSimpleName().toLowerCase());
+        id = Utils_.getDateName(getClass().getSimpleName().toLowerCase());
     }
     //-
     @Override
diff --git a/src/Common/Database/SQLITE/SQLiteDatabase.java b/src/Common/Database/SQLITE/SQLiteDatabase.java
index c5208f5e..4f2d666a 100644
--- a/src/Common/Database/SQLITE/SQLiteDatabase.java
+++ b/src/Common/Database/SQLITE/SQLiteDatabase.java
@@ -3,8 +3,8 @@ 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.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Passes.PassException;
 import javafx.util.Pair;
 
@@ -13,7 +13,7 @@ import java.sql.*;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 
-import static Common.Utils.CommonUtils.requireNonNullElse;
+import static Common.Utils.Utils_.requireNonNullElse;
 public abstract class SQLiteDatabase extends Database {
     protected Connection conn = null;
     protected Statement statement = null;
@@ -36,7 +36,7 @@ public abstract class SQLiteDatabase extends Database {
                 ex.printStackTrace();
                 conn = null;
                 System.gc();
-                CommonUtils.sleep(2000);
+                Utils_.sleep(2000);
             }
         }
         if (conn == null)
@@ -116,7 +116,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 += CommonUtils.RBrackets(String.join(",", columns_names));
+                cmd += Utils_.RBrackets(String.join(",", columns_names));
                 statement.execute(cmd);
             }
         }
@@ -135,8 +135,8 @@ public abstract class SQLiteDatabase extends Database {
             }
             insertStatements.put(table.d, conn.prepareStatement(
                     "INSERT OR REPLACE INTO " + table.QName() + " " +
-                            CommonUtils.RBrackets(String.join(",", column_names)) + " " + "VALUES " +
-                            CommonUtils.RBrackets(String.join(",", column_values))));
+                            Utils_.RBrackets(String.join(",", column_names)) + " " + "VALUES " +
+                            Utils_.RBrackets(String.join(",", column_values))));
             //------------------------------------------------------------------------------->>
             Vector<String> new_values = new Vector();
             for (DBTableColumn column : table.columns.values()) {
@@ -194,7 +194,7 @@ public abstract class SQLiteDatabase extends Database {
             if (field_value != null) {
                 table.d.getField(column.Name).set(o, field_value);
             } else
-                throw new PassException("Ошибка при загрузке поля " + CommonUtils.Brackets(column.Name) + " класса " + CommonUtils.Brackets(table.d.getSimpleName()));
+                throw new PassException("Ошибка при загрузке поля " + Utils_.Brackets(column.Name) + " класса " + Utils_.Brackets(table.d.getSimpleName()));
         }
         return new Pair<>((K) o.getPK(), o);
     }
@@ -210,7 +210,7 @@ public abstract class SQLiteDatabase extends Database {
     protected void insert(DBTable table, DBObject o) throws Exception {
         PreparedStatement ps = insertStatements.get(table.d);
         if (ps == null)
-            CommonUI.Info("INSERT NULL");
+            UI_.Info("INSERT NULL");
         int i = 1;
         for (DBTableColumn column : table.columns.values()) {
             if (!column.AutoIncrement) {
@@ -234,7 +234,7 @@ public abstract class SQLiteDatabase extends Database {
     protected void update(DBTable table, DBObject o) throws Exception {
         PreparedStatement ps = updateStatements.get(table.d);
         if (ps == null)
-            CommonUI.Info("UPDATE NULL");
+            UI_.Info("UPDATE NULL");
         int i = 1;
         for (DBTableColumn column : table.columns.values()) {
             if (!column.AutoIncrement) {
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index ed8e6f97..6a24be05 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -8,7 +8,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Visual.Windows.Dialog.DialogFields;
 import Common.Utils.TextLog;
 import Common.Database.Objects.DBObject;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.FilterInterface;
 
 import javax.swing.*;
@@ -41,15 +41,15 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         Name = d.getSimpleName();
     }
     public void mountUI(JPanel content_in) {
-        CommonUI.Clear(content_in);
+        UI_.Clear(content_in);
         //-->
         ui_ = createUI();
         ui_.setContent(content_in);
         //-->
-        if ( CommonUI.menuBars.containsKey(getClass())) {
-            DataMenuBar bar =  CommonUI.menuBars.get(getClass());
+        if ( UI_.menuBars.containsKey(getClass())) {
+            DataMenuBar bar =  UI_.menuBars.get(getClass());
             content_in.add(bar, BorderLayout.NORTH);
-            setFilterUI(count ->  CommonUI.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
+            setFilterUI(count ->  UI_.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
             if (ui_.hasCheckBox())
                 bar.createSelectionButtons(this);
         }
@@ -57,7 +57,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         //----
         createFilters();
         if (!filters.isEmpty()) {
-            DataMenuBar menuBar =  CommonUI.menuBars.get(getClass());
+            DataMenuBar menuBar =  UI_.menuBars.get(getClass());
             for (DataSetFilter<D> filter : filters)
                 menuBar.addMenus(filter.menu);
         }
@@ -133,7 +133,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         return false;
     }
     public boolean ShowDeleteObjectDialog(DBObject object) {
-        return CommonUI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
+        return UI_.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
     }
     public String QName() {
         return "\"" + Name + "\"";
diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index 872d1629..2de01208 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -1,9 +1,9 @@
 package Common.Passes;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Utils.Stopwatch;
 import Common.Utils.TextLog;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Visual_DVM_2021.PassStats.PassStats;
 import Visual_DVM_2021.Passes.PassCode;
 import Visual_DVM_2021.Passes.UI.PassForm;
@@ -53,9 +53,9 @@ public class Pass<T> {
     //важно. вызывать только если есть интерфейс. passstats делать частью общей бд.пусть будут.
     public static void CheckAllStats() throws Exception {
         for (Pass pass : FAPasses) {
-            if (!((GlobalDatabase) CommonUtils.db).passStats.Data.containsKey(pass.code().toString()))
-                CommonUtils.db.Insert(pass.stats = new PassStats(pass.code().toString()));
-            else pass.stats = ((GlobalDatabase) CommonUtils.db).passStats.Data.get(pass.code().toString());
+            if (!((GlobalDatabase) Utils_.db).passStats.Data.containsKey(pass.code().toString()))
+                Utils_.db.Insert(pass.stats = new PassStats(pass.code().toString()));
+            else pass.stats = ((GlobalDatabase) Utils_.db).passStats.Data.get(pass.code().toString());
         }
         FAPasses.sort(new SortPassesByStats());
     }
@@ -68,7 +68,7 @@ public class Pass<T> {
                 if (pass.hasStats())
                     FAPasses.add(pass);
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
             }
         }
     }
@@ -78,7 +78,7 @@ public class Pass<T> {
         return null;
     }
     public Icon getTabIcon() {
-        return CommonUtils.getTabIcon(getIconPath());
+        return Utils_.getTabIcon(getIconPath());
     }
     public AbstractAction getControlAction() {
         return new AbstractAction() {
@@ -128,12 +128,12 @@ public class Pass<T> {
         if (hasStats()) {
             stats.Inc();
             try {
-                CommonUtils.db.Update(stats);
+                Utils_.db.Update(stats);
                 FAPasses.sort(new SortPassesByStats());
                 if (Current.HasProject())
                     UI.fastAccessMenuBar.Refresh();
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
             }
         }
     }
@@ -190,30 +190,30 @@ public class Pass<T> {
     //-
     private void PerformCanNotStart() throws Exception {
         performCanNotStart();
-        if (CommonUI.isActive())
+        if (UI_.isActive())
             showCanNotStart();
     }
     protected void PerformPreparation() throws Exception {
         performPreparation();
-        if (CommonUI.isActive())
+        if (UI_.isActive())
             showPreparation();
     }
     private void PerformFinish() throws Exception {
         performFinish();
         //-
-        if (CommonUI.isActive())
+        if (UI_.isActive())
             showFinish();
     }
     private void PerformDone() throws Exception {
         performDone();
         //-
-        if (CommonUI.isActive())
+        if (UI_.isActive())
             showDone();
     }
     private void PerformFail() throws Exception {
         performFail();
         //-
-        if (CommonUI.isActive())
+        if (UI_.isActive())
             showFail();
     }
     //------
@@ -245,7 +245,7 @@ public class Pass<T> {
         Vector<String> ToPrint = new Vector<>();
         createStack_r(ToDo, ToPrint);
         if (Global.properties.ConfirmPassesStart && !ToPrint.isEmpty() &&
-                !CommonUI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
+                !UI_.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
         ) return false;
         while (ToDo.size() > 1) {
             if (!ToDo.pop().start()) return false;
@@ -256,7 +256,7 @@ public class Pass<T> {
             //-
             if (Global.properties.ShowPassesDone && !ToPrint.isEmpty()
             ) {
-                CommonUI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
+                UI_.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
                         "\nуспешно выполнен(ы)!");
             }
             //-
@@ -270,7 +270,7 @@ public class Pass<T> {
         return false;
     }
     public void Interrupt() throws Exception {
-        CommonUI.Info("Проход " + CommonUtils.Brackets(getDescription()) + " не разрешено прерывать.");
+        UI_.Info("Проход " + Utils_.Brackets(getDescription()) + " не разрешено прерывать.");
     }
     public boolean needsConfirmations() {
         return false;
@@ -281,7 +281,7 @@ public class Pass<T> {
         if (ex instanceof PassException) {
             Log.Writeln_(ex.getMessage());
         } else
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
     }
     public boolean start(Object... args) {
         //------------------------------->
@@ -293,15 +293,15 @@ public class Pass<T> {
         target = null;
         Log = new TextLog();
         if (!getDescription().isEmpty())
-            CommonUtils.MainLog.Print(getDescription() + " стартует..");
+            Utils_.MainLog.Print(getDescription() + " стартует..");
         timer.Start();
         //------------------------------->
         try {
-            if (CommonUI.isActive()) FocusBeforeStart();
+            if (UI_.isActive()) FocusBeforeStart();
             if (canStart(args)) {
                 PerformPreparation();
                 //todo тут должна быть вилка на анимацию?
-                if (CommonUI.isActive() && needsAnimation()) {
+                if (UI_.isActive() && needsAnimation()) {
                     animation_sem = new Semaphore(1);
                     animation_sem.acquire();
                     //---
@@ -324,7 +324,7 @@ public class Pass<T> {
                             try {
                                 animation_sem.acquire();
                             } catch (InterruptedException e) {
-                                CommonUtils.MainLog.PrintException(e);
+                                Utils_.MainLog.PrintException(e);
                             }
                             //и уничтожаем его.
                             //  UI.Print(DebugPrintLevel.Passes, "Окно анимации активировано.");
@@ -375,19 +375,19 @@ public class Pass<T> {
             }
         } catch (Exception ex) {
             state = PassState.ExternalCrushed;
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
         //------------------------------->
         timer.Stop();
         if (!getDescription().isEmpty()) {
-            CommonUtils.MainLog.Print(
+            Utils_.MainLog.Print(
                     getDescription() +
                             " окончен за " + timer.Print() +
-                            " состояние " + CommonUtils.Brackets(state.getDescription())
+                            " состояние " + Utils_.Brackets(state.getDescription())
             );
-            if (!Log.isEmpty() && CommonUI.isActive())
-                CommonUI.Error(
-                        "проход " + CommonUtils.Brackets(getDescription()) + "\n" + state.getDescription() + "\n\n" +
+            if (!Log.isEmpty() && UI_.isActive())
+                UI_.Error(
+                        "проход " + Utils_.Brackets(getDescription()) + "\n" + state.getDescription() + "\n\n" +
                                 Log.toString());
         }
         //------------------------------->
@@ -395,7 +395,7 @@ public class Pass<T> {
     }
     //--
     public void ShowSapforMessage(String message) {
-        if (CommonUI.isActive() && form != null) {
+        if (UI_.isActive() && form != null) {
             String[] data = message.split(":");
             switch (data[0]) {
                 case "message_1":
@@ -408,17 +408,17 @@ public class Pass<T> {
                     form.fields.ProgressBar.setValue((data.length > 1) ? Integer.parseInt(data[1]) : 0);
                     break;
             }
-        } else System.out.println(CommonUtils.Brackets(message));
+        } else System.out.println(Utils_.Brackets(message));
     }
     public void ShowMessage1(String message) {
         if (form != null)
             form.fields.Label1.setText((message.length() > 1) ? message : "");
-        else System.out.println(CommonUtils.Brackets(message));
+        else System.out.println(Utils_.Brackets(message));
     }
     public void ShowMessage2(String message) {
         if (form != null)
             form.fields.Label2.setText((message.isEmpty() ? "" : message));
-        else System.out.println(CommonUtils.Brackets(message));
+        else System.out.println(Utils_.Brackets(message));
     }
     public void ShowProgress(int total, int current, boolean auto) {
         if (form != null) {
diff --git a/src/Common/Utils/Loggable.java b/src/Common/Utils/Loggable.java
index 0b181851..bf7efd51 100644
--- a/src/Common/Utils/Loggable.java
+++ b/src/Common/Utils/Loggable.java
@@ -1,5 +1,5 @@
 package Common.Utils;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Utils;
 
 import java.io.File;
@@ -23,7 +23,7 @@ public interface Loggable {
     default void Print(String message) {
         try {
             FileWriter Log = new FileWriter(getLogFile(), true);
-            String datedMessage = CommonUtils.Brackets(new Date()) + " " + message;
+            String datedMessage = Utils_.Brackets(new Date()) + " " + message;
             Log.write(datedMessage + "\n");
             Log.close();
         } catch (Exception ignored) {
@@ -35,8 +35,8 @@ public interface Loggable {
         ex.printStackTrace(writer);
         writer.flush();
         Print(out.toString());
-        if (CommonUI.isActive())
-            CommonUI.Error("Возникло исключение. Подробности в файле журнала\n" +
-                    CommonUtils.Brackets(getLogFile().getAbsolutePath()));
+        if (UI_.isActive())
+            UI_.Error("Возникло исключение. Подробности в файле журнала\n" +
+                    Utils_.Brackets(getLogFile().getAbsolutePath()));
     }
 }
diff --git a/src/Common/Utils/StringTemplate.java b/src/Common/Utils/StringTemplate.java
index 09ee4e40..50349d50 100644
--- a/src/Common/Utils/StringTemplate.java
+++ b/src/Common/Utils/StringTemplate.java
@@ -11,8 +11,8 @@ public class StringTemplate {
     public String pattern = "";
     //------------------------------------------------------------------
     public StringTemplate(String p, String s) {
-        prefix = CommonUtils.removeRedundantSpaces(p);
-        suffix = CommonUtils.removeRedundantSpaces(s);
+        prefix = Utils_.removeRedundantSpaces(p);
+        suffix = Utils_.removeRedundantSpaces(s);
         String[] prefix_words = prefix.split(" ");
         String[] suffix_words = suffix.split(" ");
         //настраиваем регулярное выражение----------
diff --git a/src/Common/Utils/TextLog.java b/src/Common/Utils/TextLog.java
index 2915c3f7..0d6c5654 100644
--- a/src/Common/Utils/TextLog.java
+++ b/src/Common/Utils/TextLog.java
@@ -6,7 +6,7 @@ public class TextLog {
     }
     public void Writeln_(String line) {
         text += line + "\n";
-        CommonUtils.MainLog.Print(line);
+        Utils_.MainLog.Print(line);
     }
     public void Clear() {
         text = "";
diff --git a/src/Common/Utils/CommonUtils.java b/src/Common/Utils/Utils_.java
similarity index 99%
rename from src/Common/Utils/CommonUtils.java
rename to src/Common/Utils/Utils_.java
index a7ca6928..121fcf6e 100644
--- a/src/Common/Utils/CommonUtils.java
+++ b/src/Common/Utils/Utils_.java
@@ -21,7 +21,7 @@ import java.util.Vector;
 import java.util.concurrent.Semaphore;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
-public class CommonUtils {
+public class Utils_ {
     static String HomePath = System.getProperty("user.dir");
     public static void setHomePath(String path_in){
         HomePath = path_in;
@@ -401,14 +401,14 @@ public class CommonUtils {
     }
     //Иконки
     public static ImageIcon getIcon(String path) {
-        URL imageUrl = CommonUtils.class.getResource(path);
+        URL imageUrl = Utils_.class.getResource(path);
         if (imageUrl == null) {
             return null;
         }
         return new ImageIcon(imageUrl);
     }
     public static ImageIcon getTabIcon(String path) {
-        URL imageUrl = CommonUtils.class.getResource(path);
+        URL imageUrl = Utils_.class.getResource(path);
         if (imageUrl == null) {
             return null;
         }
diff --git a/src/Common/Visual/ControlForm.java b/src/Common/Visual/ControlForm.java
index 245bd7df..40946a79 100644
--- a/src/Common/Visual/ControlForm.java
+++ b/src/Common/Visual/ControlForm.java
@@ -1,5 +1,5 @@
 package Common.Visual;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 import javax.swing.*;
 import java.awt.*;
@@ -34,7 +34,7 @@ public class ControlForm<C extends Component> {
         try {
             control = control_class.newInstance();
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public boolean isShown() {
diff --git a/src/Common/Visual/Controls/HyperlinksStyledList.java b/src/Common/Visual/Controls/HyperlinksStyledList.java
index 5fb3e258..f98d5093 100644
--- a/src/Common/Visual/Controls/HyperlinksStyledList.java
+++ b/src/Common/Visual/Controls/HyperlinksStyledList.java
@@ -1,10 +1,10 @@
 package Common.Visual.Controls;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 public class HyperlinksStyledList extends StyledList {
     @Override
     public void applyTheme() {
         super.applyTheme();
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
     }
 }
diff --git a/src/Common/Visual/Controls/MenuBarButton.java b/src/Common/Visual/Controls/MenuBarButton.java
index e5a0e885..df840bd0 100644
--- a/src/Common/Visual/Controls/MenuBarButton.java
+++ b/src/Common/Visual/Controls/MenuBarButton.java
@@ -1,6 +1,6 @@
 package Common.Visual.Controls;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
@@ -9,7 +9,7 @@ import java.awt.*;
 public class MenuBarButton extends JButton {
     public MenuBarButton() {
         super();
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
         //
         setBorderPainted(false);
         setContentAreaFilled(false);
@@ -27,9 +27,9 @@ public class MenuBarButton extends JButton {
         super.paintComponent(g);
     }
     public void setIcon(String icon_path) {
-        setIcon(CommonUtils.getIcon(icon_path));
+        setIcon(Utils_.getIcon(icon_path));
     }
     public void setFont(VisualiserFonts font_in){
-        setFont(CommonUI.getTheme().Fonts.get(font_in));
+        setFont(UI_.getTheme().Fonts.get(font_in));
     }
 }
diff --git a/src/Common/Visual/Controls/StyledList.java b/src/Common/Visual/Controls/StyledList.java
index 1eb0cad6..ed48f318 100644
--- a/src/Common/Visual/Controls/StyledList.java
+++ b/src/Common/Visual/Controls/StyledList.java
@@ -1,17 +1,17 @@
 package Common.Visual.Controls;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 public class StyledList extends JList implements ThemeElement {
     public StyledList() {
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         applyTheme();
     }
     @Override
     public void applyTheme() {
-        setBackground(CommonUI.getTheme().table_background);
-        setForeground(CommonUI.getTheme().foreground);
+        setBackground(UI_.getTheme().table_background);
+        setForeground(UI_.getTheme().foreground);
     }
 }
diff --git a/src/Common/Visual/Controls/StyledProgressBar.java b/src/Common/Visual/Controls/StyledProgressBar.java
index 31855931..2a58481f 100644
--- a/src/Common/Visual/Controls/StyledProgressBar.java
+++ b/src/Common/Visual/Controls/StyledProgressBar.java
@@ -1,5 +1,5 @@
 package Common.Visual.Controls;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Themes.ThemeElement;
 
 import javax.swing.*;
@@ -10,7 +10,7 @@ public class StyledProgressBar extends JProgressBar implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(CommonUI.getTheme().bar_background);
-        setForeground(CommonUI.getTheme().bar_foreground);
+        setBackground(UI_.getTheme().bar_background);
+        setForeground(UI_.getTheme().bar_foreground);
     }
 }
diff --git a/src/Common/Visual/DBObjectFilter.java b/src/Common/Visual/DBObjectFilter.java
index c32d4906..7c97cb25 100644
--- a/src/Common/Visual/DBObjectFilter.java
+++ b/src/Common/Visual/DBObjectFilter.java
@@ -1,5 +1,5 @@
 package Common.Visual;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Visual.Menus.StableMenuItem;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DataSet;
@@ -20,7 +20,7 @@ public abstract class DBObjectFilter<D extends DBObject> {
         return "/Common/icons/Pick.png";
     }
     void Mark() {
-        menuItem.setIcon(CommonUtils.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
+        menuItem.setIcon(Utils_.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
     }
     //-------
     public boolean Validate(D object) {
@@ -53,7 +53,7 @@ public abstract class DBObjectFilter<D extends DBObject> {
         count = 0;
     }
     public void Refresh() {
-        menuItem.setText(description + " " + CommonUtils.RBrackets(count));
+        menuItem.setText(description + " " + Utils_.RBrackets(count));
     }
     public boolean isActive() {
         return active;
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 240f0bae..60a59c83 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -1,7 +1,7 @@
 package Common.Visual;
 import Common.CommonConstants;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DataSet;
@@ -54,7 +54,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
     @Override
     public void Clear() {
         super.Clear();
-        CommonUI.Clear(dataPanel);
+        UI_.Clear(dataPanel);
     }
     public DataSet getDataSource() {
         return dataSource;
@@ -64,21 +64,21 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
         return getDataSource().CurrentName();
     }
     public void SaveColumns() {
-        if (CommonUtils.db != null) {
+        if (Utils_.db != null) {
             try {
                 if ((CurrentName() != null)) {
                     String tableName= CurrentName().toString();
                     Vector<String> widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new));
                     String packed = String.join("|", widths);
                     TableVisualData tableVisualData;
-                    if (CommonUtils.db.tablesVisualData.containsKey(tableName)) {
-                        tableVisualData = CommonUtils.db.tablesVisualData.get(tableName);
+                    if (Utils_.db.tablesVisualData.containsKey(tableName)) {
+                        tableVisualData = Utils_.db.tablesVisualData.get(tableName);
                     } else {
                         tableVisualData = new TableVisualData(tableName);
-                        CommonUtils.db.Insert(tableVisualData);
+                        Utils_.db.Insert(tableVisualData);
                     }
                     tableVisualData.sizes = packed;
-                    CommonUtils.db.Update(tableVisualData);
+                    Utils_.db.Update(tableVisualData);
                 }
             } catch (Exception ex) {
                 ex.printStackTrace();
@@ -149,9 +149,9 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
             //-----------------------------NEW-------------------------------------
             @Override
             public void CorrectColumnsSizes() {
-                if ((CommonUtils.db != null) && CurrentName() != null && CommonUtils.db.tablesVisualData.containsKey(CurrentName().toString())) {
+                if ((Utils_.db != null) && CurrentName() != null && Utils_.db.tablesVisualData.containsKey(CurrentName().toString())) {
                     if (!getColumnsProfile().equalsIgnoreCase(colNamesAndSizes)) {
-                        TableVisualData grid = CommonUtils.db.tablesVisualData.get(CurrentName().toString());
+                        TableVisualData grid = Utils_.db.tablesVisualData.get(CurrentName().toString());
                         String[] data = grid.sizes.split("\\|");
                         for (int i = 0; i < columns.size(); ++i) {
                             if (i <= (data.length - 1)) {
@@ -220,7 +220,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
                             try {
                                 ShowCurrentObject();
                             } catch (Exception ex) {
-                                CommonUtils.MainLog.PrintException(ex);
+                                Utils_.MainLog.PrintException(ex);
                             }
                         }
                     }
@@ -231,7 +231,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
                         try {
                             ShowNoCurrentObject();
                         } catch (Exception ex) {
-                            CommonUtils.MainLog.PrintException(ex);
+                            Utils_.MainLog.PrintException(ex);
                         }
                     }
                 }
@@ -244,7 +244,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
                         try {
                             MouseAction2();
                         } catch (Exception ex) {
-                            CommonUtils.MainLog.PrintException(ex);
+                            Utils_.MainLog.PrintException(ex);
                         }
                     }
                 }
@@ -255,7 +255,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
             try {
                 ShowNoCurrentObject();
             } catch (Exception e) {
-                CommonUtils.MainLog.PrintException(e);
+                Utils_.MainLog.PrintException(e);
             }
         }
         //---
diff --git a/src/Common/Visual/DragDrop/FileDrop.java b/src/Common/Visual/DragDrop/FileDrop.java
index 5e5e5620..5f541212 100644
--- a/src/Common/Visual/DragDrop/FileDrop.java
+++ b/src/Common/Visual/DragDrop/FileDrop.java
@@ -1,5 +1,5 @@
 package Common.Visual.DragDrop;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 import java.awt.datatransfer.DataFlavor;
 import java.io.*;
@@ -314,12 +314,12 @@ public class FileDrop {
                     }   // end try
                     catch (IOException io) {
                         log(out, "FileDrop: IOException - abort:");
-                        CommonUtils.MainLog.PrintException(io);
+                        Utils_.MainLog.PrintException(io);
                         evt.rejectDrop();
                     }   // end catch IOException
                     catch (java.awt.datatransfer.UnsupportedFlavorException ufe) {
                         log(out, "FileDrop: UnsupportedFlavorException - abort:");
-                        CommonUtils.MainLog.PrintException(ufe);
+                        Utils_.MainLog.PrintException(ufe);
                         evt.rejectDrop();
                     }   // end catch: UnsupportedFlavorException
                     finally {
@@ -446,7 +446,7 @@ public class FileDrop {
             dt.addDropTargetListener(dropListener);
         }   // end try
         catch (java.util.TooManyListenersException e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
             log(out, "FileDrop: Drop will not work due to previous error. Do you have another listener attached?");
         }   // end catch
         // Listen for hierarchy changes and remove the drop target when the parent gets cleared out.
diff --git a/src/Common/Visual/Menus/StyledPopupMenu.java b/src/Common/Visual/Menus/StyledPopupMenu.java
index 88b1a534..e2b53fc7 100644
--- a/src/Common/Visual/Menus/StyledPopupMenu.java
+++ b/src/Common/Visual/Menus/StyledPopupMenu.java
@@ -1,5 +1,5 @@
 package Common.Visual.Menus;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Themes.ThemeElement;
 
 import javax.swing.*;
@@ -21,15 +21,15 @@ public class StyledPopupMenu extends JPopupMenu implements ThemeElement {
         });
     }
     private void refreshTheme_r(MenuElement element) {
-        element.getComponent().setBackground(CommonUI.getTheme().background);
-        element.getComponent().setForeground(CommonUI.getTheme().foreground);
+        element.getComponent().setBackground(UI_.getTheme().background);
+        element.getComponent().setForeground(UI_.getTheme().foreground);
         for (MenuElement se : element.getSubElements())
             refreshTheme_r(se);
     }
     @Override
     public void applyTheme() {
-        setBackground(CommonUI.getTheme().background);
-        setForeground(CommonUI.getTheme().foreground);
+        setBackground(UI_.getTheme().background);
+        setForeground(UI_.getTheme().foreground);
         refreshTheme_r(this);
     }
     public void CheckElementsVisibility() {
diff --git a/src/Common/Visual/Menus/TableMenu.java b/src/Common/Visual/Menus/TableMenu.java
index 4e98299d..9255fec3 100644
--- a/src/Common/Visual/Menus/TableMenu.java
+++ b/src/Common/Visual/Menus/TableMenu.java
@@ -1,8 +1,6 @@
 package Common.Visual.Menus;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
-import Common.Visual.Menus.StyledPopupMenu;
-import Common.Visual.Menus.VisualiserMenuItem;
+import Common.Utils.Utils_;
 
 import javax.swing.*;
 public class TableMenu extends StyledPopupMenu {
@@ -16,7 +14,7 @@ public class TableMenu extends StyledPopupMenu {
         owner = owner_in;
         mcopy = new VisualiserMenuItem("Копировать текст текущей ячейки", "/icons/Editor/Copy.png");
         //если удалось нажать значит все условия выполнены
-        mcopy.addActionListener(e -> CommonUtils.CopyToClipboard(target.toString()));
+        mcopy.addActionListener(e -> Utils_.CopyToClipboard(target.toString()));
         add(mcopy);
     }
     @Override
diff --git a/src/Common/Visual/Menus/TextComboBoxMenu.java b/src/Common/Visual/Menus/TextComboBoxMenu.java
index d080741d..d830de3b 100644
--- a/src/Common/Visual/Menus/TextComboBoxMenu.java
+++ b/src/Common/Visual/Menus/TextComboBoxMenu.java
@@ -1,8 +1,6 @@
 package Common.Visual.Menus;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
-import Common.Visual.Menus.StyledPopupMenu;
-import Common.Visual.Menus.VisualiserMenuItem;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -20,7 +18,7 @@ public class TextComboBoxMenu extends StyledPopupMenu {
                 new AbstractAction() {
                     @Override
                     public void actionPerformed(ActionEvent e) {
-                        CommonUtils.CopyToClipboard(box.getSelectedItem().toString());
+                        Utils_.CopyToClipboard(box.getSelectedItem().toString());
                     }
                 });
         add(m_copy);
@@ -29,7 +27,7 @@ public class TextComboBoxMenu extends StyledPopupMenu {
                 new AbstractAction() {
                     @Override
                     public void actionPerformed(ActionEvent e) {
-                        CommonUI.TrySelect(box, CommonUtils.getFromClipboard());
+                        UI_.TrySelect(box, Utils_.getFromClipboard());
                     }
                 });
         add(m_paste);
diff --git a/src/Common/Visual/Menus/TextEditorMenu.java b/src/Common/Visual/Menus/TextEditorMenu.java
index ccd82341..170788d4 100644
--- a/src/Common/Visual/Menus/TextEditorMenu.java
+++ b/src/Common/Visual/Menus/TextEditorMenu.java
@@ -1,7 +1,5 @@
 package Common.Visual.Menus;
-import Common.Utils.CommonUtils;
-import Common.Visual.Menus.StyledPopupMenu;
-import Common.Visual.Menus.VisualiserMenuItem;
+import Common.Utils.Utils_;
 
 import javax.swing.*;
 import javax.swing.text.JTextComponent;
@@ -54,7 +52,7 @@ public class TextEditorMenu extends StyledPopupMenu {
                         String[] data = selectedText.split("\n");
                         Vector<String> new_data = new Vector<>();
                         for (String line: data){
-                            new_data.add(CommonUtils.strikeThrough(line));
+                            new_data.add(Utils_.strikeThrough(line));
                         }
                         editor.replaceSelection(String.join("\n", new_data));
                     }
@@ -68,7 +66,7 @@ public class TextEditorMenu extends StyledPopupMenu {
                         String[] data = selectedText.split("\n");
                         Vector<String> new_data = new Vector<>();
                         for (String line: data){
-                            new_data.add(CommonUtils.noStrikeThrough(line));
+                            new_data.add(Utils_.noStrikeThrough(line));
                         }
                         editor.replaceSelection(String.join("\n", new_data));
                     }
diff --git a/src/Common/Visual/Menus/VisualiserMenuItem.java b/src/Common/Visual/Menus/VisualiserMenuItem.java
index b6a39cdc..77aa7736 100644
--- a/src/Common/Visual/Menus/VisualiserMenuItem.java
+++ b/src/Common/Visual/Menus/VisualiserMenuItem.java
@@ -1,21 +1,21 @@
 package Common.Visual.Menus;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 public class VisualiserMenuItem extends JMenuItem {
     public VisualiserMenuItem(String text) {
         super(text, null);
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
     }
     public VisualiserMenuItem(String text, String icon_path) {
         super(text);
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
         if (icon_path != null)
-            setIcon(CommonUtils.getIcon(icon_path));
+            setIcon(Utils_.getIcon(icon_path));
     }
     public VisualiserMenuItem(){
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
     }
 }
diff --git a/src/Common/Visual/Selectable.java b/src/Common/Visual/Selectable.java
index fce1e6ba..5abe69c0 100644
--- a/src/Common/Visual/Selectable.java
+++ b/src/Common/Visual/Selectable.java
@@ -1,5 +1,5 @@
 package Common.Visual;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 import javax.swing.*;
 public interface Selectable {
@@ -13,11 +13,11 @@ public interface Selectable {
     default ImageIcon GetSelectionIcon() {
         return
                 isSelectionEnabled() ?
-                        CommonUtils.getIcon("/Common/icons/" + (isSelected() ? "Pick" : "NotPick") + ".png") :
+                        Utils_.getIcon("/Common/icons/" + (isSelected() ? "Pick" : "NotPick") + ".png") :
                         GetDisabledIcon();
     }
     default ImageIcon GetDisabledIcon() {
-        return CommonUtils.getIcon("/Common/icons/Arrays/Unknown.png");
+        return Utils_.getIcon("/Common/icons/Arrays/Unknown.png");
     }
     default void SwitchSelection() {
         Select(!isSelected());
diff --git a/src/Common/Visual/Tables/ColumnFilter.java b/src/Common/Visual/Tables/ColumnFilter.java
index cab422b0..2cdfde20 100644
--- a/src/Common/Visual/Tables/ColumnFilter.java
+++ b/src/Common/Visual/Tables/ColumnFilter.java
@@ -1,6 +1,6 @@
 package Common.Visual.Tables;
 import Common.Database.Tables.DataSet;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.TextField.StyledTextField;
 
 import javax.swing.*;
@@ -47,7 +47,7 @@ public class ColumnFilter {
         //--
         dataSet.getUi().control.getColumnModel().getColumn(columnIndex).setHeaderRenderer((table, value, isSelected, hasFocus, row, column1) -> new JLabel() {
             {
-                setIcon(CommonUtils.getIcon("/icons/Filter.png"));
+                setIcon(Utils_.getIcon("/icons/Filter.png"));
                 setForeground(dataSet.getUi().control.getTableHeader().getForeground());
                 setBackground(dataSet.getUi().control.getTableHeader().getBackground());
                 setFont(dataSet.getUi().control.getTableHeader().getFont());
diff --git a/src/Common/Visual/Tables/DateRenderer_.java b/src/Common/Visual/Tables/DateRenderer_.java
index 288fa70b..f28affb4 100644
--- a/src/Common/Visual/Tables/DateRenderer_.java
+++ b/src/Common/Visual/Tables/DateRenderer_.java
@@ -1,5 +1,5 @@
 package Common.Visual.Tables;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 import javax.swing.*;
 import java.util.Date;
@@ -13,6 +13,6 @@ public class DateRenderer_ extends RendererCell<Date> {
     @Override
     public void Display() {
         if (value != null)
-            setText(value.equals(zero) ? "нет" : CommonUtils.print_date(value));
+            setText(value.equals(zero) ? "нет" : Utils_.print_date(value));
     }
 }
diff --git a/src/Common/Visual/Tables/HiddenListRenderer.java b/src/Common/Visual/Tables/HiddenListRenderer.java
index 97aeb039..944fbec8 100644
--- a/src/Common/Visual/Tables/HiddenListRenderer.java
+++ b/src/Common/Visual/Tables/HiddenListRenderer.java
@@ -1,5 +1,5 @@
 package Common.Visual.Tables;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
@@ -12,6 +12,6 @@ public class HiddenListRenderer extends RendererCell<Vector<String>> {
     @Override
     public void Display() {
         setText(String.join(";", value));
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
     }
 }
diff --git a/src/Common/Visual/Tables/StatusEnumRenderer.java b/src/Common/Visual/Tables/StatusEnumRenderer.java
index f59ef8fc..84d4732d 100644
--- a/src/Common/Visual/Tables/StatusEnumRenderer.java
+++ b/src/Common/Visual/Tables/StatusEnumRenderer.java
@@ -1,5 +1,5 @@
 package Common.Visual.Tables;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.StatusEnum;
 
 import javax.swing.*;
@@ -12,7 +12,7 @@ public class StatusEnumRenderer extends RendererCell<StatusEnum> {
     public void Display() {
         if (value != null) {
             setText(value.getDescription());
-            setFont(CommonUI.getTheme().Fonts.get(value.getFont()));
+            setFont(UI_.getTheme().Fonts.get(value.getFont()));
         }
     }
 }
diff --git a/src/Common/Visual/Tables/StyledCellLabel.java b/src/Common/Visual/Tables/StyledCellLabel.java
index 4973dd55..5f3278f7 100644
--- a/src/Common/Visual/Tables/StyledCellLabel.java
+++ b/src/Common/Visual/Tables/StyledCellLabel.java
@@ -1,5 +1,5 @@
 package Common.Visual.Tables;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Fonts.VisualiserFonts;
 
@@ -7,7 +7,7 @@ import javax.swing.*;
 //наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы.
 public class StyledCellLabel extends JLabel implements ThemeElement {
     public StyledCellLabel() {
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         setHorizontalAlignment(SwingConstants.LEFT);
         setVerticalAlignment(SwingConstants.CENTER);
         setOpaque(true);
@@ -15,7 +15,7 @@ public class StyledCellLabel extends JLabel implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(CommonUI.getTheme().table_background);
-        setForeground(CommonUI.getTheme().foreground);
+        setBackground(UI_.getTheme().table_background);
+        setForeground(UI_.getTheme().foreground);
     }
 }
diff --git a/src/Common/Visual/Tables/StyledTable.java b/src/Common/Visual/Tables/StyledTable.java
index 74cc32af..8dbcd90a 100644
--- a/src/Common/Visual/Tables/StyledTable.java
+++ b/src/Common/Visual/Tables/StyledTable.java
@@ -1,5 +1,5 @@
 package Common.Visual.Tables;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Menus.TableMenu;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Fonts.VisualiserFonts;
@@ -16,9 +16,9 @@ public abstract class StyledTable extends JTable implements ThemeElement {
         setFillsViewportHeight(true);
         setAutoCreateRowSorter(dataModel.getRowCount() > 0);
         Init();
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         JTableHeader header = getTableHeader();
-        header.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        header.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         //текущий объет может определяться по первому столбцу. могут быть баги если не запретить
@@ -77,10 +77,10 @@ public abstract class StyledTable extends JTable implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(CommonUI.getTheme().table_background);
-        setForeground(CommonUI.getTheme().foreground);
-        setSelectionBackground(CommonUI.getTheme().selection_background);
-        setSelectionForeground(CommonUI.getTheme().foreground);
+        setBackground(UI_.getTheme().table_background);
+        setForeground(UI_.getTheme().foreground);
+        setSelectionBackground(UI_.getTheme().selection_background);
+        setSelectionForeground(UI_.getTheme().foreground);
     }
     public void SelectRow(int r) {
         getSelectionModel().setSelectionInterval(r, r);
diff --git a/src/Common/Visual/Tables/WrapTextRenderer.java b/src/Common/Visual/Tables/WrapTextRenderer.java
index 6247b30d..a7fe99e4 100644
--- a/src/Common/Visual/Tables/WrapTextRenderer.java
+++ b/src/Common/Visual/Tables/WrapTextRenderer.java
@@ -1,5 +1,5 @@
 package Common.Visual.Tables;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
@@ -10,7 +10,7 @@ public class WrapTextRenderer extends JTextArea implements TableCellRenderer {
         setLineWrap(true);
         setWrapStyleWord(true);
         // setOpaque(false);
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f));
     }
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
         setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());
diff --git a/src/Common/Visual/Themes/VisualiserTheme.java b/src/Common/Visual/Themes/VisualiserTheme.java
index 8f2e81f9..55f3e6d8 100644
--- a/src/Common/Visual/Themes/VisualiserTheme.java
+++ b/src/Common/Visual/Themes/VisualiserTheme.java
@@ -1,8 +1,7 @@
 package Common.Visual.Themes;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.VisualiserColor;
-import org.fife.ui.rsyntaxtextarea.Theme;
 
 import java.awt.*;
 import java.awt.font.TextAttribute;
@@ -169,7 +168,7 @@ public abstract class VisualiserTheme {
             table_background = Color.decode(getTableBackgroundHex());
             createFonts();
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
 }
diff --git a/src/Common/Visual/Trees/DataTree.java b/src/Common/Visual/Trees/DataTree.java
index e3cd82ee..8aa5203f 100644
--- a/src/Common/Visual/Trees/DataTree.java
+++ b/src/Common/Visual/Trees/DataTree.java
@@ -1,6 +1,6 @@
 package Common.Visual.Trees;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.DataControl_OLD;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -25,7 +25,7 @@ public class DataTree extends StyledTree implements DataControl_OLD {
         try {
             ShowCurrentObject();
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
     public void SelectNodeByCriteria(Object criteria) {
diff --git a/src/Common/Visual/Trees/GraphTreeCellRenderer.java b/src/Common/Visual/Trees/GraphTreeCellRenderer.java
index 0409714e..ca97cdf6 100644
--- a/src/Common/Visual/Trees/GraphTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/GraphTreeCellRenderer.java
@@ -1,6 +1,6 @@
 package Common.Visual.Trees;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 
@@ -15,11 +15,11 @@ public class GraphTreeCellRenderer extends StyledTreeCellRenderer {
         Object o = ((DefaultMutableTreeNode) value).getUserObject();
         if (o instanceof FileObjectWithMessages) {
             FileObjectWithMessages target = (FileObjectWithMessages) o;
-            setIcon(CommonUtils.getIcon(target.ImageKey()));
-            setFont(CommonUI.getTheme().Fonts.get(target.getFont()));
+            setIcon(Utils_.getIcon(target.ImageKey()));
+            setFont(UI_.getTheme().Fonts.get(target.getFont()));
         } else {
             setIcon(null);
-            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
         }
         setForeground(tree.getForeground());
         return this;
diff --git a/src/Common/Visual/Trees/SelectionTreeCellRenderer.java b/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
index 0e03f2d3..0eaf8b61 100644
--- a/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
@@ -1,5 +1,5 @@
 package Common.Visual.Trees;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Selectable;
 import Common.Visual.Fonts.VisualiserFonts;
 
@@ -17,7 +17,7 @@ public class SelectionTreeCellRenderer extends StyledTreeCellRenderer {
             setText(selectable.getSelectionText());
             setIcon(selectable.GetSelectionIcon());
         } else {
-            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
             setIcon(null);
         }
         setForeground(tree.getForeground());
diff --git a/src/Common/Visual/Trees/StyledTree.java b/src/Common/Visual/Trees/StyledTree.java
index 8d60804f..f9987c67 100644
--- a/src/Common/Visual/Trees/StyledTree.java
+++ b/src/Common/Visual/Trees/StyledTree.java
@@ -1,5 +1,5 @@
 package Common.Visual.Trees;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Visual.Menus.GraphMenu;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Fonts.VisualiserFonts;
@@ -22,7 +22,7 @@ public class StyledTree extends JTree implements ThemeElement {
         super(root_in);
         root = root_in;
         setOpaque(true);
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         setToggleClickCount(0);  //отключение сворачивание разворачивания по двойному клику
         //--
         if (!getRenderer().equals(TreeRenderers.RendererUndefined))
@@ -86,8 +86,8 @@ public class StyledTree extends JTree implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(CommonUI.getTheme().trees_background);
-        setForeground(CommonUI.getTheme().foreground);
+        setBackground(UI_.getTheme().trees_background);
+        setForeground(UI_.getTheme().foreground);
         menu.applyTheme();
     }
     protected GraphMenu createMenu() {
diff --git a/src/Common/Visual/Trees/StyledTreeCellRenderer.java b/src/Common/Visual/Trees/StyledTreeCellRenderer.java
index 1f043684..28481686 100644
--- a/src/Common/Visual/Trees/StyledTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/StyledTreeCellRenderer.java
@@ -1,5 +1,5 @@
 package Common.Visual.Trees;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Themes.ThemeElement;
 
 import javax.swing.tree.DefaultTreeCellRenderer;
@@ -9,7 +9,7 @@ public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements T
     }
     @Override
     public void applyTheme() {
-        setBackgroundNonSelectionColor(CommonUI.getTheme().trees_background);
-        setBackgroundSelectionColor(CommonUI.getTheme().selection_background);
+        setBackgroundNonSelectionColor(UI_.getTheme().trees_background);
+        setBackgroundSelectionColor(UI_.getTheme().selection_background);
     }
 }
diff --git a/src/Common/Visual/Trees/TreeForm.java b/src/Common/Visual/Trees/TreeForm.java
index d3fbbe96..7fc7fce2 100644
--- a/src/Common/Visual/Trees/TreeForm.java
+++ b/src/Common/Visual/Trees/TreeForm.java
@@ -1,5 +1,5 @@
 package Common.Visual.Trees;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.ControlForm;
 
 import java.awt.*;
@@ -25,6 +25,6 @@ public class TreeForm<C extends StyledTree> extends ControlForm<C> {
     @Override
     public void Clear() {
         super.Clear();
-        CommonUI.Clear(content);
+        UI_.Clear(content);
     }
 }
diff --git a/src/Common/Visual/CommonUI.java b/src/Common/Visual/UI_.java
similarity index 91%
rename from src/Common/Visual/CommonUI.java
rename to src/Common/Visual/UI_.java
index 81895024..c3990e0f 100644
--- a/src/Common/Visual/CommonUI.java
+++ b/src/Common/Visual/UI_.java
@@ -1,6 +1,6 @@
 package Common.Visual;
 import Common.Database.Tables.DataSet;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Themes.DefaultTheme;
 import Common.Visual.Themes.VisualiserTheme;
@@ -11,7 +11,7 @@ import javax.swing.text.DefaultFormatter;
 import java.awt.*;
 import java.util.LinkedHashMap;
 import java.util.Stack;
-public class CommonUI {
+public class UI_ {
     public static boolean active=false; //есть ли интерфейс. в консольных версиях не нужен.
     public static MenuElement[] last_menu_path; //для меню
     public static boolean isActive() {
@@ -75,7 +75,7 @@ public class CommonUI {
     }
     //Примитивные диалоговые элементы
     public static boolean Question(Component parent, String text) {
-        return !CommonUI.isActive() || (JOptionPane.showConfirmDialog(parent,
+        return !UI_.isActive() || (JOptionPane.showConfirmDialog(parent,
                 text + "?",
                 "Подтверждение",
                 JOptionPane.YES_NO_OPTION,
@@ -85,17 +85,17 @@ public class CommonUI {
         return Question(getFrontWindow(), text);
     }
     public static void Info(String message) {
-        CommonUtils.CopyToClipboard(message);
-        if (CommonUI.isActive())
+        Utils_.CopyToClipboard(message);
+        if (UI_.isActive())
             JOptionPane.showMessageDialog(getFrontWindow(), message, "", 1);
     }
     public static void Error(String message) {
-        CommonUtils.CopyToClipboard(message);
-        if (CommonUI.isActive())
+        Utils_.CopyToClipboard(message);
+        if (UI_.isActive())
             JOptionPane.showMessageDialog(getFrontWindow(), message, "", 0);
     }
     public static boolean Warning(String text) {
-        return !CommonUI.isActive() ||
+        return !UI_.isActive() ||
                 JOptionPane.showConfirmDialog(getFrontWindow(),
                         text + "\nВы уверены?",
                         "Подтверждение",
diff --git a/src/Common/Visual/Windows/Dialog/Dialog.java b/src/Common/Visual/Windows/Dialog/Dialog.java
index a9d7eef5..beecdafd 100644
--- a/src/Common/Visual/Windows/Dialog/Dialog.java
+++ b/src/Common/Visual/Windows/Dialog/Dialog.java
@@ -1,6 +1,6 @@
 package Common.Visual.Windows.Dialog;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Utils.TextLog;
@@ -35,9 +35,9 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
         setModal(true);
         toFront();
         getContentPane().setLayout(new BorderLayout());
-        lTitle.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
+        lTitle.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
         if (!getIconPath().isEmpty()) {
-            setIconImage(CommonUtils.getIcon(getIconPath()).getImage());
+            setIconImage(Utils_.getIcon(getIconPath()).getImage());
         }
         //делаем титульную надпись в самом окне чтобы не зависеть от языковой политики ОС
         getContentPane().add(lTitle, BorderLayout.NORTH);
@@ -51,7 +51,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
             public void windowClosing(WindowEvent e) {
-                CommonUI.windowsStack.pop();
+                UI_.windowsStack.pop();
                 onCancel();
                 onClose();
             }
@@ -65,7 +65,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
             content = (fields = f.newInstance()).getContent();
             //--?
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public void onClose() {
@@ -117,7 +117,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
         Init(params);
         ShowTitle();
         setAlwaysOnTop(isOnTop());
-        CommonUI.windowsStack.push(this);
+        UI_.windowsStack.push(this);
         setVisible(true);
         return OK;
     }
@@ -137,7 +137,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
             OK = true;
             CloseAction();
         } else
-            CommonUI.Error("Валидация не пройдена:\n" + Log.toString());
+            UI_.Error("Валидация не пройдена:\n" + Log.toString());
     }
     protected void onCancel() {
         CloseAction();
diff --git a/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java b/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
index b9d7fb65..64c1ceb2 100644
--- a/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
+++ b/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
@@ -1,12 +1,12 @@
 package Common.Visual.Windows.Dialog;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 import java.awt.*;
 public class DialogTextComboBox extends JComboBox<String> implements DialogFields {
     public DialogTextComboBox() {
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
         setEditable(false);
     }
     @Override
diff --git a/src/Common/Visual/Windows/Dialog/DialogWrapText.java b/src/Common/Visual/Windows/Dialog/DialogWrapText.java
index 31542ab8..f046e22d 100644
--- a/src/Common/Visual/Windows/Dialog/DialogWrapText.java
+++ b/src/Common/Visual/Windows/Dialog/DialogWrapText.java
@@ -1,5 +1,5 @@
 package Common.Visual.Windows.Dialog;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
@@ -8,7 +8,7 @@ public class DialogWrapText extends JTextPane implements DialogFields {
     public DialogWrapText(){
         setOpaque(true);
         setBackground(Color.WHITE);
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeBold));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeBold));
         setEditable(false);
     }
     @Override
diff --git a/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java b/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java
index 25f03ae1..c1c65586 100644
--- a/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java
+++ b/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java
@@ -1,5 +1,5 @@
 package Common.Visual.Windows.Dialog;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 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 !CommonUtils.ContainsCyrillic(f.getAbsolutePath());
+                return !Utils_.ContainsCyrillic(f.getAbsolutePath());
             }
             @Override
             public String getDescription() {
diff --git a/src/Common/Visual/Windows/Dialog/VFileChooser.java b/src/Common/Visual/Windows/Dialog/VFileChooser.java
index a963103d..b55d3084 100644
--- a/src/Common/Visual/Windows/Dialog/VFileChooser.java
+++ b/src/Common/Visual/Windows/Dialog/VFileChooser.java
@@ -1,5 +1,5 @@
 package Common.Visual.Windows.Dialog;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 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 !CommonUtils.ContainsCyrillic(f.getName())
+                return !Utils_.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 = CommonUtils.getExtension(file);
+        String file_ext = Utils_.getExtension(file);
         for (String ext : Extensions)
             if (ext.equalsIgnoreCase(file_ext)) return true;
         return false;
diff --git a/src/Common/Visual/Windows/Form.java b/src/Common/Visual/Windows/Form.java
index bb591781..eac0343a 100644
--- a/src/Common/Visual/Windows/Form.java
+++ b/src/Common/Visual/Windows/Form.java
@@ -1,5 +1,5 @@
 package Common.Visual.Windows;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Themes.ThemeElement;
 import Common.Database.Objects.DBForm.DBForm;
 
@@ -10,9 +10,9 @@ import java.awt.event.WindowEvent;
 public abstract class Form extends JFrame implements ThemeElement {
     private DBForm dbInfo = null;
     public Form() {
-        if (getIconPath()!=null) setIconImage(CommonUtils.getIcon(getIconPath()).getImage());
+        if (getIconPath()!=null) setIconImage(Utils_.getIcon(getIconPath()).getImage());
         SetListener();
-        this.setTitle(CommonUtils.isWindows() ? getWTitleText() : getUTitleText());
+        this.setTitle(Utils_.isWindows() ? getWTitleText() : getUTitleText());
         pack();
         setMinimumSize(new Dimension(getDefaultWidth(), getDefaultHeight()));
     }
@@ -54,7 +54,7 @@ public abstract class Form extends JFrame implements ThemeElement {
         try {
             LoadWindowParameters();
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         setContentPane(getMainPanel());
         setVisible(true);
@@ -63,7 +63,7 @@ public abstract class Form extends JFrame implements ThemeElement {
         try {
             SaveWindowParameters();
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         setVisible(false);
         dispose();
@@ -73,8 +73,8 @@ public abstract class Form extends JFrame implements ThemeElement {
     }
     public void LoadWindowParameters() throws Exception {
         if (getFormKey()!=null)
-            if (CommonUtils.db.forms.Data.containsKey(getFormKey())) {
-                dbInfo = CommonUtils.db.forms.Data.get(getFormKey());
+            if (Utils_.db.forms.Data.containsKey(getFormKey())) {
+                dbInfo = Utils_.db.forms.Data.get(getFormKey());
                 dbInfo.Apply(this);
                 return;
             }
@@ -85,9 +85,9 @@ public abstract class Form extends JFrame implements ThemeElement {
         if (getFormKey()!=null) {
             if (dbInfo != null) {
                 dbInfo.Init(this);
-                CommonUtils.db.Update(dbInfo);
+                Utils_.db.Update(dbInfo);
             } else
-                CommonUtils.db.Insert(new DBForm(getFormKey(), this));
+                Utils_.db.Insert(new DBForm(getFormKey(), this));
         }
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/AddBugReport.java b/src/Visual_DVM_2021/Passes/All/AddBugReport.java
index fd6c664f..f77fb3c5 100644
--- a/src/Visual_DVM_2021/Passes/All/AddBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/AddBugReport.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Database.Database;
 import _VisualDVM.GlobalData.GlobalDatabase;
@@ -40,7 +40,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
                     "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'", version);
             return true;
         } else {
-            if (CommonUI.Warning("Создать отчёт об ошибке без прикрепления проекта.")) {
+            if (UI_.Warning("Создать отчёт об ошибке без прикрепления проекта.")) {
                 target = new BugReport();
                 target.genName();
                 target.sender_name = Current.getAccount().name;
@@ -48,7 +48,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
                 target.project_version = "";
                 target.visualiser_version = Global.visualiser.version;
                 target.sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version;
-                target.sapfor_settings =((GlobalDatabase)CommonUtils.db).settings.getSapforSettingsText();
+                target.sapfor_settings =((GlobalDatabase) Utils_.db).settings.getSapforSettingsText();
                 target.percentage = 0;
                 target.description = "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'";
                 target.date = new Date().getTime();
@@ -72,7 +72,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
             //логи во вложения.
             File attachementsDir = Current.getProject().getAttachmentsDirectory();
             Vector<File> logs = new Vector<>();
-            logs.add(CommonUtils.MainLog.getLogFile());
+            logs.add(Utils_.MainLog.getLogFile());
             logs.add(Paths.get(Global.ComponentsDirectory.getAbsolutePath(), "Sapfor_log.txt").toFile());
             logs.add(Paths.get(Global.ComponentsDirectory.getAbsolutePath(), "Server_log.txt").toFile());
             logs.add(Global.Components.get(ComponentType.Visualizer_2).getLogFile());
@@ -86,7 +86,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
     }
     @Override
     protected boolean validate() {
-        double size = CommonUtils.getFileSizeMegaBytes(BugReportInterface.getArchiveFile(target));
+        double size = Utils_.getFileSizeMegaBytes(BugReportInterface.getArchiveFile(target));
         if (size > 100) {
             Log.Writeln_("Размер запакованного вложения " + size + " Мб превышает 100 Мб");
             return false;
diff --git a/src/Visual_DVM_2021/Passes/All/AddCompiler.java b/src/Visual_DVM_2021/Passes/All/AddCompiler.java
index 85807d70..763331c9 100644
--- a/src/Visual_DVM_2021/Passes/All/AddCompiler.java
+++ b/src/Visual_DVM_2021/Passes/All/AddCompiler.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Objects.DBObject;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Machine.Machine;
 import Common.Passes.AddObjectPass;
@@ -11,7 +11,7 @@ public class AddCompiler extends AddObjectPass<Compiler> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
     @Override
     public Class<? extends DBObject> getOwner() {
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java b/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java
index 886fa532..3621ee60 100644
--- a/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java
+++ b/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Objects.DBObject;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import Common.Passes.AddObjectPass;
@@ -15,6 +15,6 @@ public class AddDVMParameter extends AddObjectPass<DVMParameter> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java b/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
index d023c28d..a222d621 100644
--- a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
+++ b/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
@@ -20,9 +20,9 @@ public class AddDVMParameterForTesting extends Pass<String> {
                     if (name.isEmpty())
                         Log.Writeln("Имя параметра DVM системы не может быть пустым.");
                     if (Utils.isLinuxSystemCommand(name))
-                        Log.Writeln(CommonUtils.DQuotes(name) + " является системной командой Linux");
+                        Log.Writeln(Utils_.DQuotes(name) + " является системной командой Linux");
                     if (Utils.isLinuxSystemCommand(value))
-                        Log.Writeln(CommonUtils.DQuotes(value) + " является системной командой Linux");
+                        Log.Writeln(Utils_.DQuotes(value) + " является системной командой Linux");
                 }
                 @Override
                 public void ProcessResult() {
diff --git a/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java b/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java
index 04b865c4..da36f6cc 100644
--- a/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java
+++ b/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
 import Common.Passes.AddObjectPass;
 public class AddEnvironmentValue extends AddObjectPass<EnvironmentValue> {
@@ -9,6 +9,6 @@ public class AddEnvironmentValue extends AddObjectPass<EnvironmentValue> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/AddFile.java b/src/Visual_DVM_2021/Passes/All/AddFile.java
index b63c2e18..6130ca92 100644
--- a/src/Visual_DVM_2021/Passes/All/AddFile.java
+++ b/src/Visual_DVM_2021/Passes/All/AddFile.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.FileNameForm;
@@ -24,14 +24,14 @@ public class AddFile extends ChangeFilePass<DBProjectFile> {
             src = (File) args[0];
             mode = Mode.Import;
             fileName = src.getName();
-            if (CommonUtils.ContainsCyrillic(fileName)) {
-                Log.Writeln_("Имя файла " + CommonUtils.Brackets(fileName) + " содержит кириллицу.");
+            if (Utils_.ContainsCyrillic(fileName)) {
+                Log.Writeln_("Имя файла " + Utils_.Brackets(fileName) + " содержит кириллицу.");
                 return false;
             }
-            if (CommonUtils.ContainsForbiddenName(fileName)) {
-                Log.Writeln_("Имя файла " + CommonUtils.Brackets(fileName)
+            if (Utils_.ContainsForbiddenName(fileName)) {
+                Log.Writeln_("Имя файла " + Utils_.Brackets(fileName)
                         + " содержит запрещенные символы." +
-                        "\n" +  CommonUtils.printAllForbiddenCharacters());
+                        "\n" +  Utils_.printAllForbiddenCharacters());
                 return false;
             }
         } else {
@@ -46,12 +46,12 @@ public class AddFile extends ChangeFilePass<DBProjectFile> {
             //->
             dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();
             if (dst.exists()) {
-                Log.Writeln_("Файл с именем " + CommonUtils.Brackets(fileName) + " уже существует");
+                Log.Writeln_("Файл с именем " + Utils_.Brackets(fileName) + " уже существует");
                 return false;
             }
             target = new DBProjectFile(dst, project);
             if (target.fileType.equals(FileType.forbidden)) {
-                Log.Writeln_("Расширение " + CommonUtils.Brackets(CommonUtils.getExtension(dst)) + " недопустимо");
+                Log.Writeln_("Расширение " + Utils_.Brackets(Utils_.getExtension(dst)) + " недопустимо");
                 return false;
             }
             return true;
diff --git a/src/Visual_DVM_2021/Passes/All/AddMachine.java b/src/Visual_DVM_2021/Passes/All/AddMachine.java
index f76c00c1..2cea2711 100644
--- a/src/Visual_DVM_2021/Passes/All/AddMachine.java
+++ b/src/Visual_DVM_2021/Passes/All/AddMachine.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Compiler.CompilerType;
 import _VisualDVM.GlobalData.GlobalDatabase;
@@ -14,12 +14,12 @@ public class AddMachine extends AddObjectPass<Machine> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
         if (super.canStart(args)) {
-            if (target.type.equals(MachineType.Local) && ((GlobalDatabase)CommonUtils.db).machines.LocalMachineExists()) {
+            if (target.type.equals(MachineType.Local) && ((GlobalDatabase) Utils_.db).machines.LocalMachineExists()) {
                 Log.Writeln_("Локальная машина уже добавлена.");
                 return false;
             }
diff --git a/src/Visual_DVM_2021/Passes/All/AddMakefile.java b/src/Visual_DVM_2021/Passes/All/AddMakefile.java
index 5848f9d6..16b45090 100644
--- a/src/Visual_DVM_2021/Passes/All/AddMakefile.java
+++ b/src/Visual_DVM_2021/Passes/All/AddMakefile.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Objects.DBObject;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Module.Module;
@@ -25,6 +25,6 @@ public class AddMakefile extends AddObjectPass<Makefile> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java b/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java
index b0aabf2b..e25deab8 100644
--- a/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Objects.DBObject;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import Common.Passes.AddObjectPass;
@@ -15,6 +15,6 @@ public class AddRunConfiguration extends AddObjectPass<RunConfiguration> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/AddUser.java b/src/Visual_DVM_2021/Passes/All/AddUser.java
index 5bdd1013..5089eb94 100644
--- a/src/Visual_DVM_2021/Passes/All/AddUser.java
+++ b/src/Visual_DVM_2021/Passes/All/AddUser.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Database;
@@ -14,7 +14,7 @@ public class AddUser extends AddObjectPass<User> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
     @Override
     public Class<? extends DBObject> getOwner() {
diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java b/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
index de024a76..eba8a0b1 100644
--- a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
+++ b/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.Repository.BugReport.BugReport;
@@ -50,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" + CommonUtils.Brackets(CommonUtils.print_date(
+        newValue = oldValue + "\n" + Utils_.Brackets(Utils_.print_date(
                 new Date())) + " " + Current.getAccount().name
                 + " : " + addition;
         //2. дописываем нужное поле.
@@ -85,7 +85,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
         }
         passes.get(PassCode.Email).Do(
                 new EmailMessage(
-                        message_header + " " + CommonUtils.Brackets(Current.getAccount().name),
+                        message_header + " " + Utils_.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 e9ea162d..8249ee3f 100644
--- a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
+++ b/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
@@ -32,7 +32,7 @@ public class ApplyCurrentFunction extends Pass {
                     Current_.set(Current.Function, fi);
                     return true;
                 } else {
-                    Log.Writeln_("Проект не содержит процедуры с именем " + CommonUtils.Brackets(func_name));
+                    Log.Writeln_("Проект не содержит процедуры с именем " + Utils_.Brackets(func_name));
                 }
             }
         }
diff --git a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java b/src/Visual_DVM_2021/Passes/All/ApplyProfile.java
index aa85b8b2..10f61004 100644
--- a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java
+++ b/src/Visual_DVM_2021/Passes/All/ApplyProfile.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
@@ -33,12 +33,12 @@ public class ApplyProfile extends Pass<SapforProfile> {
     @Override
     protected void body() throws Exception {
         Vector<SapforProfileSetting> settings = new Vector<>();
-        for (SapforProfileSetting sapforProfileSetting : ((GlobalDatabase)CommonUtils.db).sapforProfilesSettings.Data.values())
+        for (SapforProfileSetting sapforProfileSetting : ((GlobalDatabase) Utils_.db).sapforProfilesSettings.Data.values())
             if (sapforProfileSetting.sapforprofile_id == target.id)
                 settings.add(sapforProfileSetting);
         //--
         for (SapforProfileSetting setting : settings)
-            if (((GlobalDatabase)CommonUtils.db).settings.containsKey(setting.name))
+            if (((GlobalDatabase) Utils_.db).settings.containsKey(setting.name))
                 passes.get(PassCode.UpdateSetting).Do(setting.name, setting.value);
         //--
     }
diff --git a/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java b/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
index 1f334df0..c9da25ee 100644
--- a/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
+++ b/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -22,7 +22,7 @@ public class ArchivesBackupPass extends ConnectionPass<File> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        String workspace_path = CommonUtils.toU(Paths.get(user.connection.sftpChannel.getHome(), Global.properties.BackupWorkspace).toString());
+        String workspace_path = Utils_.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 52791c87..9d637654 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CommonConstants;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Database.Database;
 import _VisualDVM.Global;
@@ -169,7 +169,7 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
         src_jsons = new Vector<>();
         for (DVMPackage src : srcPackages) {
             if (src.state.equals(TasksPackageState.Draft)) {
-                Log.Writeln_("Пакет " + CommonUtils.Brackets(src.id) + " является черновиком.");
+                Log.Writeln_("Пакет " + Utils_.Brackets(src.id) + " является черновиком.");
                 return false;
             }
             src_ids.add(src.id);
@@ -209,7 +209,7 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
                 target.tasksCount++;
             }
         }
-        return inexistingTests.isEmpty() || CommonUI.Question(inexistingTests.size() + " тестов отсутствует. Продолжить");
+        return inexistingTests.isEmpty() || UI_.Question(inexistingTests.size() + " тестов отсутствует. Продолжить");
     }
     @Override
     protected void body() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
index 5cb82ec4..0cec2e87 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CommonConstants;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Database.Database;
 import _VisualDVM.Global;
@@ -106,7 +106,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_("Пакет " + CommonUtils.Brackets(src.id) + " является черновиком.");
+                Log.Writeln_("Пакет " + Utils_.Brackets(src.id) + " является черновиком.");
                 return false;
             }
             src_ids.add(src.id);
@@ -174,7 +174,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
          */
         //--
         return inexistingTests.isEmpty() && inexistingConfigurations.isEmpty() ||
-                CommonUI.Question(
+                UI_.Question(
                         (inexistingTests.isEmpty() ? "" : (inexistingTests.size() + " тестов отсутствует;")) +
                                 (inexistingConfigurations.isEmpty() ? "" : (inexistingConfigurations.size() + " конфигураций отсутствует;")) +
                                 "Будет добавлено " + target.package_json.tasks.size() + " задач. Продолжить"
diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java b/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
index 9fad964c..6c66d421 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
+++ b/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -15,7 +15,7 @@ public class CloseCurrentFile extends Pass<DBProjectFile> {
     }
     @Override
     public Icon getTabIcon() {
-        return CommonUtils.getIcon("/icons/Close_18.png");
+        return Utils_.getIcon("/icons/Close_18.png");
     }
     @Override
     public String getButtonText() {
diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java b/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
index 0c22c6dc..337b742c 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
@@ -20,7 +20,7 @@ public class CloseCurrentProject extends Pass<db_project_info> {
     }
     @Override
     public Icon getTabIcon() {
-        return CommonUtils.getIcon("/icons/Close_18.png");
+        return Utils_.getIcon("/icons/Close_18.png");
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
@@ -40,7 +40,7 @@ public class CloseCurrentProject extends Pass<db_project_info> {
         Global.files_multiselection = false;
         //--
         Current.getSapfor().ResetAllAnalyses();
-        Current.getSapfor().cd(CommonUtils.getHomeDirectory());
+        Current.getSapfor().cd(Utils_.getHomeDirectory());
         Current_.set(Current.Project, null);
         Current_.set(Current.File, null);
         Current_.set(Current.Function, null);
diff --git a/src/Visual_DVM_2021/Passes/All/CloseProject.java b/src/Visual_DVM_2021/Passes/All/CloseProject.java
index 09e9fcb1..9bd82c78 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CloseProject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import Common.Passes.Pass;
@@ -16,7 +16,7 @@ public class CloseProject extends Pass<db_project_info> {
     @Override
     protected void performDone() throws Exception {
         Current.getSapfor().ResetAllAnalyses();
-        Current.getSapfor().cd(CommonUtils.getHomeDirectory());
+        Current.getSapfor().cd(Utils_.getHomeDirectory());
         Current_.set(Current.Project, null);
         //-
     }
diff --git a/src/Visual_DVM_2021/Passes/All/CombineFiles.java b/src/Visual_DVM_2021/Passes/All/CombineFiles.java
index fa01a905..7c3e29a1 100644
--- a/src/Visual_DVM_2021/Passes/All/CombineFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CombineFiles.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import _VisualDVM.Utils;
@@ -47,7 +47,7 @@ public class CombineFiles extends Transformation {
     @Override
     protected void body() throws Exception {
         result = Paths.get(target.last_version.Home.getAbsolutePath(),
-                CommonUtils.isWindows() ? fd.Result : CommonUtils.toU(fd.Result)).toFile();
+                Utils_.isWindows() ? fd.Result : Utils_.toU(fd.Result)).toFile();
         //-----------------------
         //получить список хедеров.
         //-----------------------
@@ -56,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 " + CommonUtils.Quotes(CommonUtils.toU(name)));
-            result_lines.add("!      include " + CommonUtils.Quotes(CommonUtils.toU(name)));
+            all_includes.add("      include " + Utils_.Quotes(Utils_.toU(name)));
+            result_lines.add("!      include " + Utils_.Quotes(Utils_.toU(name)));
         }
         result_lines.add("!-Collapse-" + target.files_order.size() + " files");
         int i = 1;
         for (String name : target.files_order) {
-            result_lines.add("! -- " + i + ". " + CommonUtils.Brackets(name));
+            result_lines.add("! -- " + i + ". " + Utils_.Brackets(name));
             ++i;
         }
         result_lines.add("!--------------------");
@@ -76,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 " + CommonUtils.Quotes(
-                                    CommonUtils.toU(
+                            result_lines.add("      include " + Utils_.Quotes(
+                                    Utils_.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 3e4b45bf..09d95469 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
@@ -26,8 +26,8 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
         //--
         target = Global.testingServer.db.dvmRunTasks.getCheckedItems();
         if (target.size() == 2) {
-            if (CommonUI.Question("Назначить задачу " + CommonUtils.Brackets(target.get(0).getPK()) + " эталоном" +
-                    "\n(в случае отказа, будет назначена задача " + CommonUtils.Brackets(target.get(1).getPK()) + ")")) {
+            if (UI_.Question("Назначить задачу " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" +
+                    "\n(в случае отказа, будет назначена задача " + Utils_.Brackets(target.get(1).getPK()) + ")")) {
                 master = target.get(0);
                 slave = target.get(1);
             } else {
@@ -38,11 +38,11 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
         } else if (target.size() == 1) {
             master = target.get(0);
             slave = null;
-            return CommonUI.Question("Отобразить задачу " + CommonUtils.Brackets(master.getPK()));
+            return UI_.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
         } else if ((target.size() == 0) && (Current.HasDVMRunTask())) {
             master = Current.getDVMRunTask();
             slave = null;
-            return CommonUI.Question("Отобразить задачу " + CommonUtils.Brackets(master.getPK()));
+            return UI_.Question("Отобразить задачу " + Utils_.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 d2892cd1..5999c608 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
@@ -26,8 +26,8 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
         //--
         target = Global.testingServer.db.sapforPackages.getCheckedItems();
         if (target.size() == 2) {
-            if (CommonUI.Question("Назначить пакет " + CommonUtils.Brackets(target.get(0).getPK()) + " эталоном" +
-                    "\n(в случае отказа, будет назначен пакет " + CommonUtils.Brackets(target.get(1).getPK()) + ")")) {
+            if (UI_.Question("Назначить пакет " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" +
+                    "\n(в случае отказа, будет назначен пакет " + Utils_.Brackets(target.get(1).getPK()) + ")")) {
                 master = target.get(0);
                 slave = target.get(1);
             } else {
@@ -38,11 +38,11 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
         } else if (target.size() == 1) {
             master = target.get(0);
             slave = null;
-            return CommonUI.Question("Отобразить пакет " + CommonUtils.Brackets(master.getPK()));
+            return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
         } else if ((target.size() == 0) && (Current.HasSapforPackage())) {
             master = Current.getSapforPackage();
             slave = null;
-            return CommonUI.Question("Отобразить пакет " + CommonUtils.Brackets(master.getPK()));
+            return UI_.Question("Отобразить пакет " + Utils_.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 6ff01148..3633ebe1 100644
--- a/src/Visual_DVM_2021/Passes/All/Compile.java
+++ b/src/Visual_DVM_2021/Passes/All/Compile.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.Utils;
@@ -35,7 +35,7 @@ public class Compile extends Pass<db_project_info> {
             subpass = null;
             compilationTask = null;
             if (Current.getUser().state != UserState.ready_to_work)
-                Log.Writeln_("Пользователь " + CommonUtils.Brackets(Current.getUser().login) +
+                Log.Writeln_("Пользователь " + Utils_.Brackets(Current.getUser().login) +
                         " не проинициализирован\nПерейдите на вкладку 'Настройки компиляции и запуска',\n" +
                         " и выполните команду 'Инициализация пользователя'\n");
             Current.getMakefile().Validate(Log);
@@ -54,26 +54,26 @@ public class Compile extends Pass<db_project_info> {
         //------------------------------------------
         compilationTask.CompleteSummary(target.compilation_maxtime);
         compilationTask.state = TaskState.Inactive;
-        CommonUtils.db.Insert(compilationTask);
+        Utils_.db.Insert(compilationTask);
         Utils.forceDeleteWithCheck(compilationTask.getLocalWorkspace());
     }
     @Override
     protected void showPreparation() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI(compilationTask.getPK());
+        ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(compilationTask.getPK());
     }
     @Override
     protected void body() throws Exception {
 
         switch (Current.getMachine().type) {
             case Local:
-                if (CommonUtils.isWindows()) {
+                if (Utils_.isWindows()) {
                     subpass = passes.get(PassCode.WindowsLocalCompilation);
                 } else
                     subpass = passes.get(PassCode.LinuxLocalCompilation);
                 break;
             case Undefined:
             case MVS_cluster:
-                throw new PassException("Компиляция не реализована для типа машины " + CommonUtils.DQuotes(Current.getMachine().type));
+                throw new PassException("Компиляция не реализована для типа машины " + Utils_.DQuotes(Current.getMachine().type));
             default:
                 subpass = passes.get(PassCode.RemoteCompilation);
                 break;
@@ -86,7 +86,7 @@ public class Compile extends Pass<db_project_info> {
     }
     @Override
     protected void showFinish() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI(compilationTask.getPK());
+        ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(compilationTask.getPK());
         UI.getDebugWindow().ShowLastCompilationTask();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
index d89ce055..07833129 100644
--- a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
+++ b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -31,7 +31,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
         if (!Current_.Check(Log, Current.ServerSapfor)){
             return false;
         }
-        return CommonUI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");
+        return UI_.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");
     }
     @Override
     protected boolean needsAnimation() {
diff --git a/src/Visual_DVM_2021/Passes/All/CopyProject.java b/src/Visual_DVM_2021/Passes/All/CopyProject.java
index 993ed273..02030ec0 100644
--- a/src/Visual_DVM_2021/Passes/All/CopyProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CopyProject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.Dialog;
 import _VisualDVM.Utils;
@@ -34,7 +34,7 @@ public class CopyProject extends CurrentProjectPass {
                 public void validateFields() {
                     Utils.validateFileShortNewName(fields.tfName.getText(), Log);
                     if (!fields.tfParent.getText().isEmpty()) {
-                        if (CommonUtils.ContainsCyrillic(fields.tfParent.getText()))
+                        if (Utils_.ContainsCyrillic(fields.tfParent.getText()))
                             Log.Writeln_("Путь к целевой папке не может содержать кириллицу!");
                     } else Log.Writeln_("Путь к целевой папке не может быть пустым!");
                     if (Log.isEmpty()) {
@@ -62,7 +62,7 @@ public class CopyProject extends CurrentProjectPass {
     }
     @Override
     protected void performDone() throws Exception {
-        if (CommonUI.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) {
+        if (UI_.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) {
             passes.get(PassCode.CloseCurrentProject).Do();
             passes.get(PassCode.OpenCurrentProject).Do(dstFile);
         }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
index 2d4a5061..8d4a6948 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
@@ -22,11 +22,11 @@ public class CreateEmptyDirectory extends ChangeFilePass {
             //->
             dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();
             if (dst.exists()) {
-                Log.Writeln("Файл с именем " + CommonUtils.Brackets(fileName) + " уже существует");
+                Log.Writeln("Файл с именем " + Utils_.Brackets(fileName) + " уже существует");
                 return false;
             }
             if (fileName.equalsIgnoreCase(Constants.data)) {
-                Log.Writeln(CommonUtils.Brackets(Constants.data) + " является зарезервированным именем!");
+                Log.Writeln(Utils_.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 5fd9e8ea..9c939917 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.Text.FileNameForm;
@@ -28,7 +28,7 @@ public class CreateEmptyProject extends Pass<File> {
             project_name = ff.Result;
             target = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), project_name).toFile();
             if (target.exists())
-                Log.Writeln("Файл\n" + CommonUtils.Brackets(target.getAbsolutePath()) + "\nуже существует");
+                Log.Writeln("Файл\n" + Utils_.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 72c75348..5db20d10 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
@@ -35,17 +35,17 @@ public class CreateGroupFromDirectory extends PublishTests {
         }
         //---------------
         if (!dir.isDirectory()) {
-            Log.Writeln_(CommonUtils.Brackets(dir) + "\nне является папкой!");
+            Log.Writeln_(Utils_.Brackets(dir) + "\nне является папкой!");
             return false;
         }
         if (dir.getName().equals(Constants.data)) {
-            Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
+            Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
             return false;
         }
         if (!Utils.validateProjectFile(dir, Log)) {
-            Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName())
+            Log.Writeln_("Имя папки " + Utils_.Brackets(dir.getName())
                     + " содержит запрещённые символы " +
-                    CommonUtils.printAllForbiddenCharacters() + ", или кириллицу.");
+                    Utils_.printAllForbiddenCharacters() + ", или кириллицу.");
             return false;
         }
         //--
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
index f0afc058..e58a2138 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.VFileChooser;
@@ -35,13 +35,13 @@ public class CreateGroupFromFiles extends PublishTests{
         Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
         //---------------
         if (dir.getName().equals(Constants.data)) {
-            Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
+            Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
             return false;
         }
         if (!Utils.validateProjectFile(dir, Log)) {
-            Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName())
+            Log.Writeln_("Имя папки " + Utils_.Brackets(dir.getName())
                     + " содержит запрещённые символы "
-                    +  CommonUtils.printAllForbiddenCharacters() + ", или кириллицу.");
+                    +  Utils_.printAllForbiddenCharacters() + ", или кириллицу.");
             return false;
         }
         if (passes.get(PassCode.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 6c127690..62b528a5 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
@@ -91,19 +91,19 @@ public class CreateTestFromDirectory extends Pass<Test> {
         int other_project_files = 0;
         //---
         if (dir.getName().equalsIgnoreCase(Constants.data)) {
-            Log.Writeln_("Папка " + CommonUtils.Brackets(dir) + " является служебной папкой визуализатора.");
+            Log.Writeln_("Папка " + Utils_.Brackets(dir) + " является служебной папкой визуализатора.");
             return false;
         }
         //--
-        if (CommonUtils.ContainsCyrillic(dir.getName()) || CommonUtils.ContainsForbiddenName(dir.getName())) {
-            Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName())
+        if (Utils_.ContainsCyrillic(dir.getName()) || Utils_.ContainsForbiddenName(dir.getName())) {
+            Log.Writeln_("Имя папки " + Utils_.Brackets(dir.getName())
                     + " содержит запрещённые символы "
-                    +  CommonUtils.printAllForbiddenCharacters() + ", или кириллицу.");
+                    +  Utils_.printAllForbiddenCharacters() + ", или кириллицу.");
             return false;
         }
         //--
         if (files == null) {
-            Log.Writeln_("Не удалось получить список файлов для папки " + CommonUtils.Brackets(dir) + ".");
+            Log.Writeln_("Не удалось получить список файлов для папки " + Utils_.Brackets(dir) + ".");
             return false;
         }
         //---
@@ -117,7 +117,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
                         !Utils.isVersion(file)) {
                     subdirs++;
                 }
-            } else if (file.isFile() && !CommonUtils.ContainsCyrillic(file.getName()) && !CommonUtils.ContainsForbiddenName(file.getName())) {
+            } else if (file.isFile() && !Utils_.ContainsCyrillic(file.getName()) && !Utils_.ContainsForbiddenName(file.getName())) {
                 //если файл. все недопустимые файлы просто игнорируются.
                 ProjectFile projectFile = new ProjectFile(file);
                 if (isNotExcluded(projectFile)) {
@@ -146,7 +146,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
         }
         //--
         if (subdirs > 0) {
-            Log.Writeln_("Папка " + CommonUtils.Brackets(dir) + " содержит вложенные подпапки,\n" +
+            Log.Writeln_("Папка " + Utils_.Brackets(dir) + " содержит вложенные подпапки,\n" +
                     "не являющиеся версиями или данными визуализатора");
             return false;
         }
@@ -174,7 +174,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
     }
     //-
     public File packTestCode() throws Exception {
-        target.temp_project_name = CommonUtils.getDateName("test");
+        target.temp_project_name = Utils_.getDateName("test");
         //-
         File tempProject = target.getTempProject();
         File tempArchive = target.getTempArchive();
@@ -190,7 +190,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
         //--
         ZipFolderPass zip = new ZipFolderPass();
         if (zip.Do(tempProject.getAbsolutePath(), tempArchive.getAbsolutePath())) {
-            target.project_archive_bytes = CommonUtils.fileToBytes(tempArchive);
+            target.project_archive_bytes = Utils_.fileToBytes(tempArchive);
         } else throw new PassException("Не удалось создать архив папки с кодом.");
         return tempProject;
     }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
index 469261d7..61424908 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Utils;
 import _VisualDVM.ProjectData.Files.FileType;
@@ -36,16 +36,16 @@ public class CreateTestFromFile extends Pass<Test> {
         File file_in = (File) args[0];
         group = (Group) args[1];
         //--
-        if (CommonUtils.ContainsCyrillic(file_in.getName()) || CommonUtils.ContainsForbiddenName(file_in.getName())) {
-            Log.Writeln_("Имя файла " + CommonUtils.Brackets(file_in.getName())
+        if (Utils_.ContainsCyrillic(file_in.getName()) || Utils_.ContainsForbiddenName(file_in.getName())) {
+            Log.Writeln_("Имя файла " + Utils_.Brackets(file_in.getName())
                     + " содержит запрещённые символы " +
-                    CommonUtils.printAllForbiddenCharacters() + ", или кириллицу.");
+                    Utils_.printAllForbiddenCharacters() + ", или кириллицу.");
             return false;
         }
         //--
         projectFile = new ProjectFile(file_in);
         if (!projectFile.fileType.equals(FileType.program) || !projectFile.languageName.equals(group.language)) {
-            Log.Writeln_("Не удалось распознать файл " + CommonUtils.Brackets(file_in.getName()) +
+            Log.Writeln_("Не удалось распознать файл " + Utils_.Brackets(file_in.getName()) +
                     " как программу на языке " + group.language.getDescription());
             return false;
         }
@@ -54,12 +54,12 @@ public class CreateTestFromFile extends Pass<Test> {
         target.sender_address = Current.getAccount().email;
         target.sender_name = Current.getAccount().name;
         target.group_id = group.id;
-        target.description = CommonUtils.getNameWithoutExtension(file_in.getName());
+        target.description = Utils_.getNameWithoutExtension(file_in.getName());
         target.files = file_in.getName();
         return true;
     }
     public File packTestCode() throws Exception {
-        target.temp_project_name = CommonUtils.getDateName("test");
+        target.temp_project_name = Utils_.getDateName("test");
         //-
         File tempProject = target.getTempProject();
         File tempArchive = target.getTempArchive();
@@ -73,7 +73,7 @@ public class CreateTestFromFile extends Pass<Test> {
         //--
         ZipFolderPass zip = new ZipFolderPass();
         if (zip.Do(tempProject.getAbsolutePath(), tempArchive.getAbsolutePath())) {
-            target.project_archive_bytes = CommonUtils.fileToBytes(tempArchive);
+            target.project_archive_bytes = Utils_.fileToBytes(tempArchive);
         } else throw new PassException("Не удалось создать архив папки с кодом.");
         return tempProject;
     }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
index 543dea45..b149b1c9 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.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -46,7 +46,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
             return false;
         }
         //---
-        return CommonUI.Question("В группу " + CommonUtils.Brackets(group.description) +
+        return UI_.Question("В группу " + Utils_.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 d6636a4b..5d427e39 100644
--- a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.Menus.PassMenuItem;
 import _VisualDVM.Visual.UI;
@@ -50,10 +50,10 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
                 return false;
             }
             for (DBProjectFile program : programsToConvert) {
-                if (CommonUtils.getFileSizeMegaBytes(program.file) > 1) {
-                    Log.Writeln_("Размер файла кода " + CommonUtils.Brackets(program.name) + " превышает 1 Мб.");
+                if (Utils_.getFileSizeMegaBytes(program.file) > 1) {
+                    Log.Writeln_("Размер файла кода " + Utils_.Brackets(program.name) + " превышает 1 Мб.");
                     return false;
-                } else programsNames.add(CommonUtils.toU(program.name));
+                } else programsNames.add(Utils_.toU(program.name));
             }
             workspace = Utils.getTempFileName("convertation");
             FileUtils.forceMkdir(workspace);
@@ -66,7 +66,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
                 return false;
             }
             ;
-            if (CommonUtils.getFileSizeMegaBytes(archive) > 500) {
+            if (Utils_.getFileSizeMegaBytes(archive) > 500) {
                 Log.Writeln_("Размер архива проекта превышает 500 МБ");
                 return false;
             }
@@ -95,11 +95,11 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
     @Override
     protected void ServerAction() throws Exception {
         ServerExchangeUnit_2021 unit = new ServerExchangeUnit_2021(ServerCode.DVMConvertProject);
-        unit.object = CommonUtils.fileToBytes(archive);
+        unit.object = Utils_.fileToBytes(archive);
         Vector<String> unit_args = new Vector<>();
         unit_args.add(target.name);
         unit_args.add(target.languageName.toString());
-        unit_args.add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.DVMConvertationOptions).toString());
+        unit_args.add(((GlobalDatabase) Utils_.db).settings.get(SettingName.DVMConvertationOptions).toString());
         unit_args.addAll(programsNames);
         unit.arg = String.join("\n", unit_args);
         Command(unit);
@@ -141,7 +141,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
                 Current.getFile().form.FocusCompilationOut();
         }
         if (!badFiles.isEmpty())
-            CommonUI.Error(badFiles);
+            UI_.Error(badFiles);
     }
     @Override
     protected void performDone() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java b/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java
index 1f7ccec2..0189bc71 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import Common.Passes.DeleteObjectPass;
 public class DeleteCompiler extends DeleteObjectPass<Compiler> {
@@ -9,6 +9,6 @@ public class DeleteCompiler extends DeleteObjectPass<Compiler> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java b/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java
index 59489582..c764fd6a 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
 import Common.Passes.DeleteObjectPass;
 public class DeleteDVMParameter extends DeleteObjectPass<DVMParameter> {
@@ -9,6 +9,6 @@ public class DeleteDVMParameter extends DeleteObjectPass<DVMParameter> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java b/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java
index 9c01c323..1af2d87a 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.Tasks.Task;
@@ -10,21 +10,21 @@ import java.util.stream.Collectors;
 public class DeleteDebugResults extends CurrentProjectPass {
     @Override
     protected void showPreparation() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).compilationTasks.ClearUI();
-        ((GlobalDatabase)CommonUtils.db).runTasks.ClearUI();
+        ((GlobalDatabase) Utils_.db).compilationTasks.ClearUI();
+        ((GlobalDatabase) Utils_.db).runTasks.ClearUI();
     }
     @Override
     protected void body() throws Exception {
-        Vector<Task> toDelete = ((GlobalDatabase)CommonUtils.db).compilationTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).collect(Collectors.toCollection(Vector::new));
-        ((GlobalDatabase)CommonUtils.db).runTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).forEach(toDelete::add);
+        Vector<Task> toDelete = ((GlobalDatabase) Utils_.db).compilationTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).collect(Collectors.toCollection(Vector::new));
+        ((GlobalDatabase) Utils_.db).runTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).forEach(toDelete::add);
         for (Task task : toDelete) {
             Utils.forceDeleteWithCheck(task.getLocalWorkspace());
-            CommonUtils.db.Delete(task);
+            Utils_.db.Delete(task);
         }
     }
     @Override
     protected void showFinish() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI();
-        ((GlobalDatabase)CommonUtils.db).runTasks.ShowUI();
+        ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI();
+        ((GlobalDatabase) Utils_.db).runTasks.ShowUI();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java b/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
index 53a4e677..83b07993 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.Utils;
@@ -28,7 +28,7 @@ public class DeleteDirectory extends ChangeFilePass {
                 Log.Writeln("Нельзя удалять домашнюю папку проекта.");
                 return false;
             }
-            return (CommonUI.Warning("Удалить папку\n" + CommonUtils.Brackets(target_dir.getAbsolutePath())
+            return (UI_.Warning("Удалить папку\n" + Utils_.Brackets(target_dir.getAbsolutePath())
                     + "\n и всё её содержимое."));
         } else Log.Writeln_("Папка не выделена.");
         return false;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
index 65707d39..86950642 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import Common.Visual.Windows.Dialog.Dialog;
@@ -24,7 +24,7 @@ public class DeleteDownloadedBugReports extends Pass<DirInfosDataSet> {
             target = (DirInfosDataSet) passes.get(PassCode.GetOldBugReports).target;
             if (target.Data.isEmpty()){
                 Log.Writeln_("Не найдено отчетов, не использовавшихся " +
-                        ((GlobalDatabase) CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).toInt32() +
+                        ((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).toInt32() +
                         " месяцев и более!");
                 return false;
             }
@@ -48,7 +48,7 @@ public class DeleteDownloadedBugReports extends Pass<DirInfosDataSet> {
                 }
             };
             if (dialog.ShowDialog("Найдено "+target.size()+" отчетов, не использовавшихся " +
-                    ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).toInt32()+
+                    ((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).toInt32()+
                     " месяцев и более. Удалить?")) {
                 return true;
             }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java b/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java
index 5e935af0..96ce6d16 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
 import Common.Passes.DeleteObjectPass;
 public class DeleteEnvironmentValue extends DeleteObjectPass<EnvironmentValue> {
@@ -9,6 +9,6 @@ public class DeleteEnvironmentValue extends DeleteObjectPass<EnvironmentValue> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteFile.java b/src/Visual_DVM_2021/Passes/All/DeleteFile.java
index 5b23c540..6022e5a5 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteFile.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteFile.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.Utils;
@@ -17,8 +17,8 @@ public class DeleteFile extends ChangeFilePass<DBProjectFile> {
     protected boolean canStart(Object... args) {
         resetArgs();
         return (Current_.Check(Log, Current.SelectedFile)) &&
-                CommonUI.Warning("Удалить файл "
-                        + CommonUtils.Brackets((target = Current.getSelectedFile()).name));
+                UI_.Warning("Удалить файл "
+                        + Utils_.Brackets((target = Current.getSelectedFile()).name));
     }
     @Override
     protected void performPreparation() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteMachine.java b/src/Visual_DVM_2021/Passes/All/DeleteMachine.java
index f0327713..4d82b5d9 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteMachine.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteMachine.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Machine.Machine;
 import Common.Passes.DeleteObjectPass;
 public class DeleteMachine extends DeleteObjectPass<Machine> {
@@ -9,6 +9,6 @@ public class DeleteMachine extends DeleteObjectPass<Machine> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
\ No newline at end of file
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java b/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java
index 781aaefb..ba68a2b7 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import Common.Passes.DeleteObjectPass;
 public class DeleteMakefile extends DeleteObjectPass<Makefile> {
@@ -9,6 +9,6 @@ public class DeleteMakefile extends DeleteObjectPass<Makefile> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteProfile.java b/src/Visual_DVM_2021/Passes/All/DeleteProfile.java
index c515e0cf..ad94e0c6 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteProfile.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteProfile.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
 import Common.Passes.DeleteObjectPass;
 public class DeleteProfile extends DeleteObjectPass<SapforProfile> {
@@ -9,6 +9,6 @@ public class DeleteProfile extends DeleteObjectPass<SapforProfile> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java b/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java
index 7c1af7e7..06175888 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import Common.Passes.DeleteObjectPass;
 public class DeleteRunConfiguration extends DeleteObjectPass<RunConfiguration> {
@@ -9,6 +9,6 @@ public class DeleteRunConfiguration extends DeleteObjectPass<RunConfiguration> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java
index de4d32c5..796a0a52 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
@@ -19,7 +19,7 @@ public class DeleteSelectedCompilationTasks extends Pass<Vector<CompilationTask>
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
-        ((GlobalDatabase)CommonUtils.db).compilationTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
+        ((GlobalDatabase) Utils_.db).compilationTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
         if (target.isEmpty()) {
             Log.Writeln_("Не отмечено ни одной задачи для удаления.");
             return false;
@@ -27,21 +27,21 @@ public class DeleteSelectedCompilationTasks extends Pass<Vector<CompilationTask>
     }
     @Override
     protected void showPreparation() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).compilationTasks.ClearUI();
+        ((GlobalDatabase) Utils_.db).compilationTasks.ClearUI();
     }
     @Override
     protected void body() throws Exception {
         for (CompilationTask task : target) {
             for (RunTask runTask : task.getRunTasks().values()) {
-                CommonUtils.db.Delete(runTask);
+                Utils_.db.Delete(runTask);
                 Utils.forceDeleteWithCheck(runTask.getLocalWorkspace());
             }
-            CommonUtils.db.Delete(task);
+            Utils_.db.Delete(task);
             Utils.forceDeleteWithCheck(task.getLocalWorkspace());
         }
     }
     @Override
     protected void showFinish() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI();
+        ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
index 3a05ab2b..8dfcb754 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.Utils;
@@ -18,7 +18,7 @@ public class DeleteSelectedFiles extends Pass {
             Log.Writeln_("Не отмечено ни одного файла.");
             return false;
         }
-        return CommonUI.Warning("Удалить " + Current.getProject().db.files.getCheckedCount() + " файлов.");
+        return UI_.Warning("Удалить " + Current.getProject().db.files.getCheckedCount() + " файлов.");
     }
     @Override
     protected void performPreparation() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java
index 785f3044..114848b7 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
@@ -18,7 +18,7 @@ public class DeleteSelectedRunTasks extends Pass<Vector<RunTask>> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
-        ((GlobalDatabase)CommonUtils.db).runTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
+        ((GlobalDatabase) Utils_.db).runTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
         if (target.isEmpty()) {
             Log.Writeln_("Не отмечено ни одной задачи для удаления.");
             return false;
@@ -26,17 +26,17 @@ public class DeleteSelectedRunTasks extends Pass<Vector<RunTask>> {
     }
     @Override
     protected void showPreparation() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).runTasks.ClearUI();
+        ((GlobalDatabase) Utils_.db).runTasks.ClearUI();
     }
     @Override
     protected void body() throws Exception {
         for (RunTask task : target) {
-            CommonUtils.db.Delete(task);
+            Utils_.db.Delete(task);
             Utils.forceDeleteWithCheck(task.getLocalWorkspace());
         }
     }
     @Override
     protected void showFinish() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).runTasks.ShowUI();
+        ((GlobalDatabase) Utils_.db).runTasks.ShowUI();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
index c36945e8..01c9c846 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Project.db_project_info;
@@ -45,7 +45,7 @@ public class DeleteSelectedVersions extends Pass<Vector<db_project_info>> {
                 }
             }
         }
-        return CommonUI.Warning("Удалить " + q + " версий.");
+        return UI_.Warning("Удалить " + q + " версий.");
     }
     @Override
     protected void body() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteUser.java b/src/Visual_DVM_2021/Passes/All/DeleteUser.java
index 2423e3fa..aeab3653 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteUser.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteUser.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.User.User;
 import Common.Passes.DeleteObjectPass;
 public class DeleteUser extends DeleteObjectPass<User> {
@@ -9,6 +9,6 @@ public class DeleteUser extends DeleteObjectPass<User> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java b/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
index f93a730b..e5fedfc4 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.Utils;
@@ -22,10 +22,10 @@ public class DeleteVersion extends Pass<db_project_info> {
             current = (Current.getVersion() != null) && Current.getVersion().Home.equals(target.Home);
             return true;
         } else {
-            if (((target = Current.getVersion()) != null) && (!CommonUI.isActive() ||
-                    CommonUI.Warning("Удалить " +
+            if (((target = Current.getVersion()) != null) && (!UI_.isActive() ||
+                    UI_.Warning("Удалить " +
                             ((Current.HasProject() && target.Home.equals(Current.getProject().Home)) ? "текущий проект" : "версию ")
-                            + CommonUtils.Brackets(target.name)))) {
+                            + Utils_.Brackets(target.name)))) {
                 current = true;
                 return true;
             }
@@ -40,7 +40,7 @@ public class DeleteVersion extends Pass<db_project_info> {
             if ((Current.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath())))
                 passes.get(PassCode.CloseCurrentProject).Do();
         }
-        if (CommonUI.isActive()) {
+        if (UI_.isActive()) {
             UI.getVersionsWindow().RemoveVersionFromComparison(target);
         }
     }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java b/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java
index da141043..db48fbcd 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
 import _VisualDVM.Repository.BugReport.BugReport;
@@ -22,7 +22,7 @@ public class DownloadBugReport extends ComponentsRepositoryPass<BugReport> {
     @Override
     protected void ServerAction() throws Exception {
         Command(new ServerExchangeUnit_2021(ServerCode.ReceiveBugReport, target.id));
-        CommonUtils.bytesToFile((byte[]) response.object, BugReportInterface.getArchiveFile(target));
+        Utils_.bytesToFile((byte[]) response.object, BugReportInterface.getArchiveFile(target));
     }
     @Override
     protected boolean validate() {
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadComponent.java b/src/Visual_DVM_2021/Passes/All/DownloadComponent.java
index 9dda8b13..9acbb2ee 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadComponent.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -11,6 +11,6 @@ public class DownloadComponent extends ComponentsRepositoryPass<Component> {
         target = Current.getComponent();
         String packed = target.getComponentType()+"\n"+target.getFileName();
         Command(new ServerExchangeUnit_2021(ServerCode.ReceiveComponent, packed));
-        CommonUtils.bytesToFile((byte[]) response.object, target.getNewFile());
+        Utils_.bytesToFile((byte[]) response.object, target.getNewFile());
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java
index de143b8b..5b7cd266 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
@@ -67,8 +67,8 @@ public class DownloadDVMPackages extends Pass<Vector<Integer>> {
             File loaded = new File(workspace, Constants.LOADED);
             Pair<byte[], byte[]> packed_package = p.getValue();
             //---
-            CommonUtils.bytesToFile(packed_package.getKey(), results_zip);
-            CommonUtils.bytesToFile(packed_package.getValue(), dvmPackage.getJsonFile());
+            Utils_.bytesToFile(packed_package.getKey(), results_zip);
+            Utils_.bytesToFile(packed_package.getValue(), dvmPackage.getJsonFile());
             passes.get(PassCode.UnzipFolderPass).Do(results_zip.getAbsolutePath(), workspace.getAbsolutePath());
             FileUtils.writeStringToFile(loaded, new Date().toString());
         }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadProject.java b/src/Visual_DVM_2021/Passes/All/DownloadProject.java
index 78144630..27204a7f 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadProject.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
@@ -29,8 +29,8 @@ public class DownloadProject extends CurrentConnectionPass {
             if ((user.connection.getFileKBSize(src.full_name)) <= maxSize) {
                 ShowMessage2("Запаковка папки проекта..");
                 user.connection.Command(
-                        "cd " + CommonUtils.DQuotes(src.full_name),
-                        "zip -r " + CommonUtils.DQuotes(remote_archive.full_name) + " ./"
+                        "cd " + Utils_.DQuotes(src.full_name),
+                        "zip -r " + Utils_.DQuotes(remote_archive.full_name) + " ./"
                 );
                 //  try {
                 ShowMessage2("Загрузка проекта..");
@@ -53,9 +53,9 @@ public class DownloadProject extends CurrentConnectionPass {
     @Override
     protected void performDone() throws Exception {
         File project = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
-                CommonUtils.getDateName(src.name)).toFile();
+                Utils_.getDateName(src.name)).toFile();
         if (passes.get(PassCode.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) {
-            if (CommonUI.Question("Проект " + CommonUtils.Brackets(src.name) + " успешно загружен. Открыть его"))
+            if (UI_.Question("Проект " + Utils_.Brackets(src.name) + " успешно загружен. Открыть его"))
                 passes.get(PassCode.OpenCurrentProject).Do(project);
         }
     }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java
index 1df0c98c..bf46162b 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
@@ -50,7 +50,7 @@ public class DownloadSapforPackage extends Pass<SapforPackage> {
         File workspace = target.getLocalWorkspace();
         Utils.forceDeleteWithCheck(workspace);
         File archive = Utils.getTempFileName(String.valueOf(target.id));
-        CommonUtils.bytesToFile(packed,archive);
+        Utils_.bytesToFile(packed,archive);
         passes.get(PassCode.UnzipFolderPass).Do(archive.getAbsolutePath(), Global.SapforPackagesDirectory.getAbsolutePath());
         FileUtils.writeStringToFile(loaded, new Date().toString());
     }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTest.java b/src/Visual_DVM_2021/Passes/All/DownloadTest.java
index f325cdfb..ffeab5fa 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadTest.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadTest.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
@@ -50,8 +50,8 @@ public class DownloadTest extends TestingSystemPass<Test> {
                 target.getArchive().getAbsolutePath(),
                 Global.visualiser.getWorkspace().getAbsolutePath(), false
         ))
-            if (CommonUI.Question("Тестовый проект успешно загружен под именем\n" +
-                    CommonUtils.Brackets(target.getHomePath().getName()) +
+            if (UI_.Question("Тестовый проект успешно загружен под именем\n" +
+                    Utils_.Brackets(target.getHomePath().getName()) +
                     "\nОткрыть его"))
                 passes.get(PassCode.OpenCurrentProject).Do(target.getHomePath());
     }
diff --git a/src/Visual_DVM_2021/Passes/All/DropFastAccess.java b/src/Visual_DVM_2021/Passes/All/DropFastAccess.java
index bf3a527c..68abf84b 100644
--- a/src/Visual_DVM_2021/Passes/All/DropFastAccess.java
+++ b/src/Visual_DVM_2021/Passes/All/DropFastAccess.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Visual.UI;
 import Common.Passes.Pass;
 public class DropFastAccess extends Pass {
@@ -11,7 +11,7 @@ public class DropFastAccess extends Pass {
     protected void body() throws Exception {
         for (Pass pass : Pass.FAPasses) {
             pass.stats.Drop();
-            CommonUtils.db.Update(pass.stats);
+            Utils_.db.Update(pass.stats);
         }
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/DropLastProjects.java b/src/Visual_DVM_2021/Passes/All/DropLastProjects.java
index bbcabb78..1398841b 100644
--- a/src/Visual_DVM_2021/Passes/All/DropLastProjects.java
+++ b/src/Visual_DVM_2021/Passes/All/DropLastProjects.java
@@ -1,10 +1,10 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
 import Common.Passes.Pass;
 public class DropLastProjects extends Pass {
     @Override
     protected void body() throws Exception {
-        CommonUtils.db.DeleteAll(DBLastProject.class);
+        Utils_.db.DeleteAll(DBLastProject.class);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditAccount.java b/src/Visual_DVM_2021/Passes/All/EditAccount.java
index d330bde9..01453c17 100644
--- a/src/Visual_DVM_2021/Passes/All/EditAccount.java
+++ b/src/Visual_DVM_2021/Passes/All/EditAccount.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Subscribes.Subscriber;
@@ -24,7 +24,7 @@ public class EditAccount extends Email {
     protected boolean canStart(Object... args) throws Exception {
         Subscriber res = new Subscriber(); // объект для заполнения полей.не более.
         if (f.ShowDialog("Регистрация", res)) {
-            if (!CommonUtils.validateEmail(res.address, Log)) {
+            if (!Utils_.validateEmail(res.address, Log)) {
                 return false;
             }
             name = res.name;
@@ -32,7 +32,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("Код подтверждения визуализатора для: " + CommonUtils.Brackets(name), password, rec));
+            return super.canStart(new EmailMessage("Код подтверждения визуализатора для: " + Utils_.Brackets(name), password, rec));
         }
         return false;
     }
@@ -46,13 +46,13 @@ public class EditAccount extends Email {
                     JOptionPane.INFORMATION_MESSAGE);
             if (attempt != null) {
                 if (attempt.equals(password)) {
-                    CommonUI.Info("Почта успешно подтверждена!");
+                    UI_.Info("Почта успешно подтверждена!");
                     return true;
                 } else {
-                    CommonUI.Error("Неверный код активации.\nПовторите попытку.");
+                    UI_.Error("Неверный код активации.\nПовторите попытку.");
                 }
             } else {
-                CommonUI.Info("Подтверждение почты отменено");
+                UI_.Info("Подтверждение почты отменено");
                 return false;
             }
         } while (true);
@@ -62,7 +62,7 @@ public class EditAccount extends Email {
         super.performDone();
         Current.getAccount().name = name;
         Current.getAccount().email = email;
-        CommonUtils.db.Update(Current.getAccount());
+        Utils_.db.Update(Current.getAccount());
         //это не регистрация. только заполнение почты в своей бд и ее подтверждение на реальность.
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditCompiler.java b/src/Visual_DVM_2021/Passes/All/EditCompiler.java
index c4f1323d..9870154d 100644
--- a/src/Visual_DVM_2021/Passes/All/EditCompiler.java
+++ b/src/Visual_DVM_2021/Passes/All/EditCompiler.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import Common.Passes.EditObjectPass;
 public class EditCompiler extends EditObjectPass<Compiler> {
@@ -9,6 +9,6 @@ public class EditCompiler extends EditObjectPass<Compiler> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java b/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java
index b4e5f7f4..780e2c36 100644
--- a/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java
+++ b/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
 import Common.Passes.EditObjectPass;
 public class EditDVMParameter extends EditObjectPass<DVMParameter> {
@@ -9,6 +9,6 @@ public class EditDVMParameter extends EditObjectPass<DVMParameter> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java b/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java
index dc1a66c4..961e60a3 100644
--- a/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java
+++ b/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
 import Common.Passes.EditObjectPass;
 public class EditEnvironmentValue extends EditObjectPass<EnvironmentValue> {
@@ -9,6 +9,6 @@ public class EditEnvironmentValue extends EditObjectPass<EnvironmentValue> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditMachine.java b/src/Visual_DVM_2021/Passes/All/EditMachine.java
index de642199..9b5d7086 100644
--- a/src/Visual_DVM_2021/Passes/All/EditMachine.java
+++ b/src/Visual_DVM_2021/Passes/All/EditMachine.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Machine.Machine;
 import Common.Passes.EditObjectPass;
 public class EditMachine extends EditObjectPass<Machine> {
@@ -9,6 +9,6 @@ public class EditMachine extends EditObjectPass<Machine> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditMakefile.java b/src/Visual_DVM_2021/Passes/All/EditMakefile.java
index 8e80edb0..1e237476 100644
--- a/src/Visual_DVM_2021/Passes/All/EditMakefile.java
+++ b/src/Visual_DVM_2021/Passes/All/EditMakefile.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import Common.Passes.EditObjectPass;
 public class EditMakefile extends EditObjectPass<Makefile> {
@@ -9,6 +9,6 @@ public class EditMakefile extends EditObjectPass<Makefile> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditModule.java b/src/Visual_DVM_2021/Passes/All/EditModule.java
index 6d32df68..bbca645c 100644
--- a/src/Visual_DVM_2021/Passes/All/EditModule.java
+++ b/src/Visual_DVM_2021/Passes/All/EditModule.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Module.Module;
 import Common.Passes.EditObjectPass;
 public class EditModule extends EditObjectPass<Module> {
@@ -9,6 +9,6 @@ public class EditModule extends EditObjectPass<Module> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditProfile.java b/src/Visual_DVM_2021/Passes/All/EditProfile.java
index 78ad20fd..2e89f74e 100644
--- a/src/Visual_DVM_2021/Passes/All/EditProfile.java
+++ b/src/Visual_DVM_2021/Passes/All/EditProfile.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
 import Common.Passes.EditObjectPass;
 public class EditProfile extends EditObjectPass<SapforProfile> {
@@ -9,6 +9,6 @@ public class EditProfile extends EditObjectPass<SapforProfile> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java b/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java
index 992f64f0..a6b2d63a 100644
--- a/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import Common.Passes.EditObjectPass;
 public class EditRunConfiguration extends EditObjectPass<RunConfiguration> {
@@ -9,6 +9,6 @@ public class EditRunConfiguration extends EditObjectPass<RunConfiguration> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditUser.java b/src/Visual_DVM_2021/Passes/All/EditUser.java
index e5e540b9..90da402e 100644
--- a/src/Visual_DVM_2021/Passes/All/EditUser.java
+++ b/src/Visual_DVM_2021/Passes/All/EditUser.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.User.User;
 import Common.Passes.EditObjectPass;
 public class EditUser extends EditObjectPass<User> {
@@ -9,6 +9,6 @@ public class EditUser extends EditObjectPass<User> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java b/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
index f5952f39..32f7e517 100644
--- a/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
+++ b/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.Transformation;
 import org.apache.commons.io.FileUtils;
@@ -13,13 +13,13 @@ public class EraseBadSymbols extends Transformation {
             String file_text = FileUtils.readFileToString(file.file);
             StringBuilder res_text = new StringBuilder();
             for (char c : file_text.toCharArray()) {
-                if (CommonUtils.isEnglishLetter(c) || Character.isDigit(c) || CommonUtils.isSign(c)) {
+                if (Utils_.isEnglishLetter(c) || Character.isDigit(c) || Utils_.isSign(c)) {
                     res_text.append(c);
-                } else if (CommonUtils.isRussianLetter(c))
-                    res_text.append(CommonUtils.Translit(c));
+                } else if (Utils_.isRussianLetter(c))
+                    res_text.append(Utils_.Translit(c));
                 else res_text.append(' ');
             }
-            File dst = Paths.get(target.last_version.Home.getAbsolutePath(), CommonUtils.isWindows() ? file.name : file.name.replace('\\', '/')).toFile();
+            File dst = Paths.get(target.last_version.Home.getAbsolutePath(), Utils_.isWindows() ? file.name : file.name.replace('\\', '/')).toFile();
             FileUtils.write(dst, res_text.toString());
         }
     }
diff --git a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
index 607f6d98..a989b487 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
@@ -89,7 +89,7 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
             Log.Writeln_("Папка не выбрана.");
             return false;
         }
-        res = new File(dir, CommonUtils.getDateName("packages") + ".xls");
+        res = new File(dir, Utils_.getDateName("packages") + ".xls");
         return true;
     }
     //---
@@ -105,7 +105,7 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
         long milliseconds = object.ChangeDate - object.StartDate;
         total_time += milliseconds;
         //--
-        lines.add("время выполнения " + CommonUtils.printSplittedDateInterval(milliseconds));
+        lines.add("время выполнения " + Utils_.printSplittedDateInterval(milliseconds));
         return String.join("; ", lines);
     }
     //---
@@ -251,7 +251,7 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
         return res;
     }
     String formatMatrix(String matrix) {
-        return CommonUtils.DQuotes(matrix.trim());
+        return Utils_.DQuotes(matrix.trim());
     }
     void createStyles() {
         styles = new Vector<>();
@@ -355,7 +355,7 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
             offset.Inc();
         }
         if (target.size() > 1) {
-            addInfoRow(offset.getValue(), "всего задач " + total_tasks_count + "; общее время выполнения " + CommonUtils.printSplittedDateInterval(total_time));
+            addInfoRow(offset.getValue(), "всего задач " + total_tasks_count + "; общее время выполнения " + Utils_.printSplittedDateInterval(total_time));
             offset.Inc();
         }
         addHeaderRow(offset.getValue(),
@@ -398,7 +398,7 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
     protected void performDone() throws Exception {
         super.performDone();
         if (Desktop.isDesktopSupported()) {
-            if (CommonUI.Question("Таблица сформирована в файле\n" + CommonUtils.DQuotes(res.getAbsolutePath()) + ".\nОткрыть её"
+            if (UI_.Question("Таблица сформирована в файле\n" + Utils_.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 6ca15b0e..ddedb523 100644
--- a/src/Visual_DVM_2021/Passes/All/GCOV.java
+++ b/src/Visual_DVM_2021/Passes/All/GCOV.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.Module.Module;
@@ -16,7 +16,7 @@ public class GCOV extends Precompilation {
         return new File(workspace, getBinaryName());
     }
     protected String getBinaryName() {
-        return CommonUtils.isWindows() ? "0.exe" : "0";
+        return Utils_.isWindows() ? "0.exe" : "0";
     }
     @Override
     public boolean needsConfirmations() {
@@ -67,7 +67,7 @@ public class GCOV extends Precompilation {
         if (getBinary().exists()) {
             ShowMessage1("Запуск для GCOV");
             name_to_kill = "0.exe";
-            StartProcess(CommonUtils.isWindows()?"0.exe":"./0", target.run_maxtime);
+            StartProcess(Utils_.isWindows()?"0.exe":"./0", target.run_maxtime);
             target.updateRunOut(output);
         } else {
             Log.Writeln_("Не удалось собрать проект.");
@@ -82,10 +82,10 @@ public class GCOV extends Precompilation {
             Utils.forceDeleteWithCheck(gcov);
             name_to_kill = "gcov.exe";
             StartProcess("gcov -b " +
-                    CommonUtils.DQuotes(
+                    Utils_.DQuotes(
                             Paths.get(workspace.getAbsolutePath(), uname))
                     + "  -o " +
-                    CommonUtils.DQuotes(
+                    Utils_.DQuotes(
                             Paths.get(workspace.getAbsolutePath(), gcno)
                     ), 40);
             if (gcov.exists()) {
@@ -93,7 +93,7 @@ public class GCOV extends Precompilation {
                 target.db.Update(file);
                 File targetGcov = Paths.get(
                         target.getGCOVDirectory().getAbsolutePath(),
-                        (CommonUtils.isWindows()?file.name:file.getUnixName()) + ".gcov").toFile();
+                        (Utils_.isWindows()?file.name:file.getUnixName()) + ".gcov").toFile();
                 Files.copy(gcov.toPath(), targetGcov.toPath(), StandardCopyOption.REPLACE_EXISTING);
             }
         }
diff --git a/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java b/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
index 07472678..2254d75d 100644
--- a/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
+++ b/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Visual.UI;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 import Visual_DVM_2021.Passes.PassCode;
@@ -28,7 +28,7 @@ public class GenerateParallelVariants extends CurrentProjectPass {
                 Log.Writeln_("Количество вариантов " + amount + "\nпревышает 1600. Отображение запрещено.");
                 return false;
             }
-            return CommonUI.Question("Будет отображено " + amount + " вариантов. Хотите продолжить");
+            return UI_.Question("Будет отображено " + amount + " вариантов. Хотите продолжить");
         }
         return false;
     }
diff --git a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java b/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
index 023089b3..ce4ef26a 100644
--- a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
@@ -30,7 +30,7 @@ public class GetOldBugReports extends Pass<DirInfosDataSet> {
             //---
             Calendar c = new GregorianCalendar();
             c.setTimeInMillis(System.currentTimeMillis());
-            c.add(Calendar.MONTH, -((GlobalDatabase) CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).toInt32());
+            c.add(Calendar.MONTH, -((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).toInt32());
             Date date = c.getTime();
             System.out.println(date);
             long border = date.getTime();
diff --git a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java b/src/Visual_DVM_2021/Passes/All/InitialiseUser.java
index 236d4010..8e0bf09c 100644
--- a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/InitialiseUser.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -43,7 +43,7 @@ public class InitialiseUser extends Pass {
                             if (passes.get(PassCode.PublishRemoteWorkspace).Do(workspace)) {
                                 Current.getUser().workspace = workspace.path;
                                 Current.getUser().state = UserState.ready_to_work;
-                                CommonUtils.db.Update(Current.getUser());
+                                Utils_.db.Update(Current.getUser());
                             }
                         }
                     }
@@ -51,7 +51,7 @@ public class InitialiseUser extends Pass {
                         //рега была. просто заносим то что там пользователю
                         Current.getUser().workspace = workspace.path;
                         Current.getUser().state = UserState.ready_to_work;
-                        CommonUtils.db.Update(Current.getUser());
+                        Utils_.db.Update(Current.getUser());
                     }
                 }
                 break;
@@ -61,6 +61,6 @@ public class InitialiseUser extends Pass {
     }
     @Override
     protected void showFinish() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).users.RefreshUI();
+        ((GlobalDatabase) Utils_.db).users.RefreshUI();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
index e45ed813..beffa062 100644
--- a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.User.User;
@@ -16,13 +16,13 @@ public class LocalInitaliseUser extends ProcessPass<User> {
     }
     @Override
     protected void body() throws Exception {
-        File workspace = new File(CommonUtils.getHomeDirectory(), "User");
+        File workspace = new File(Utils_.getHomeDirectory(), "User");
         target.workspace = workspace.getAbsolutePath();
         Utils.CheckAndCleanDirectory(workspace);
         FileUtils.forceMkdir(target.getLocalProjectsDir());
         FileUtils.forceMkdir(target.getLocalModulesDir());
         //-
-        if (!CommonUtils.isWindows()) {
+        if (!Utils_.isWindows()) {
             File headerCode = target.getHeaderCodeFile();
             //-
             File starterCode = target.getStarterCodeFile();
@@ -35,18 +35,18 @@ public class LocalInitaliseUser extends ProcessPass<User> {
             //-
             PerformScript(
                     String.join("\n",
-                            "cd " + CommonUtils.DQuotes(target.getLocalModulesDir()),
+                            "cd " + Utils_.DQuotes(target.getLocalModulesDir()),
                             "g++ starter -o starter",
                             "chmod 0777 starter"
                     ));
             PerformScript(String.join("\n",
-                    "cd " + CommonUtils.DQuotes(target.getLocalModulesDir()),
+                    "cd " + Utils_.DQuotes(target.getLocalModulesDir()),
                     "g++ launcher.cpp  -o launcher",
                     "chmod 0777 launcher"
             ));
         }
         //-
         target.state = UserState.ready_to_work;
-        CommonUtils.db.Update(target);
+        Utils_.db.Update(target);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java b/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java
index e647feea..4ca1fb58 100644
--- a/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java
+++ b/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 
 import javax.imageio.ImageIO;
@@ -21,7 +21,7 @@ public class MakeScreenShot extends CurrentProjectPass {
         int y = display.getHeight();
         BufferedImage bufferedImage = new Robot().createScreenCapture(new Rectangle(x, y));
         //-
-        String res_name = CommonUtils.getDateName("screenshot") + ".png";
+        String res_name = Utils_.getDateName("screenshot") + ".png";
         outputfile = Paths.get(target.getAttachmentsDirectory().getAbsolutePath(), res_name).toFile();
         //-
         ImageIO.write(bufferedImage, "png", outputfile);
diff --git a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java b/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
index 98496264..4e4fc45d 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.BugReport.BugReport;
@@ -30,8 +30,8 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
                 root = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
                         target.id).toFile();
                 project = Paths.get(root.getAbsolutePath(),
-                        CommonUtils.isWindows() ? CommonUtils.toW(target.project_version)
-                                : CommonUtils.toU(target.project_version)).toFile();
+                        Utils_.isWindows() ? Utils_.toW(target.project_version)
+                                : Utils_.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 3449cd8c..c080c8c4 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
@@ -59,11 +59,11 @@ public class OpenCurrentProject extends Pass<db_project_info> {
         }
         if ((dir != null) && needsOpen()) {
             if (!dir.isDirectory()) {
-                Log.Writeln_(CommonUtils.Brackets(dir) + "\nне является папкой!");
+                Log.Writeln_(Utils_.Brackets(dir) + "\nне является папкой!");
                 return false;
             }
             if (dir.getName().equals(Constants.data)) {
-                Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
+                Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
                 return false;
             }
             return Utils.validateProjectFolder(dir, Log) && Utils.containsSource(dir, true);
@@ -83,7 +83,7 @@ public class OpenCurrentProject extends Pass<db_project_info> {
                     db_project_info root = Current.getRoot();
                     db_project_info project = root.find_version_r(dir);
                     if (project != null) {
-                        CommonUtils.MainLog.Print("версия найдена в текущем корне");
+                        Utils_.MainLog.Print("версия найдена в текущем корне");
                         //версия уже существует. и выстраивать дерево второй раз не нужно.
                         //как и отображать дерево.
                         target = project;
@@ -114,13 +114,13 @@ public class OpenCurrentProject extends Pass<db_project_info> {
                 SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0")
         ;
         DBLastProject lastProject;
-        if (((GlobalDatabase)CommonUtils.db).lastProjects.containsKey(target.Home.getAbsolutePath())) {
-            lastProject = ((GlobalDatabase)CommonUtils.db).lastProjects.get(target.Home.getAbsolutePath());
+        if (((GlobalDatabase) Utils_.db).lastProjects.containsKey(target.Home.getAbsolutePath())) {
+            lastProject = ((GlobalDatabase) Utils_.db).lastProjects.get(target.Home.getAbsolutePath());
             lastProject.RefreshOpenTime();
-            CommonUtils.db.Update(lastProject);
+            Utils_.db.Update(lastProject);
         } else {
             lastProject = new DBLastProject(target);
-            CommonUtils.db.Insert(lastProject);
+            Utils_.db.Insert(lastProject);
         }
         target.setInfo(lastProject);
     }
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
index 6eb8c1b8..99445b7d 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
+++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CommonConstants;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Dialog;
 import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -82,13 +82,13 @@ public class PickCompilerEnvironments extends Pass<String> {
                     confEnv.run_configuration_id = Current.getRunConfiguration().id;
                     confEnv.name = compilerEnv.name;
                     confEnv.value = compilerEnv.value;
-                    CommonUtils.db.Insert(confEnv);
+                    Utils_.db.Insert(confEnv);
                 } else {
-                    confEnv = ((GlobalDatabase)CommonUtils.db).environmentValues.getEnvByName(compilerEnv.name);
+                    confEnv = ((GlobalDatabase) Utils_.db).environmentValues.getEnvByName(compilerEnv.name);
                     if (confEnv != null) {
                         confEnv.name = compilerEnv.name;
                         confEnv.value = compilerEnv.value;
-                        CommonUtils.db.Update(confEnv);
+                        Utils_.db.Update(confEnv);
                     }
                 }
             }
@@ -96,6 +96,6 @@ public class PickCompilerEnvironments extends Pass<String> {
     }
     @Override
     protected void showDone() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).environmentValues.ShowUI();
+        ((GlobalDatabase) Utils_.db).environmentValues.ShowUI();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
index 103bdfcc..58d07909 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
+++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Dialog;
 import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -54,7 +54,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass<String> {
         Vector<String> envs = new Vector<>();
         for (CompilerEnvironment compilerEnv : compiler.environments.Data.values()) {
             if (compilerEnv.isSelected())
-                envs.add(compilerEnv.name + "=" + CommonUtils.DQuotes(compilerEnv.value));
+                envs.add(compilerEnv.name + "=" + Utils_.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 a1350560..a3919378 100644
--- a/src/Visual_DVM_2021/Passes/All/Precompilation.java
+++ b/src/Visual_DVM_2021/Passes/All/Precompilation.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
@@ -50,9 +50,9 @@ public class Precompilation extends Pass<db_project_info> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = Current.getProject();
-        if (CommonUtils.isWindows()) {
+        if (Utils_.isWindows()) {
             //--
-            makepath = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).toString();
+            makepath = ((GlobalDatabase) Utils_.db).settings.get(SettingName.LocalMakePathWindows).toString();
             if (makepath.isEmpty()) {
                 Log.Writeln_("Не задан путь к make.exe.\n " +
                         "Укажите его в меню глобальных настроек." +
@@ -95,7 +95,7 @@ public class Precompilation extends Pass<db_project_info> {
         performanceTime = 0;
         exitCode = CommonConstants.Nan;
         //------------------
-        workspace = Paths.get(Global.TempDirectory.getAbsolutePath(), CommonUtils.getDateName("precompilation")).toFile();
+        workspace = Paths.get(Global.TempDirectory.getAbsolutePath(), Utils_.getDateName("precompilation")).toFile();
         FileUtils.forceMkdir(workspace);
         //------------------------------>>
         fortranCompiler = new Compiler();
@@ -169,7 +169,7 @@ public class Precompilation extends Pass<db_project_info> {
             } else {
                 //анализ начала строки.
                 for (String name : target.db.files.Data.keySet()) {
-                    if (S.startsWith(CommonUtils.toU(name))) {
+                    if (S.startsWith(Utils_.toU(name))) {
                         String[] data = S.split(":");
                         if (data.length > 1) {
                             messageFile = name;
@@ -186,17 +186,17 @@ public class Precompilation extends Pass<db_project_info> {
     }
     @Override
     protected void body() throws Exception {
-        if (CommonUtils.isWindows()) {
+        if (Utils_.isWindows()) {
             name_to_kill = "make.exe";
-            StartProcess(CommonUtils.DQuotes(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Kernels).toString(),
+            StartProcess(Utils_.DQuotes(((GlobalDatabase) Utils_.db).settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + ((GlobalDatabase) Utils_.db).settings.get(SettingName.Kernels).toString(),
                     target.compilation_maxtime);
         } else
-            StartProcess("make -j " + ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
+            StartProcess("make -j " + ((GlobalDatabase) Utils_.db).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
     }
     protected void StartProcess(String command, int TA) throws Exception {
         killed = false;
         output = "";
-        process = Utils.startScript(workspace, workspace, CommonUtils.getDateName("start_task_script"),
+        process = Utils.startScript(workspace, workspace, Utils_.getDateName("start_task_script"),
                 command,
                 null);
         outputLines.clear();
@@ -225,7 +225,7 @@ public class Precompilation extends Pass<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 + " " + CommonUtils.RBrackets(file.name);
+                String replacement = file.last_assembly_name + " " + Utils_.RBrackets(file.name);
                 output = output.replace(file.last_assembly_name, replacement);
             }
         }
@@ -248,14 +248,14 @@ public class Precompilation extends Pass<db_project_info> {
     }
     @Override
     public void Interrupt() throws Exception {
-        if (CommonUtils.isWindows()) {
+        if (Utils_.isWindows()) {
             if (!name_to_kill.isEmpty()) {
                 killed = true;
                 Process killer = Runtime.getRuntime().exec("taskkill /FI \"IMAGENAME eq " + name_to_kill + "\" /F /T");
                 killer.waitFor();
             }
         } else {
-            CommonUI.Info("Прерывание процессов под Linux не реализовано");
+            UI_.Info("Прерывание процессов под Linux не реализовано");
         }
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java b/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
index 4e8d97a1..ba736c93 100644
--- a/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
+++ b/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileType;
@@ -39,13 +39,13 @@ public class PrepareForModulesAssembly extends Transformation {
     protected void body() throws Exception {
         File total = Paths.get(target.last_version.Home.getAbsolutePath(), "total.for").toFile();
         while (total.exists()) {
-            total = Paths.get(target.last_version.Home.getAbsolutePath(), CommonUtils.getDateName("total") + ".for").toFile();
+            total = Paths.get(target.last_version.Home.getAbsolutePath(), Utils_.getDateName("total") + ".for").toFile();
             Thread.sleep(1000);
         }
         //--создать
         Vector<String> total_lines = new Vector<>();
         for (String name : target.files_order) {
-            total_lines.add("      include " + CommonUtils.Quotes(CommonUtils.toU(name)));
+            total_lines.add("      include " + Utils_.Quotes(Utils_.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 d310c80c..d5f854c4 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
@@ -33,7 +33,7 @@ public class PublishBugReport extends Pass<BugReport> {
             }
             if (target.executor.isEmpty()) {
                 UI.getMainWindow().getCallbackWindow().FocusRecipients();
-                if (!CommonUI.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его"))
+                if (!UI_.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его"))
                     return false;
             }
             if (!Current.getAccount().CheckAccessRights(target.sender_address, Log) && (BugReportInterface.CheckDraft(target, Log))) {
@@ -56,7 +56,7 @@ public class PublishBugReport extends Pass<BugReport> {
         passes.get(PassCode.SendBugReport).Do();
         Global.componentsServer.db.Update(target);
         //3- рассылка
-        EmailMessage message = new EmailMessage("Обнаружена ошибка " + CommonUtils.Brackets(target.id),
+        EmailMessage message = new EmailMessage("Обнаружена ошибка " + Utils_.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 fc38e1f6..2e0b6c4d 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishComponent.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
@@ -32,7 +32,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!CommonUtils.isWindows()) {
+        if (!Utils_.isWindows()) {
             Log.Writeln_("Публикация компонент разрешена только для Windows");
             return false;
         }
@@ -71,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(" ",
-                CommonUtils.Brackets(CommonUtils.print_date(new Date())) + ":",
-                Current.getAccount().name + CommonUtils.RBrackets(Current.getAccount().email),
-                "публикует версию", CommonUtils.DQuotes(target.version)
+                Utils_.Brackets(Utils_.print_date(new Date())) + ":",
+                Current.getAccount().name + Utils_.RBrackets(Current.getAccount().email),
+                "публикует версию", Utils_.DQuotes(target.version)
         );
         String change_record = String.join("\n", change_record_header, "Изменения:",
                 change_description,
@@ -85,14 +85,14 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
                         target.getVersionText() + "\n" +
                         change_record;
         Command(new ServerExchangeUnit_2021(ServerCode.PublishComponent,
-                packed, CommonUtils.fileToBytes(target.getFile())
+                packed, Utils_.fileToBytes(target.getFile())
         ));
         if (target.needs_update_minimal_version) {
             packed = target.getComponentType().toString() + "\n" +
                     target.getVersionText() + "\n";
             //--
             Command(new ServerExchangeUnit_2021(ServerCode.UpdateComponentMinimalVersion,
-                    packed, CommonUtils.fileToBytes(target.getFile())
+                    packed, Utils_.fileToBytes(target.getFile())
             ));
         }
     }
@@ -103,9 +103,9 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
         if ((f.Result != null)) {
             version_mail_header = String.join(" ",
                     "Опубликована версия",
-                    CommonUtils.DQuotes(target.version),
+                    Utils_.DQuotes(target.version),
                     "компонента",
-                    CommonUtils.DQuotes(target.getComponentType().getDescription()));
+                    Utils_.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 5ea39159..936374ed 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.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -67,7 +67,7 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
             return false;
         }
         //---
-        return CommonUI.Question("В группу " + CommonUtils.Brackets(group.description) +
+        return UI_.Question("В группу " + Utils_.Brackets(group.description) +
                 "\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
index d14dc69d..08d22107 100644
--- a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -26,7 +26,7 @@ public class RemoteInitialiseUser extends ConnectionPass<RemoteFile> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        String workspace_name = CommonUtils.getDateName("visual_sapfor_workspace");
+        String workspace_name = Utils_.getDateName("visual_sapfor_workspace");
         ShowMessage1("Создание рабочего пространства...");
         target = new RemoteFile(user.connection.sftpChannel.getHome(), workspace_name);
         user.connection.sftpChannel.mkdir(target.full_name);
diff --git a/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java b/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
index c95c88d7..227a4de9 100644
--- a/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass;
 public class RemoteSingleCommand extends CurrentConnectionPass<String> {
@@ -14,8 +14,8 @@ public class RemoteSingleCommand extends CurrentConnectionPass<String> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        RemoteFile file = new RemoteFile(user.connection.sftpChannel.getHome(), CommonUtils.getDateName("out"));
-        user.connection.Command(command + " 1>" + CommonUtils.DQuotes(file.full_name));
+        RemoteFile file = new RemoteFile(user.connection.sftpChannel.getHome(), Utils_.getDateName("out"));
+        user.connection.Command(command + " 1>" + Utils_.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 89feb817..c350a54c 100644
--- a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.FileNameForm;
@@ -35,7 +35,7 @@ public class RenameDirectory extends ChangeFilePass {
                 fileName = ff.Result;
                 dst = Paths.get(target_dir.getParentFile().getAbsolutePath(), fileName).toFile();
                 if (dst.exists()) {
-                    Log.Writeln("Файл с именем " + CommonUtils.Brackets(fileName) + " уже существует");
+                    Log.Writeln("Файл с именем " + Utils_.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 8aade79b..5fb78565 100644
--- a/src/Visual_DVM_2021/Passes/All/RenameFile.java
+++ b/src/Visual_DVM_2021/Passes/All/RenameFile.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.FileNameForm;
@@ -30,12 +30,12 @@ public class RenameFile extends ChangeFilePass<DBProjectFile> {
                 //->
                 dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();
                 if (dst.exists()) {
-                    Log.Writeln_("Файл с именем " + CommonUtils.Brackets(fileName) + " уже существует");
+                    Log.Writeln_("Файл с именем " + Utils_.Brackets(fileName) + " уже существует");
                     return false;
                 }
                 target = new DBProjectFile(dst, project);
                 if (target.fileType == FileType.forbidden)
-                    Log.Writeln_("Расширение " + CommonUtils.Brackets(CommonUtils.getExtension(dst)) + " недопустимо");
+                    Log.Writeln_("Расширение " + Utils_.Brackets(Utils_.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 0fbfd7ca..3cd9e7eb 100644
--- a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.VFileChooser;
@@ -45,12 +45,12 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
         Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
         //---------------
         if (dir.getName().equals(Constants.data)) {
-            Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
+            Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
             return false;
         }
         if (!Utils.validateProjectFile(dir, Log)) {
-            Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName()) + " содержит запрещённые символы "
-                    +  CommonUtils.printAllForbiddenCharacters()
+            Log.Writeln_("Имя папки " + Utils_.Brackets(dir.getName()) + " содержит запрещённые символы "
+                    +  Utils_.printAllForbiddenCharacters()
                     + ", или кириллицу.");
             return false;
         }
@@ -62,7 +62,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
         LinkedHashMap<String, File> filesByNames = new LinkedHashMap<>(); //выделенные файлы, сортированные по именам.
         //--
         for (File file : files) {
-            String name = CommonUtils.getNameWithoutExtension(file.getName()).toLowerCase();
+            String name = Utils_.getNameWithoutExtension(file.getName()).toLowerCase();
             if (!filesByNames.containsKey(name)) {
                 filesByNames.put(name, file);
             }
@@ -92,7 +92,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
             return false;
         }
         //--
-        if (CommonUI.Question(
+        if (UI_.Question(
                 testForReplaceNames.size() + " тестов будет заменено,\n" +
                         newTestsNames.size() + " тестов будет добавлено.\n" +
                         "Продолжить"
diff --git a/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java b/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java
index 599c2792..87d4844c 100644
--- a/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 import Visual_DVM_2021.Passes.PassCode;
@@ -15,7 +15,7 @@ public class ResetCurrentProject extends CurrentProjectPass {
     protected void body() throws Exception {
         target.CleanVersions();
         target.ResetDB();
-        CommonUtils.db.Delete(target.getInfo());
+        Utils_.db.Delete(target.getInfo());
     }
     @Override
     protected void performDone() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/Run.java b/src/Visual_DVM_2021/Passes/All/Run.java
index f5d1d156..ef66b5ce 100644
--- a/src/Visual_DVM_2021/Passes/All/Run.java
+++ b/src/Visual_DVM_2021/Passes/All/Run.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.Utils;
@@ -29,13 +29,13 @@ public class Run extends Pass<db_project_info> {
     protected void performPreparation() throws Exception {
         runTasks = Current.getRunConfiguration().generateRunTasks(target, Current.getCompilationTask());
         for (RunTask runTask : runTasks) {
-            CommonUtils.db.Insert(runTask);
+            Utils_.db.Insert(runTask);
             Utils.forceDeleteWithCheck(runTask.getLocalWorkspace());
         }
     }
     @Override
     protected void showPreparation() throws Exception {
-        ((GlobalDatabase)CommonUtils.db).runTasks.ShowUI();
+        ((GlobalDatabase) Utils_.db).runTasks.ShowUI();
     }
     @Override
     protected boolean canStart(Object... args) {
@@ -60,14 +60,14 @@ public class Run extends Pass<db_project_info> {
     protected void body() throws Exception {
         switch (Current.getMachine().type) {
             case Local:
-                if (CommonUtils.isWindows()) {
+                if (Utils_.isWindows()) {
                     subpass = passes.get(PassCode.WindowsLocalRun);
                 } else
                     subpass = passes.get(PassCode.LinuxLocalRun);
                 break;
             case Undefined:
             case MVS_cluster:
-                throw new PassException("Запуск не реализован для типа машины " + CommonUtils.DQuotes(Current.getMachine().type));
+                throw new PassException("Запуск не реализован для типа машины " + Utils_.DQuotes(Current.getMachine().type));
                 /*
             case MVS_cluster:
                 subpass = passes.get(PassCode_2021.MVSRun);
@@ -84,8 +84,8 @@ public class Run extends Pass<db_project_info> {
             boolean task_completed = false;
             task.setProgress(i, runTasks.size());
             //-
-            ((GlobalDatabase)CommonUtils.db).runTasks.RefreshUI();
-            ((GlobalDatabase)CommonUtils.db).runTasks.SetCurrentObjectUI(task.id);
+            ((GlobalDatabase) Utils_.db).runTasks.RefreshUI();
+            ((GlobalDatabase) Utils_.db).runTasks.SetCurrentObjectUI(task.id);
             //-
             subpass.Do(task, target);
             //-
@@ -105,7 +105,7 @@ public class Run extends Pass<db_project_info> {
                     break;
             }
             //-
-            ((GlobalDatabase)CommonUtils.db).runTasks.RefreshUI();
+            ((GlobalDatabase) Utils_.db).runTasks.RefreshUI();
             UI.getDebugWindow().ShowCurrentRunTask();
             //-
             if (!task_completed) break;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java b/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
index e606df47..3acf6174 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
 import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 import Visual_DVM_2021.Passes.PassCode;
@@ -65,7 +65,7 @@ public class SPF_CreateParallelVariant extends SapforTransformation {
     protected void performDone() throws Exception {
         Global.transformationPermission = TransformationPermission.VariantsOnly;
         target.migrateFilesSettings(target.last_version, true, true);
-        if (CommonUI.isActive())
+        if (UI_.isActive())
             variant.UpdateStats(sapfor.getPredictorStats(), target.last_version.name);
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
index fbc25518..ea157b5e 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.Settings.SettingName;
@@ -30,8 +30,8 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.MPI_PROGRAM).toBoolean()) {
-            CommonUI.Info("Включена настройка SAPFOR 'MPI программа'." +
+        if (((GlobalDatabase) Utils_.db).settings.get(SettingName.MPI_PROGRAM).toBoolean()) {
+            UI_.Info("Включена настройка SAPFOR 'MPI программа'." +
                     "\nПостроение распределения данных невозможно.");
             passes.get(PassCode.SPF_SharedMemoryParallelization).Do();
             return false;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
index 17a6a8af..59a619bb 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Visual.Controls.PassControl;
 import _VisualDVM.Visual.UI;
 import Common.Utils.Index;
@@ -73,7 +73,7 @@ public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
     }
     @Override
     public String getDescription() {
-        return ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.MPI_PROGRAM).toBoolean()?
+        return ((GlobalDatabase) Utils_.db).settings.get(SettingName.MPI_PROGRAM).toBoolean()?
                 "Анализ кода (общая память)":"Анализ кода";
     }
     public void RefreshControls(){
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java b/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java
index 9dde88d5..414ff86f 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.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(CommonUtils.toW(s));
+                file_ = target.db.files.Data.get(Utils_.toW(s));
             } else {
                 String[] local = s.split("_");
                 int num = Integer.parseInt(local[0]);
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
index 3b527eb2..853ed660 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import Common.Passes.PassState;
@@ -21,7 +21,7 @@ public class SPF_GetGCovInfo extends SilentSapforPass {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (CommonUI.Question("Все анализы будут сброшены.Продолжить")) {
+        if (UI_.Question("Все анализы будут сброшены.Продолжить")) {
             SPF_ParseFilesWithOrder.silent = true;
             return super.canStart(args) && passes.get(PassCode.GCOV).Do()&&passes.get(PassCode.SPF_ParseFilesWithOrder).Do();
         }
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
index e0259052..afc6a477 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import Common.Utils.Index;
@@ -55,7 +55,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 = CommonUtils.toW(splited[idx.Inc()]);
+            String fileName = Utils_.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 40501270..65f51422 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import Common.Utils.Index;
@@ -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_ = CommonUtils.toW(splitedPackedGraph[i]);
+            String name_ = Utils_.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 219e64b1..94622419 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.Utils;
@@ -39,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 = CommonUtils.toW(data_[i]);
+            String s = Utils_.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 4027843a..782467e6 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.GlobalData.Settings.SettingName;
@@ -42,7 +42,7 @@ public class SPF_InlineProcedures extends SapforTransformation {
                 );
                 return false;
             }
-            Options = CommonUtils.toU(String.join("|", Result));
+            Options = Utils_.toU(String.join("|", Result));
             Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
             SPF_ParseFilesWithOrder.silent = true;
             return passes.get(PassCode.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 7bba649d..aa7e9291 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.GlobalData.Settings.SettingName;
@@ -72,7 +72,7 @@ public class SPF_InlineProceduresH extends SapforTransformation {
                     Result.add(call.isSelected() ? "1" : "0");
                 }
             }
-            Options = CommonUtils.toU(String.join("|", Result));
+            Options = Utils_.toU(String.join("|", Result));
             Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
             SPF_ParseFilesWithOrder.silent = true;
             return passes.get(PassCode.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 27577c8f..81a03e77 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Selectable;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo;
@@ -35,7 +35,7 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
                 Log.Writeln_("Не отмечено ни одного заголовка для подстановки");
                 return false;
             }
-            Options = CommonUtils.toU(String.join("|", Result));
+            Options = Utils_.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 aeee61bc..19735c82 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -45,7 +45,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
         precompilation_done = false;
         boolean res = (
                 silent ||
-                        (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Precompilation).toBoolean() ||
+                        (!((GlobalDatabase) Utils_.db).settings.get(SettingName.Precompilation).toBoolean() ||
                                 (precompilation_done = passes.get(PassCode.Precompilation).Do())))
                 && super.canStart(args) && checkActiveFiles();
         return res;
@@ -75,7 +75,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
                     case HasNotes:
                     case HasWarnings:
                         if (f.isActiveProgram())
-                            projLines.add(CommonUtils.toU(f.getDepFile().getAbsolutePath()));
+                            projLines.add(Utils_.toU(f.getDepFile().getAbsolutePath()));
                         goodCount++;
                         break;
                     case HasErrors:
@@ -97,7 +97,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
             }
             if (goodCount == 0) {
                 Log.Writeln_("Не найдено ни одного успешно проанализированного файла на языке проекта :" +
-                        CommonUtils.DQuotes(target.languageName.getDescription()));
+                        Utils_.DQuotes(target.languageName.getDescription()));
                 return false;
             }
             return true;
@@ -107,13 +107,13 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
     @Override
     protected void unpack(String packed) throws Exception {
         for (String fileName_ : packed.split("\\|"))
-            target.files_order.add(CommonUtils.toW(fileName_));
+            target.files_order.add(Utils_.toW(fileName_));
     }
     @Override
     protected void performPreparation() throws Exception {
         super.performPreparation(); //удаление интеррупта.
         //------------------------------------------------------------------------------------------>>> пакетный режим.
-        if (!precompilation_done && CommonUI.isActive()) {
+        if (!precompilation_done && UI_.isActive()) {
             passes.get(PassCode.Save).Do();
             target.CleanAnalyses();
         }
@@ -128,7 +128,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
         //---------------------------
         for (DBProjectFile f : target.db.files.Data.values()) {
             if (f.isActiveProgram()) {
-                projLines.add(CommonUtils.toU(f.file.getAbsolutePath()));
+                projLines.add(Utils_.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 86f009c5..c6d32833 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.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(),
-                CommonUtils.DQuotes(task.getLocalStsFile().getAbsolutePath()) +
+                Utils_.DQuotes(task.getLocalStsFile().getAbsolutePath()) +
                         " "
-                        + CommonUtils.DQuotes(target.getStsFile().getAbsolutePath()));
+                        + Utils_.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 3e8df457..e3128313 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveGraph.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveGraph.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
@@ -43,7 +43,7 @@ public class SaveGraph extends Pass<File> {
     protected void body() throws Exception {
         target = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), "Graph.png").toFile();
         if (target.exists() && !target.delete())
-            throw new PassException("Не удается удалить предыдущий файл " + CommonUtils.Brackets(target.getAbsolutePath()));
+            throw new PassException("Не удается удалить предыдущий файл " + Utils_.Brackets(target.getAbsolutePath()));
         //-
         mxGraph graph = graphForm.control.getGraph();
         BufferedImage image = mxCellRenderer.createBufferedImage(graph,
@@ -64,6 +64,6 @@ public class SaveGraph extends Pass<File> {
     }
     @Override
     protected void showDone() throws Exception {
-        CommonUI.Info("Граф успешно сохранен в файл: " + CommonUtils.Brackets(target.getAbsolutePath()));
+        UI_.Info("Граф успешно сохранен в файл: " + Utils_.Brackets(target.getAbsolutePath()));
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/SaveProfile.java b/src/Visual_DVM_2021/Passes/All/SaveProfile.java
index 4f33cea0..79dd1aa9 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveProfile.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveProfile.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
 import Common.Passes.AddObjectPass;
@@ -16,14 +16,14 @@ public class SaveProfile extends AddObjectPass<SapforProfile> {
     }
     @Override
     protected Database getDb() {
-        return CommonUtils.db;
+        return Utils_.db;
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
         //1. проверить нет ли уже такой последовательности настроек.
-        SapforProfile profile = ((GlobalDatabase)CommonUtils.db).checkProfileForCurrentSettings();
+        SapforProfile profile = ((GlobalDatabase) Utils_.db).checkProfileForCurrentSettings();
         if (profile != null) {
-            Log.Writeln_("Текущий набор настроек уже сохранён как профиль " + CommonUtils.Brackets(profile.description));
+            Log.Writeln_("Текущий набор настроек уже сохранён как профиль " + Utils_.Brackets(profile.description));
             return false;
         }
         return super.canStart(args);
@@ -32,6 +32,6 @@ public class SaveProfile extends AddObjectPass<SapforProfile> {
     protected void body() throws Exception {
         target.creationDate = new Date().getTime();
         super.body();
-        ((GlobalDatabase)CommonUtils.db).insertProfileSettings(target);
+        ((GlobalDatabase) Utils_.db).insertProfileSettings(target);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/SendBugReport.java b/src/Visual_DVM_2021/Passes/All/SendBugReport.java
index 403589ba..2084ee95 100644
--- a/src/Visual_DVM_2021/Passes/All/SendBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/SendBugReport.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Repository.BugReport.BugReportInterface;
 import _VisualDVM.Repository.BugReport.BugReportState;
@@ -13,7 +13,7 @@ public class SendBugReport extends ComponentsRepositoryPass {
             //отправить архив.
             Command(new ServerExchangeUnit_2021(ServerCode.SendBugReport,
                     Current.getBugReport().id,
-                    CommonUtils.fileToBytes(BugReportInterface.getArchiveFile(Current.getBugReport()))
+                    Utils_.fileToBytes(BugReportInterface.getArchiveFile(Current.getBugReport()))
             ));
         }
         // синхрон бд
diff --git a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java b/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java
index 7378e862..98b92b20 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
 import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -61,7 +61,7 @@ public class ShowCompilerVersion extends Pass<String> {
     @Override
     protected void showDone() throws Exception {
         if (needsShow) {
-            ((GlobalDatabase)CommonUtils.db).compilers.RefreshUI();
+            ((GlobalDatabase) Utils_.db).compilers.RefreshUI();
             ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm();
             ff.ShowDialog("Версия", target);
         }
diff --git a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java b/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
index 36e44368..1df75432 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
 import _VisualDVM.Utils;
@@ -38,7 +38,7 @@ public class ShowComponentChangesLog extends ComponentsRepositoryPass<Component>
     @Override
     protected void ServerAction() throws Exception {
         Command(new ServerExchangeUnit_2021(ServerCode.GetComponentChangesLog, target.getComponentType().toString()));
-        CommonUtils.bytesToFile((byte[]) response.object, res);
+        Utils_.bytesToFile((byte[]) response.object, res);
     }
     @Override
     protected boolean validate() {
@@ -52,7 +52,7 @@ public class ShowComponentChangesLog extends ComponentsRepositoryPass<Component>
         for (int i = lines.size() - 1; i >= 0; i--)
             res.add(lines.get(i));
         ff.ShowDialog("Журнал изменений компонента " +
-                        CommonUtils.Brackets(target.getComponentType().getDescription()),
+                        Utils_.Brackets(target.getComponentType().getDescription()),
                 String.join("\n", res)
         );
     }
diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
index 2ed76d75..2bc2a259 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.CompilerType;
@@ -63,6 +63,6 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
             Log.Writeln_("Задач не найдено.");
             return false;
         }
-        return CommonUI.Question("Будет запущено " + target.tasksCount + " задач. Продолжить");
+        return UI_.Question("Будет запущено " + target.tasksCount + " задач. Продолжить");
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java b/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
index 55604353..432288b3 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.Common.TestingServer;
@@ -50,6 +50,6 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
             Log.Writeln_("Не сформировано ни одной новой задачи.");
             return false;
         }
-        return (CommonUI.Question("Будет запущено " + target.tasksCount + " задач. Продолжить"));
+        return (UI_.Question("Будет запущено " + target.tasksCount + " задач. Продолжить"));
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java b/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
index 7372ef40..e7a33720 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
@@ -122,7 +122,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
                     message_header += target.executor + " назначается исполнителем";
                     break;
                 case "state":
-                    message_header += "состояние изменилось на " + CommonUtils.Brackets(target.state.getDescription());
+                    message_header += "состояние изменилось на " + Utils_.Brackets(target.state.getDescription());
                     break;
             }
             passes.get(PassCode.Email).Do(
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateComponent.java b/src/Visual_DVM_2021/Passes/All/UpdateComponent.java
index 594f4871..0c7fba5f 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateComponent.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.Component.Component;
@@ -22,7 +22,7 @@ public class UpdateComponent extends Pass<Component> {
         switch (Current.getComponent().getComponentType()) {
             case Sapfor_F:
             case Visualizer_2:
-                subPassCode = CommonUtils.isWindows() ? PassCode.DownloadComponent : PassCode.BuildComponent;
+                subPassCode = Utils_.isWindows() ? PassCode.DownloadComponent : PassCode.BuildComponent;
                 break;
             case Visualiser:
             case Instruction:
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
index 6756423b..0a8494c3 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -23,7 +23,7 @@ public class UpdateSetting extends Pass<DBSetting> {
     VFileChooser fileChooser = new VFileChooser("", "exe");
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        target = ((GlobalDatabase)CommonUtils.db).settings.get(args[0]);
+        target = ((GlobalDatabase) Utils_.db).settings.get(args[0]);
         NewValue = target.Value;
         if (args.length == 1) {
             //интерфейсный режим. получение по клику на пункт меню.
@@ -114,7 +114,7 @@ public class UpdateSetting extends Pass<DBSetting> {
     @Override
     protected void body() throws Exception {
         target.Value = NewValue;
-        CommonUtils.db.Update(target);
+        Utils_.db.Update(target);
     }
     @Override
     protected void showDone() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
index 9baefdc8..b28d067a 100644
--- a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
+++ b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes;
 import Common.Current_;
 import Common.Passes.Pass;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.Settings.SettingName;
@@ -36,8 +36,8 @@ public abstract class OpenSapforVersionPass extends Pass<SapforVersion_json> {
     protected void body() throws Exception {
         SapforTask task = target.task;
         ShowMessage1("Построение дерева версий и создание баз данных...");
-        File rootHome = Paths.get(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).Value,
-                CommonUtils.getDateName(task.test_description)).toFile();
+        File rootHome = Paths.get(((GlobalDatabase) Utils_.db).settings.get(SettingName.Workspace).Value,
+                Utils_.getDateName(task.test_description)).toFile();
         for (SapforVersion_json version_json : task.versions) {
             ShowMessage2(version_json.version);
             version_json.createProject(rootHome);
diff --git a/src/Visual_DVM_2021/Passes/ProcessPass.java b/src/Visual_DVM_2021/Passes/ProcessPass.java
index e9ea7739..dd372921 100644
--- a/src/Visual_DVM_2021/Passes/ProcessPass.java
+++ b/src/Visual_DVM_2021/Passes/ProcessPass.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes;
 import Common.CommonConstants;
 import Common.Passes.Pass;
 import Common.Passes.PassException;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Utils;
 
 import java.io.BufferedReader;
@@ -53,7 +53,7 @@ public abstract class ProcessPass<T> extends Pass<T> {
                 output.add(line);
             }
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
     public String ReadLine() throws Exception {
@@ -63,7 +63,7 @@ public abstract class ProcessPass<T> extends Pass<T> {
         return brStdout.readLine();
     }
     public void PerformScript(String script_text) throws Exception {
-        PerformScript(Utils.CreateTempFile("script", CommonUtils.isWindows() ? "bat" : "", script_text), true);
+        PerformScript(Utils.CreateTempFile("script", Utils_.isWindows() ? "bat" : "", script_text), true);
     }
     public void PerformScript(File script, boolean wait) throws Exception {
         if (!script.setExecutable(true)) throw new PassException("Не удалось создать исполняемый файл для скрипта");
diff --git a/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java b/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
index 9df9ab42..9da2626e 100644
--- a/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.SSH;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
@@ -66,7 +66,7 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass {
         user.connection.writeToFile("", INTERRUPT);
         ShowMessage1("Ожидание остановки сервера тестирования");
         do {
-            CommonUtils.sleep(1000);
+            Utils_.sleep(1000);
             ShowMessage2("Проверка признака остановки..");
         } while (!user.connection.Exists(ABORTED));
         //--
diff --git a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java b/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
index 08ac89bd..2ea227c1 100644
--- a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.SSH;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Tasks.Supervisor.Remote.RemoteTaskSupervisor;
 public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends ConnectionPass {
@@ -8,7 +8,7 @@ public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends
         try {
             supervisor = s_class.newInstance();
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/SapforAnalysis.java b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
index 376e2c26..8cc5dcb0 100644
--- a/src/Visual_DVM_2021/Passes/SapforAnalysis.java
+++ b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes;
 import Common.Passes.PassState;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.Controls.PassControl;
 import _VisualDVM.Visual.Menus.PassMenuItem;
@@ -49,7 +49,7 @@ public class SapforAnalysis extends SapforPass {
     @Override
     protected void PerformPreparation() throws Exception {
         //-
-        if (CommonUI.isActive())
+        if (UI_.isActive())
             showPreparation(); // отображение пустых данных
         //-
         performPreparation(); //в данном случае удаление данных
@@ -83,7 +83,7 @@ public class SapforAnalysis extends SapforPass {
             unpack(sapfor.getResult());
         }
         if (!isAtomic() && !asDonePhase) {
-            CommonUtils.MainLog.Print("Поиск выполненных фаз..");
+            Utils_.MainLog.Print("Поиск выполненных фаз..");
             sapfor.RunAnalysis(
                     "SPF_GetPassesStateStr",
                     -Global.messagesServer.getPort(),
@@ -116,7 +116,7 @@ public class SapforAnalysis extends SapforPass {
                     }
                 }
             }
-            CommonUtils.MainLog.Print("Фазы получены.");
+            Utils_.MainLog.Print("Фазы получены.");
         }
     }
     //---------------------------------------------
diff --git a/src/Visual_DVM_2021/Passes/SapforFilesModification.java b/src/Visual_DVM_2021/Passes/SapforFilesModification.java
index 40b589ab..14457ae9 100644
--- a/src/Visual_DVM_2021/Passes/SapforFilesModification.java
+++ b/src/Visual_DVM_2021/Passes/SapforFilesModification.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.Settings.SettingName;
@@ -11,7 +11,7 @@ public class SapforFilesModification extends SapforModification {
     @Override
     protected void performPreparation() throws Exception {
         super.performPreparation();
-        if (((GlobalDatabase) CommonUtils.db).settings.get(SettingName.SaveModifications).toBoolean()) {
+        if (((GlobalDatabase) Utils_.db).settings.get(SettingName.SaveModifications).toBoolean()) {
             Current.getProject().createModification();
         }
     }
diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java b/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
index 3a904bbd..042d157a 100644
--- a/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
+++ b/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
@@ -3,7 +3,7 @@ import Common.Current_;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Database;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.Repository.RepositoryServer;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -37,7 +37,7 @@ public class DeleteServerObjects <S extends RepositoryServer, D extends DBObject
         DBTable table =getDb().tables.get(d);
         if (table.getCheckedCount()>0) {
             target = table.getCheckedKeys();
-            return CommonUI.Warning(table.getCheckedCount()+" объектов будет удален(о).");
+            return UI_.Warning(table.getCheckedCount()+" объектов будет удален(о).");
         }
         else {
             if (Current_.Check(Log, table.CurrentName())){
diff --git a/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java b/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
index fea11c64..085e8479 100644
--- a/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
+++ b/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.Database.Objects.DBObject;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
 import _VisualDVM.Repository.RepositoryRefuseException;
@@ -72,7 +72,7 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
         }
     }
     protected void SendFile(File src, String dst) throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.SendFile, dst, CommonUtils.fileToBytes(src)));
+        Command(new ServerExchangeUnit_2021(ServerCode.SendFile, dst, Utils_.fileToBytes(src)));
     }
     protected void ReceiveFile(String src, File dst) throws Exception {
         Command(new ServerExchangeUnit_2021(ServerCode.ReceiveFile, src));
diff --git a/src/Visual_DVM_2021/Passes/StartTestingPackage.java b/src/Visual_DVM_2021/Passes/StartTestingPackage.java
index b70e4234..7d01f919 100644
--- a/src/Visual_DVM_2021/Passes/StartTestingPackage.java
+++ b/src/Visual_DVM_2021/Passes/StartTestingPackage.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes;
 import Common.Current_;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
@@ -36,7 +36,7 @@ public abstract class StartTestingPackage<P extends TestingPackage> extends Publ
                 Log.Writeln_("В пакете отсутствуют задачи.");
                 return false;
             }
-            if (CommonUI.Question("Будет запущено:\n"
+            if (UI_.Question("Будет запущено:\n"
                     + target.tasksCount + " задач.\n" +
                     "Продолжить")) {
                 target.state = TasksPackageState.Queued;
diff --git a/src/Visual_DVM_2021/Passes/UI/PassForm.java b/src/Visual_DVM_2021/Passes/UI/PassForm.java
index 71cf3f31..ee62db9c 100644
--- a/src/Visual_DVM_2021/Passes/UI/PassForm.java
+++ b/src/Visual_DVM_2021/Passes/UI/PassForm.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.UI;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.Dialog;
 import Common.Passes.Pass;
 
@@ -36,7 +36,7 @@ public class PassForm extends Dialog<Pass, PassFields> {
         try {
             Result.Interrupt();
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     @Override
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 8ad89516..5b93d5ea 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -2,9 +2,9 @@ package _VisualDVM;
 import Common.Current_;
 import Common.Database.Tables.DataSet;
 import Common.Mode;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Utils.Loggable;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.GlobalData.Account.Account;
 import _VisualDVM.GlobalData.Account.AccountRole;
 import _VisualDVM.GlobalData.GlobalDatabase;
@@ -77,57 +77,57 @@ public class Global {
 
     public static void SynschronizeProperties() {
         try {
-            File new_propertiesFile = new File(CommonUtils.getHomeDirectory(), "properties");
+            File new_propertiesFile = new File(Utils_.getHomeDirectory(), "properties");
             if (new_propertiesFile.exists())
-                properties = (GlobalProperties) CommonUtils.jsonFromFile(new_propertiesFile, GlobalProperties.class);
-            CommonUtils.jsonToFile(properties, new_propertiesFile);
+                properties = (GlobalProperties) Utils_.jsonFromFile(new_propertiesFile, GlobalProperties.class);
+            Utils_.jsonToFile(properties, new_propertiesFile);
         } catch (Exception ex) {
             ex.printStackTrace();
         }
     }
     public static void CheckVisualiserDirectories() {
-        Utils.CheckDirectory(ComponentsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.ComponentsDirectoryName));
-        Utils.CheckAndCleanDirectory(TempDirectory = new File(CommonUtils.getHomeDirectory(), Constants.TempDirectoryName));
-        Utils.CheckDirectory(DataDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DataDirectoryName));
+        Utils.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName));
+        Utils.CheckAndCleanDirectory(TempDirectory = new File(Utils_.getHomeDirectory(), Constants.TempDirectoryName));
+        Utils.CheckDirectory(DataDirectory = new File(Utils_.getHomeDirectory(), Constants.DataDirectoryName));
         //-
-        Utils.CheckDirectory(RepoDirectory = new File(CommonUtils.getHomeDirectory(), Constants.RepoDirectoryName));
-        Utils.CheckDirectory(BugReportsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.BugsDirectoryName));
-        Utils.CheckDirectory(BackUpsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.BackUpsDirectoryName));
-        Utils.CheckDirectory(ProjectsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.ProjectsDirectoryName));
-        Utils.CheckDirectory(CompilationTasksDirectory = new File(CommonUtils.getHomeDirectory(), Constants.CompilationTasksDirectoryName));
-        Utils.CheckDirectory(RunTasksDirectory = new File(CommonUtils.getHomeDirectory(), Constants.RunTasksDirectoryName));
-        Utils.CheckDirectory(StsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.StsDirectoryName));
-        Utils.CheckDirectory(TestsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.TestsDirectoryName));
-        Utils.CheckDirectory(PerformanceAnalyzerDirectory = new File(CommonUtils.getHomeDirectory(), Constants.PerformanceAnalyzerDirectoryName));
-        Utils.CheckDirectory(DVMPackagesDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DVMPackagesDirectoryName));
+        Utils.CheckDirectory(RepoDirectory = new File(Utils_.getHomeDirectory(), Constants.RepoDirectoryName));
+        Utils.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
+        Utils.CheckDirectory(BackUpsDirectory = new File(Utils_.getHomeDirectory(), Constants.BackUpsDirectoryName));
+        Utils.CheckDirectory(ProjectsDirectory = new File(Utils_.getHomeDirectory(), Constants.ProjectsDirectoryName));
+        Utils.CheckDirectory(CompilationTasksDirectory = new File(Utils_.getHomeDirectory(), Constants.CompilationTasksDirectoryName));
+        Utils.CheckDirectory(RunTasksDirectory = new File(Utils_.getHomeDirectory(), Constants.RunTasksDirectoryName));
+        Utils.CheckDirectory(StsDirectory = new File(Utils_.getHomeDirectory(), Constants.StsDirectoryName));
+        Utils.CheckDirectory(TestsDirectory = new File(Utils_.getHomeDirectory(), Constants.TestsDirectoryName));
+        Utils.CheckDirectory(PerformanceAnalyzerDirectory = new File(Utils_.getHomeDirectory(), Constants.PerformanceAnalyzerDirectoryName));
+        Utils.CheckDirectory(DVMPackagesDirectory = new File(Utils_.getHomeDirectory(), Constants.DVMPackagesDirectoryName));
         //через пару версий заменить на clean.
-        Utils.CheckDirectory(SapforPackagesDirectory = new File(CommonUtils.getHomeDirectory(), "SapforPackages"));
-        Utils.CheckDirectory(MachinesDirectory = new File(CommonUtils.getHomeDirectory(), "Machines"));
+        Utils.CheckDirectory(SapforPackagesDirectory = new File(Utils_.getHomeDirectory(), "SapforPackages"));
+        Utils.CheckDirectory(MachinesDirectory = new File(Utils_.getHomeDirectory(), "Machines"));
     }
     public static void CheckServerDirectories() {
-        Utils.CheckDirectory(ComponentsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.ComponentsDirectoryName));
-        Utils.CheckAndCleanDirectory(TempDirectory = new File(CommonUtils.getHomeDirectory(), Constants.TempDirectoryName));
-        Utils.CheckDirectory(DataDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DataDirectoryName));
+        Utils.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName));
+        Utils.CheckAndCleanDirectory(TempDirectory = new File(Utils_.getHomeDirectory(), Constants.TempDirectoryName));
+        Utils.CheckDirectory(DataDirectory = new File(Utils_.getHomeDirectory(), Constants.DataDirectoryName));
         //-
-        Utils.CheckDirectory(BugReportsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.BugsDirectoryName));
-        Utils.CheckDirectory(DataBackUpsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DataBackUpsDirectoryName));
-        Utils.CheckDirectory(MachinesDirectory = new File(CommonUtils.getHomeDirectory(), "Machines"));
+        Utils.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
+        Utils.CheckDirectory(DataBackUpsDirectory = new File(Utils_.getHomeDirectory(), Constants.DataBackUpsDirectoryName));
+        Utils.CheckDirectory(MachinesDirectory = new File(Utils_.getHomeDirectory(), "Machines"));
     }
     public static void CheckTestingSystemDirectories() {
-        Utils.CheckDirectory(ComponentsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.ComponentsDirectoryName));
-        Utils.CheckAndCleanDirectory(TempDirectory = new File(CommonUtils.getHomeDirectory(), Constants.TempDirectoryName));
-        Utils.CheckDirectory(DataDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DataDirectoryName));
+        Utils.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName));
+        Utils.CheckAndCleanDirectory(TempDirectory = new File(Utils_.getHomeDirectory(), Constants.TempDirectoryName));
+        Utils.CheckDirectory(DataDirectory = new File(Utils_.getHomeDirectory(), Constants.DataDirectoryName));
         //-
-        Utils.CheckDirectory(TestsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.TestsDirectoryName));
-        Utils.CheckDirectory(RepoDirectory = new File(CommonUtils.getHomeDirectory(), Constants.RepoDirectoryName));
-        Utils.CheckDirectory(DVMPackagesDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DVMPackagesDirectoryName));
-        Utils.CheckDirectory(SapforsDirectory = new File(CommonUtils.getHomeDirectory(), "Sapfors"));
-        Utils.CheckDirectory(SapforPackagesDirectory = new File(CommonUtils.getHomeDirectory(), "SapforPackages"));
+        Utils.CheckDirectory(TestsDirectory = new File(Utils_.getHomeDirectory(), Constants.TestsDirectoryName));
+        Utils.CheckDirectory(RepoDirectory = new File(Utils_.getHomeDirectory(), Constants.RepoDirectoryName));
+        Utils.CheckDirectory(DVMPackagesDirectory = new File(Utils_.getHomeDirectory(), Constants.DVMPackagesDirectoryName));
+        Utils.CheckDirectory(SapforsDirectory = new File(Utils_.getHomeDirectory(), "Sapfors"));
+        Utils.CheckDirectory(SapforPackagesDirectory = new File(Utils_.getHomeDirectory(), "SapforPackages"));
         //CheclAndClean через неделю
-        Utils.CheckDirectory(MachinesDirectory = new File(CommonUtils.getHomeDirectory(), "Machines"));
+        Utils.CheckDirectory(MachinesDirectory = new File(Utils_.getHomeDirectory(), "Machines"));
     }
     public static void CreateLogAtComponentsPath() {
-        CommonUtils.MainLog = new Loggable() {
+        Utils_.MainLog = new Loggable() {
             @Override
             public String getLogHomePath() {
                 return Paths.get(System.getProperty("user.dir"), "Components").toString();
@@ -137,25 +137,25 @@ public class Global {
                 return "VisualDVM";
             }
         };
-        CommonUtils.MainLog.ClearLog();
+        Utils_.MainLog.ClearLog();
     }
     public static void CreateLogAtHome() {
-        CommonUtils.MainLog = new Loggable() {
+        Utils_.MainLog = new Loggable() {
             @Override
             public String getLogHomePath() {
-                return CommonUtils.getHomePath();
+                return Utils_.getHomePath();
             }
             @Override
             public String getLogName() {
                 return mode.toString();
             }
         };
-        CommonUtils.MainLog.ClearLog();
+        Utils_.MainLog.ClearLog();
     }
     //-
     public static void FinishApplication() {
         try {
-            if (CommonUtils.db != null) CommonUtils.db.Disconnect();
+            if (Utils_.db != null) Utils_.db.Disconnect();
             if (componentsServer.db != null)
                 componentsServer.db.Disconnect();
             if (testingServer.db != null)
@@ -167,8 +167,8 @@ public class Global {
             if (performanceAnalyzer != null)
                 performanceAnalyzer.Shutdown();
         } catch (Exception ex) {
-            if (CommonUtils.MainLog != null) {
-                CommonUtils.MainLog.PrintException(ex);
+            if (Utils_.MainLog != null) {
+                Utils_.MainLog.PrintException(ex);
             } else {
                 ex.printStackTrace();
             }
@@ -176,11 +176,11 @@ public class Global {
         System.exit(0);
     }
     public static void ActivateDB() throws Exception {
-        CommonUtils.db = new GlobalDatabase();
-        CommonUtils.db.Connect();
-        CommonUtils.db.CreateAllTables();
-        CommonUtils.db.prepareTablesStatements();
-        CommonUtils.db.Synchronize();
+        Utils_.db = new GlobalDatabase();
+        Utils_.db.Connect();
+        Utils_.db.CreateAllTables();
+        Utils_.db.prepareTablesStatements();
+        Utils_.db.Synchronize();
     }
     public static void RefreshUpdatesStatus() {
         Components.RefreshUI();
@@ -225,7 +225,7 @@ public class Global {
         forbidden.add(SettingName.Precompilation);
         forbidden.add(SettingName.DVMConvertationOptions);
         forbidden.add(SettingName.SaveModifications);
-        for (DBSetting setting : ((GlobalDatabase) CommonUtils.db).settings.getSettingsByOwner(ComponentType.SapforOptions)) {
+        for (DBSetting setting : ((GlobalDatabase) Utils_.db).settings.getSettingsByOwner(ComponentType.SapforOptions)) {
             if (!forbidden.contains(setting.Name))
                 res_.add(setting.Value);
         }
@@ -248,8 +248,8 @@ public class Global {
         }
     }
     public static void NormalMode(int port) throws Exception {
-        CommonUI.active = true;
-        CommonUI.setTheme(new LightSPFEditorTheme());
+        UI_.active = true;
+        UI_.setTheme(new LightSPFEditorTheme());
         removeOldDatabases();
         CheckVisualiserDirectories();
         CreateLogAtComponentsPath();
@@ -258,8 +258,8 @@ public class Global {
         visualizer_2.Connect();
         visualizer_2.refreshPid();
         //если делать раньше, то не удастся убить сервер.
-        if (CommonUtils.ContainsCyrillic(CommonUtils.getHomePath())) {
-            CommonUI.Info("В пути к корневой папке " + CommonUtils.DQuotes(CommonUtils.getHomePath()) + "\n" +
+        if (Utils_.ContainsCyrillic(Utils_.getHomePath())) {
+            UI_.Info("В пути к корневой папке " + Utils_.DQuotes(Utils_.getHomePath()) + "\n" +
                     "Найдены русские буквы.\n" +
                     "Визуализатор завершает работу."); //
             FinishApplication();
@@ -270,7 +270,7 @@ public class Global {
         UI.CreateAll();
         Pass.CreateAll();
         //единственное меню до остальных.
-        CommonUI.menuBars.put(ComponentsSet.class, new ComponentsMenuBar());
+        UI_.menuBars.put(ComponentsSet.class, new ComponentsMenuBar());
         Components = new ComponentsSet();
         Current_.set(Current.ProjectView, ProjectView.Files);
         Components.put(ComponentType.Visualiser, visualiser = new Visualiser());
@@ -297,10 +297,10 @@ public class Global {
             do {
                 UI.ShowComponentsWindow();
                 if (flag = (!ValidateComponentsStates())) {
-                    if (!CommonUI.Question("Найдено " + bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" +
+                    if (!UI_.Question("Найдено " + bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" +
                             "Вернуться к окну компонент"
                     )) {
-                        CommonUI.Info("Визуализатор завершает работу.");
+                        UI_.Info("Визуализатор завершает работу.");
                         FinishApplication();
                     }
                 }
@@ -322,10 +322,10 @@ public class Global {
         testingServer.ActivateDB();
         //в проперти их!
         //-- чисто чтобы создать таблицы. соединения на стороне клиента не предвидится.
-        if (((GlobalDatabase) CommonUtils.db).settings.get(SettingName.AutoBugReportsLoad).toBoolean())
+        if (((GlobalDatabase) Utils_.db).settings.get(SettingName.AutoBugReportsLoad).toBoolean())
             Pass.passes.get(PassCode.SynchronizeBugReports).Do();
         //--
-        if (((GlobalDatabase) CommonUtils.db).settings.get(SettingName.AutoTestsLoad).toBoolean())
+        if (((GlobalDatabase) Utils_.db).settings.get(SettingName.AutoTestsLoad).toBoolean())
             Pass.passes.get(PassCode.SynchronizeTests).Do();
         Pass.CheckAllStats();
         Current.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет.
@@ -371,7 +371,7 @@ public class Global {
     //---
     public static void Init(String... args) {
         System.out.println("VisualSapfor.jar started..");
-        System.out.println("home directory is" + CommonUtils.Brackets(CommonUtils.getHomePath()));
+        System.out.println("home directory is" + Utils_.Brackets(Utils_.getHomePath()));
         //---
         SynschronizeProperties();
         mode = properties.Mode;
@@ -402,8 +402,8 @@ public class Global {
         } catch (Exception ex) {
             System.out.println("VISUALISER FAILED");
             ex.printStackTrace();
-            if (CommonUtils.MainLog != null)
-                CommonUtils.MainLog.PrintException(ex);
+            if (Utils_.MainLog != null)
+                Utils_.MainLog.PrintException(ex);
             FinishApplication();
         }
     }
diff --git a/src/_VisualDVM/GlobalData/Compiler/Compiler.java b/src/_VisualDVM/GlobalData/Compiler/Compiler.java
index 67a49671..c334c821 100644
--- a/src/_VisualDVM/GlobalData/Compiler/Compiler.java
+++ b/src/_VisualDVM/GlobalData/Compiler/Compiler.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Compiler;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.Validators.DVMHelpParser;
@@ -182,10 +182,10 @@ public class Compiler extends iDBObject {
         return "";
     }
     public String getHelpCommand() {
-        return CommonUtils.DQuotes(call_command) + " " + help_command;
+        return Utils_.DQuotes(call_command) + " " + help_command;
     }
     public String getVersionCommand() {
-        return CommonUtils.DQuotes(call_command) + " " + version_command;
+        return Utils_.DQuotes(call_command) + " " + version_command;
     }
     public String getVersionInfo(){
         return "v="+version+" r="+revision;
diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
index 49d3dfd0..f107156a 100644
--- a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Compiler;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import _VisualDVM.Visual.UI;
@@ -47,7 +47,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
                 String home = fields.tfHome.getText();
                 if (!home.isEmpty()) {
                     if (home.startsWith("/")) {
-                        if (CommonUtils.ContainsCyrillic(home))
+                        if (Utils_.ContainsCyrillic(home))
                             Log.Writeln("Расположение компилятора не может содержать кириллицу");
                         else {
                             new PathValidator(home, "Расположение компилятора", Log).Validate();
@@ -60,7 +60,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
                 String call_command = fields.tfCallCommand.getText();
                 if (call_command.isEmpty())
                     Log.Writeln("Команда вызова компилятора не может быть пустой");
-                else if (CommonUtils.ContainsCyrillic(call_command))
+                else if (Utils_.ContainsCyrillic(call_command))
                     Log.Writeln("Команда вызова компилятора не может содержать кириллицу");
                 else {
                     switch (call_command.charAt(0)) {
@@ -78,11 +78,11 @@ public class CompilersDBTable extends iDBTable<Compiler> {
                             //самое опасное место. теоретически тут можно ввести любую команду ОС, в том числе rm -rf
                             if (call_command.contains(" "))
                                 Log.Writeln("Прямая команда вызова не может содержать пробелы");
-                            if (!call_command.contains("+")&& CommonUtils.ContainsForbiddenName(call_command))
+                            if (!call_command.contains("+")&& Utils_.ContainsForbiddenName(call_command))
                                 Log.Writeln("Прямая команда вызова содержит запрещённые символы");
                             else {
                                 if (Utils.isLinuxSystemCommand(call_command))
-                                    Log.Writeln(CommonUtils.DQuotes(call_command) + " является системной командой Linux");
+                                    Log.Writeln(Utils_.DQuotes(call_command) + " является системной командой Linux");
                             }
                             break;
                     }
@@ -96,7 +96,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
                 fields.tfHelpCommand.setText(Result.help_command);
                 fields.tfVersionCommand.setText(Result.version_command);
                 fields.tfHome.setText(Result.home_path);
-                CommonUI.TrySelect(fields.cbCompilerType, Result.type);
+                UI_.TrySelect(fields.cbCompilerType, Result.type);
                 fields.events_on = true;
             }
             @Override
diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
index 5fd918b6..07d3eb58 100644
--- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Compiler.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
@@ -42,7 +42,7 @@ public class CompilerFields implements DialogFields {
                 if (dst != null)
                     tfHome.setText(dst);
             } else
-                CommonUI.Info("Назначение домашней папки поддерживается только для dvm системы.");
+                UI_.Info("Назначение домашней папки поддерживается только для dvm системы.");
         });
         tfHome.getDocument().addDocumentListener(new DocumentListener() {
                                                      @Override
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
index f27ee6f7..2474c5ae 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.CompilerEnvironment.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Tables.DBObjectEditor;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
@@ -7,7 +7,7 @@ import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
 public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
     @Override
     public void Action() {
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         setText(value.value.isEmpty() ? "не задано" : value.value);
         //-
         ComboTextDialog dialog = new ComboTextDialog() {
@@ -20,7 +20,7 @@ public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvir
         };
         dialog.fields.setEditable(value.valueVariants.isEmpty());
         if (!value.value.isEmpty())
-            CommonUI.TrySelect(dialog.fields, value.value);
+            UI_.TrySelect(dialog.fields, value.value);
         if (dialog.ShowDialog("Изменить значение опции " + value.name,
                 value.valueVariants
         )) {
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
index 16838d7a..1e210243 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.CompilerEnvironment.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Tables.DBObjectRenderer;
 import Common.Visual.Fonts.VisualiserFonts;
 import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
@@ -8,7 +8,7 @@ public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
     public void Display() {
         if (value != null) {
             CompilerEnvironment environment = (CompilerEnvironment) value;
-            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
             setText(environment.value.isEmpty() ? "не задано" : environment.value);
         }
     }
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java b/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java
index acaf5997..ace11e6a 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.CompilerOption;
 import Common.Database.Objects.DBObject;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 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(" ") ? CommonUtils.DQuotes(parameterValue) : parameterValue)) : "");
+                (parameterValue.contains(" ") ? Utils_.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(CommonUtils.TBrackets(parameterName) + "\\s*=\\s*" + "\\w+(\\|\\w+)+", Pattern.CASE_INSENSITIVE);
+            Pattern DVM_PARAM_VALUES_REGEX = Pattern.compile(Utils_.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/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
index c89aa8a3..258ed505 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.CompilerOption.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Tables.DBObjectRenderer;
 import Common.Visual.Fonts.VisualiserFonts;
 import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
@@ -9,10 +9,10 @@ public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
         if (value != null) {
             CompilerOption option = (CompilerOption) value;
             if (option.hasParameter()) {
-                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
                 setText(option.parameterName);
             } else {
-                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
+                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState));
                 setText("нет");
             }
         }
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
index 4cc07944..9e42d3f5 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.CompilerOption.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Tables.DBObjectEditor;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
@@ -8,13 +8,13 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
     @Override
     public void Action() {
         if (value.hasParameter()) {
-            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
             //-
             setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
             //-
             ComboTextDialog dialog = new ComboTextDialog();
             if (!value.parameterValue.isEmpty())
-                CommonUI.TrySelect(dialog.fields, value.parameterValue);
+                UI_.TrySelect(dialog.fields, value.parameterValue);
             dialog.fields.setEditable(value.parameterVariants.isEmpty());
             if (dialog.ShowDialog("Изменить значение опции " + value.name,
                     value.parameterVariants)) {
@@ -22,7 +22,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
                 setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
             }
         } else {
-            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
+            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState));
             setText("нет");
         }
     }
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
index c25f0e42..2fa6bfa7 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.CompilerOption.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Tables.DBObjectRenderer;
 import Common.Visual.Fonts.VisualiserFonts;
 import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
@@ -9,10 +9,10 @@ public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
         if (value != null) {
             CompilerOption option = (CompilerOption) value;
             if (option.hasParameter()) {
-                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
                 setText(option.parameterValue.isEmpty() ? "не задано" : option.parameterValue);
             } else {
-                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
+                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState));
                 setText("нет");
             }
         }
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
index d013e598..7fd93823 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.DVMParameter;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
@@ -53,7 +53,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
         return new DBObjectDialog<DVMParameter, DVMParameterFields>(DVMParameterFields.class) {
             @Override
             public void fillFields() {
-                CommonUI.TrySelect(fields.cbName, Result.name);
+                UI_.TrySelect(fields.cbName, Result.name);
                 fields.tfValue.setText(Result.value);
             }
             //https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java
@@ -69,16 +69,16 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
                 }
                  */
                 if (Utils.isLinuxSystemCommand(name))
-                    Log.Writeln(CommonUtils.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
+                    Log.Writeln(Utils_.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
 
                /*
                 if (value.contains("\"")) {
                     Log.Writeln("Значение переменной окружения не может содержать двойные кавычки");
                 }
                 */
-                for (DVMParameter par : ((GlobalDatabase)CommonUtils.db).dvmParameters.Data.values()) {
+                for (DVMParameter par : ((GlobalDatabase) Utils_.db).dvmParameters.Data.values()) {
                     if (par.isVisible() && (Result.id != par.id) && (par.name.equals(name))) {
-                        Log.Writeln("В конфигурации запуска уже задан параметр DVM системы  с именем " + CommonUtils.Brackets(name));
+                        Log.Writeln("В конфигурации запуска уже задан параметр DVM системы  с именем " + Utils_.Brackets(name));
                         break;
                     }
                 }
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java
index a530612f..cc5cab4f 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.EnvironmentValue;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
 public class EnvironmentValue extends iDBObject {
@@ -14,6 +14,6 @@ public class EnvironmentValue extends iDBObject {
     }
     @Override
     public String toString() {
-        return name + "=" + CommonUtils.DQuotes(value);
+        return name + "=" + Utils_.DQuotes(value);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
index 8d7ffe71..47a288e8 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.EnvironmentValue;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
@@ -25,7 +25,7 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
         return new DBObjectDialog<EnvironmentValue, EnvironmentValueFields>(EnvironmentValueFields.class) {
             @Override
             public void fillFields() {
-                CommonUI.TrySelect(fields.cbName, Result.name);
+                UI_.TrySelect(fields.cbName, Result.name);
                 fields.tfValue.setText(Result.value);
             }
             //https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java
@@ -39,13 +39,13 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
                     Log.Writeln("Имя переменной окружения может содержать только латинские буквы, цифры и подчёркивания");
                 }
                 if (Utils.isLinuxSystemCommand(name))
-                    Log.Writeln(CommonUtils.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
+                    Log.Writeln(Utils_.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
                 if (value.contains("\"")) {
                     Log.Writeln("Значение переменной окружения не может содержать двойные кавычки");
                 }
-                for (EnvironmentValue env : ((GlobalDatabase)CommonUtils.db).environmentValues.Data.values()) {
+                for (EnvironmentValue env : ((GlobalDatabase) Utils_.db).environmentValues.Data.values()) {
                     if (env.isVisible() && (Result.id != env.id) && (env.name.equals(name))) {
-                        Log.Writeln("В конфигурации запуска уже задана переменная окружения  с именем " + CommonUtils.Brackets(name));
+                        Log.Writeln("В конфигурации запуска уже задана переменная окружения  с именем " + Utils_.Brackets(name));
                         break;
                     }
                 }
diff --git a/src/_VisualDVM/GlobalData/GlobalDatabase.java b/src/_VisualDVM/GlobalData/GlobalDatabase.java
index 51405da0..680ae34f 100644
--- a/src/_VisualDVM/GlobalData/GlobalDatabase.java
+++ b/src/_VisualDVM/GlobalData/GlobalDatabase.java
@@ -1,7 +1,7 @@
 package _VisualDVM.GlobalData;
 import Common.Current_;
 import Common.Database.VisualiserDatabase;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
@@ -122,7 +122,7 @@ public class GlobalDatabase extends VisualiserDatabase {
         try {
             Update((DBObject) Current_.get(Current.Credentials));
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
     //--
diff --git a/src/_VisualDVM/GlobalData/Machine/Machine.java b/src/_VisualDVM/GlobalData/Machine/Machine.java
index 8bf327ea..b357d9c8 100644
--- a/src/_VisualDVM/GlobalData/Machine/Machine.java
+++ b/src/_VisualDVM/GlobalData/Machine/Machine.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Machine;
 import Common.Database.Objects.iDBObject;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.User.User;
 
@@ -23,13 +23,13 @@ public class Machine extends iDBObject {
     }
     public String getFullDescription() {
         return //this.equals(Constants.repository_machine) ? "Репозиторий визуализатора" :
-               "Машина по адресу " + CommonUtils.Brackets(getURL());
+               "Машина по адресу " + Utils_.Brackets(getURL());
     }
     public LinkedHashMap<Integer, Compiler> getCompilers() {
-        return CommonUtils.db.getMapByFKi(this, Compiler.class);
+        return Utils_.db.getMapByFKi(this, Compiler.class);
     }
     public LinkedHashMap<Integer, User> getUsers() {
-        return CommonUtils.db.getMapByFKi(this, User.class);
+        return Utils_.db.getMapByFKi(this, User.class);
     }
     @Override
     public String getDialogName() {
diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
index 2a0dfcaf..f7720ebb 100644
--- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Machine;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import _VisualDVM.Visual.UI;
@@ -50,7 +50,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
                 fields.tfName.setText(Result.name);
                 fields.tfAddress.setText(Result.address);
                 fields.sPort.setValue(Result.port);
-                CommonUI.TrySelect(fields.cbMachineType, Result.type);
+                UI_.TrySelect(fields.cbMachineType, Result.type);
             }
             @Override
             public void ProcessResult() {
diff --git a/src/_VisualDVM/GlobalData/Makefile/Makefile.java b/src/_VisualDVM/GlobalData/Makefile/Makefile.java
index 19e38ad6..2d6dc6c4 100644
--- a/src/_VisualDVM/GlobalData/Makefile/Makefile.java
+++ b/src/_VisualDVM/GlobalData/Makefile/Makefile.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Makefile;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Utils.TextLog;
 import _VisualDVM.Utils;
@@ -25,10 +25,10 @@ public class Makefile extends ModuleAnchestor {
         return Current.HasMachine() && (machine_id == Current.getMachine().id);
     }
     public LinkedHashMap<LanguageName, Module> getActiveModules() {
-        return CommonUtils.db.getByFKAndGroupBy(this, Module.class, "language", LanguageName.class).values().stream().filter(Module::isSelected).collect(Collectors.toMap(module -> module.language, module -> module, (a, b) -> b, LinkedHashMap::new));
+        return Utils_.db.getByFKAndGroupBy(this, Module.class, "language", LanguageName.class).values().stream().filter(Module::isSelected).collect(Collectors.toMap(module -> module.language, module -> module, (a, b) -> b, LinkedHashMap::new));
     }
     public LinkedHashMap<LanguageName, Module> getModules() {
-        return CommonUtils.db.getByFKAndGroupBy(this, Module.class, "language", LanguageName.class);
+        return Utils_.db.getByFKAndGroupBy(this, Module.class, "language", LanguageName.class);
     }
     public String Generate(db_project_info project, boolean useFilesOrder, LinkedHashMap<LanguageName, Module> modules) throws Exception {
         Compiler linker = getCompiler();
@@ -37,7 +37,7 @@ public class Makefile extends ModuleAnchestor {
         Vector<String> titles = new Vector<>();
         Vector<String> objects = new Vector<>();
         Vector<String> bodies = new Vector<>();
-        String binary = CommonUtils.DQuotes("0"); // Utils.DQuotes(project.name);
+        String binary = Utils_.DQuotes("0"); // Utils.DQuotes(project.name);
         for (Module module : modules.values()) {
             //определить а активен ли модуль.
             //выбран ли он. есть ли у него компилятор.  есть ли для него программы.
@@ -61,7 +61,7 @@ public class Makefile extends ModuleAnchestor {
                 for (DBProjectFile program : programsToAssembly) {
                     //--
                     program.last_assembly_name = module.language.toString() + "_" + i + ".o";
-                    String object = CommonUtils.DQuotes(program.last_assembly_name);
+                    String object = Utils_.DQuotes(program.last_assembly_name);
                     module_objects.add(object);
                     module_body +=
                             object + ":\n" +
@@ -78,7 +78,7 @@ public class Makefile extends ModuleAnchestor {
                     ++i;
                 }
                 titles.add(String.join("\n",
-                        LANG_ + "COMMAND=" + CommonUtils.DQuotes(module_compiler.call_command) + " " + module.command,
+                        LANG_ + "COMMAND=" + Utils_.DQuotes(module_compiler.call_command) + " " + module.command,
                         LANG_ + "FLAGS=" + module.flags,
                         LANG_ + "OBJECTS=" + String.join(" ", module_objects),
                         ""
@@ -88,7 +88,7 @@ public class Makefile extends ModuleAnchestor {
             }
         }
         return String.join("\n",
-                "LINK_COMMAND=" + CommonUtils.DQuotes(linker.call_command) + " " + command,
+                "LINK_COMMAND=" + Utils_.DQuotes(linker.call_command) + " " + command,
                 "LINK_FLAGS=" + flags + "\n",
                 String.join("\n", titles),
                 "all: " + binary,
@@ -124,7 +124,7 @@ public class Makefile extends ModuleAnchestor {
                 for (DBProjectFile program : programsToAssembly) {
                     //--
                     program.last_assembly_name = module.language.toString() + "_" + i + ".o";
-                    String object = CommonUtils.DQuotes(program.last_assembly_name);
+                    String object = Utils_.DQuotes(program.last_assembly_name);
                     module_objects.add(object);
                     module_body +=
                             object + ":\n" +
@@ -141,7 +141,7 @@ public class Makefile extends ModuleAnchestor {
                     ++i;
                 }
                 titles.add(String.join("\n",
-                        LANG_ + "COMMAND=" + CommonUtils.DQuotes(module_compiler.call_command) + " " + module.command,
+                        LANG_ + "COMMAND=" + Utils_.DQuotes(module_compiler.call_command) + " " + module.command,
                         LANG_ + "FLAGS=" + module.flags,
                         LANG_ + "OBJECTS=" + String.join(" ", module_objects),
                         ""
@@ -159,7 +159,7 @@ public class Makefile extends ModuleAnchestor {
     //todo возможно улучшить
     //https://habr.com/ru/post/211751/
     public Machine getMachine() {
-        return CommonUtils.db.getById(Machine.class, machine_id);
+        return Utils_.db.getById(Machine.class, machine_id);
     }
     public boolean DependsToCompiler(Compiler compiler) {
         if (compiler_id == compiler.id) return true;
@@ -178,7 +178,7 @@ public class Makefile extends ModuleAnchestor {
             if (linker.type.equals(CompilerType.dvm)) {
                 if (!Current.getProject().languageName.getDVMLink().equals(command))
                     Log.Writeln("команда линковки " +
-                            CommonUtils.Quotes(command) +
+                            Utils_.Quotes(command) +
                             " не соответствует языку текущего проекта "
                             + Current.getProject().languageName.getDescription() + "\n" +
                             "Используйте команду " + Current.getProject().languageName.getDVMLink());
diff --git a/src/_VisualDVM/GlobalData/Module/Module.java b/src/_VisualDVM/GlobalData/Module/Module.java
index c73125f9..8d5fc610 100644
--- a/src/_VisualDVM/GlobalData/Module/Module.java
+++ b/src/_VisualDVM/GlobalData/Module/Module.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Module;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.ProjectData.LanguageName;
@@ -29,9 +29,9 @@ public class Module extends ModuleAnchestor {
     public void Select(boolean flag) {
         on = flag ? 1 : 0;
         try {
-            CommonUtils.db.Update(this);
+            Utils_.db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java b/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java
index dcde9559..8817e434 100644
--- a/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java
+++ b/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Module;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 public class ModuleAnchestor extends iDBObject {
@@ -16,16 +16,16 @@ public class ModuleAnchestor extends iDBObject {
         return ((compiler = getCompiler()) == null) ? "" : compiler.getDescription();
     }
     public Compiler getCompiler() {
-        return CommonUtils.db.getById(Compiler.class, compiler_id);
+        return Utils_.db.getById(Compiler.class, compiler_id);
     }
     public String getDescription() {
         String res = "";
         if (getCompiler() != null) {
-            res += CommonUtils.Brackets(getCompiler().getDescription());
+            res += Utils_.Brackets(getCompiler().getDescription());
             if (!command.isEmpty())
-                res += " " + CommonUtils.Brackets(command);
+                res += " " + Utils_.Brackets(command);
             if (!flags.isEmpty())
-                res += " " + CommonUtils.Brackets(flags);
+                res += " " + Utils_.Brackets(flags);
         }
         return res;
     }
diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
index 040affea..f2230672 100644
--- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Module.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.Controls.StyledTextComboBox;
 import Common.Visual.Windows.Dialog.DialogFields;
@@ -32,14 +32,14 @@ public class ModuleAnchestorFields implements DialogFields {
         bHelp.addActionListener(e -> {
             if (cbCompilers.getSelectedItem() != null) {
                 Pass.passes.get(PassCode.ShowCompilerHelp).Do(compiler, true);
-            } else CommonUI.Info("Компилятор не выбран");
+            } else UI_.Info("Компилятор не выбран");
         });
         BPickOptions.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 Pass<String> pass = Pass.passes.get(PassCode.PickCompilerOptions);
                 if (pass.Do(compiler)) {
-                    CommonUI.TrySelect(cbFlags, pass.target);
+                    UI_.TrySelect(cbFlags, pass.target);
                 }
             }
         });
@@ -58,7 +58,7 @@ public class ModuleAnchestorFields implements DialogFields {
         cbCompilers.addActionListener(e -> {
             if (cbCompilers.getSelectedItem() instanceof Compiler) {
                 Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
-                CommonUI.TrySelect(cbCommands,
+                UI_.TrySelect(cbCommands,
                         linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
             }
         });
diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java
index b478b79a..8784beb1 100644
--- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Module.UI;
 import Common.CommonConstants;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -93,9 +93,9 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
     }
     @Override
     public void fillFields() {
-        CommonUI.TrySelect(fields.cbFlags, Result.flags);
-        CommonUI.TrySelect(fields.cbCommands, Result.command);
-        CommonUI.TrySelect(fields.cbCompilers, Result.getCompiler());
+        UI_.TrySelect(fields.cbFlags, Result.flags);
+        UI_.TrySelect(fields.cbCommands, Result.command);
+        UI_.TrySelect(fields.cbCompilers, Result.getCompiler());
         //--------------------------------------------
         fields.setListeners(Result);
     }
diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java
index c7b1bb46..c0867ec5 100644
--- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java
+++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java
@@ -1,7 +1,7 @@
 package _VisualDVM.GlobalData.RemoteFile.UI;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.Windows.Dialog.Dialog;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -31,7 +31,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
         try {
             Refresh(session.user.connection.sftpChannel.pwd());
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
             onCancel(); //закрываем окно.
         }
     }
@@ -69,7 +69,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
             fields.treeForm.Show();
             fields.lCurrentFolder.setText(path);
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
             onCancel();
         }
     }
@@ -77,14 +77,14 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
         try {
             Refresh(session.user.connection.sftpChannel.getHome());
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
             onCancel(); //закрываем окно.
         }
     }
     public void goUp() {
         if (!root_file.full_name.equals("/")) {
             Refresh(root_file.parent);
-        } else CommonUI.Info("Корневая папка файловой системы достигнута.");
+        } else UI_.Info("Корневая папка файловой системы достигнута.");
     }
     @Override
     public void validateFields() {
diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
index e9589dd7..3094b15e 100644
--- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
+++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.RemoteFile.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Trees.StyledTreeCellRenderer;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -16,7 +16,7 @@ public class RemoteFileRenderer extends StyledTreeCellRenderer {
         if (o instanceof RemoteFile) {
             RemoteFile file = (RemoteFile) o;
             setText(file.name);
-            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
             if (file.isDirectory())
                 setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
         }
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java
index ffbdc6c0..c56a5079 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.RunConfiguration;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
 import Common.Utils.TextLog;
@@ -54,7 +54,7 @@ public class RunConfiguration extends iDBObject {
             try {
                 dim = Integer.parseInt(dim_);
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
             }
             res.add(dim);
         }
@@ -117,7 +117,7 @@ public class RunConfiguration extends iDBObject {
     }
     //---------------------------------------->
     public Compiler getCompiler() {
-        return CommonUtils.db.getById(Compiler.class, compiler_id);
+        return Utils_.db.getById(Compiler.class, compiler_id);
     }
     public boolean isCube() {
         return cube != 0;
@@ -145,16 +145,16 @@ public class RunConfiguration extends iDBObject {
     public String getDescription() {
         String res = "";
         if (!LauncherCall.isEmpty()) {
-            res += CommonUtils.Brackets(LauncherCall);
+            res += Utils_.Brackets(LauncherCall);
             if (!LauncherOptions.isEmpty())
-                res += " " + CommonUtils.Brackets(LauncherOptions);
+                res += " " + Utils_.Brackets(LauncherOptions);
         } else res = " — ";
         return res;
     }
     public String getLaunchScriptText(String binary_name, String task_matrix) {
         String res = "";
         if (!LauncherCall.isEmpty()) {
-            res += CommonUtils.DQuotes(LauncherCall);
+            res += Utils_.DQuotes(LauncherCall);
             if (!LauncherOptions.isEmpty())
                 res += " " + LauncherOptions;
             if (!task_matrix.isEmpty())
@@ -162,7 +162,7 @@ public class RunConfiguration extends iDBObject {
         }
         if (!res.isEmpty())
             res += " ";
-        res += CommonUtils.DQuotes("./" + binary_name);
+        res += Utils_.DQuotes("./" + binary_name);
         if (!args.isEmpty())
             res += " " + args;
         return res;
@@ -189,13 +189,13 @@ public class RunConfiguration extends iDBObject {
         return "run_configuration_id";
     }
     public Vector<String> getEnvList() {
-        return CommonUtils.db.getVectorStringByFK(this, EnvironmentValue.class);
+        return Utils_.db.getVectorStringByFK(this, EnvironmentValue.class);
     }
     public Vector<String> getParList() {
-        return CommonUtils.db.getVectorStringByFK(this, DVMParameter.class);
+        return Utils_.db.getVectorStringByFK(this, DVMParameter.class);
     }
     public LinkedHashMap<String, String> getEnvMap() {
-        LinkedHashMap<Integer, EnvironmentValue> envs = CommonUtils.db.getMapByFKi(this, EnvironmentValue.class);
+        LinkedHashMap<Integer, EnvironmentValue> envs = Utils_.db.getMapByFKi(this, EnvironmentValue.class);
         LinkedHashMap<String, String> res = new LinkedHashMap<>();
         for (EnvironmentValue e : envs.values()) {
             if (!res.containsKey(e.name))
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index f40d1e12..d35872ec 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -1,7 +1,7 @@
 package _VisualDVM.GlobalData.RunConfiguration;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
@@ -40,18 +40,18 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
         return new DBObjectDialog<RunConfiguration, RunConfigurationFields>(RunConfigurationFields.class) {
             @Override
             public void fillFields() {
-                for (Compiler compiler : ((GlobalDatabase)CommonUtils.db).compilers.Data.values()) {
+                for (Compiler compiler : ((GlobalDatabase) Utils_.db).compilers.Data.values()) {
                     if (compiler.isVisible() && compiler.type.equals(CompilerType.dvm))
                         fields.cbLauncherCall.addItem(compiler);
                 }
-                CommonUI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
-                CommonUI.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
+                UI_.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
+                UI_.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
                 fields.tfArgs.setText(Result.args);
                 fields.cbLauncherCall.addActionListener(new ActionListener() {
                     @Override
                     public void actionPerformed(ActionEvent e) {
                         if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
-                            CommonUI.TrySelect(fields.cbLaunchOptions, "run");
+                            UI_.TrySelect(fields.cbLaunchOptions, "run");
                         }
                     }
                 });
diff --git a/src/_VisualDVM/GlobalData/Settings/DBSetting.java b/src/_VisualDVM/GlobalData/Settings/DBSetting.java
index 1d6fab73..8f8083d6 100644
--- a/src/_VisualDVM/GlobalData/Settings/DBSetting.java
+++ b/src/_VisualDVM/GlobalData/Settings/DBSetting.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Settings;
 import Common.Database.Objects.DBObject;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Visual.Menus.StableMenuItem;
 import _VisualDVM.Repository.Component.ComponentType;
 import Visual_DVM_2021.Passes.PassCode;
@@ -64,13 +64,13 @@ public class DBSetting extends DBObject {
     public void Mark() {
         switch (settingType) {
             case SapforFlag:
-                getMenuItem().setIcon(CommonUtils.getIcon(toBoolean() ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                getMenuItem().setIcon(Utils_.getIcon(toBoolean() ? "/icons/Pick.png" : "/icons/NotPick.png"));
                 break;
             case PercentField:
                 getMenuItem().setText(Name.getDescription() + " : " + this + "%");
                 break;
             case StringField:
-                String valueToShow = Value.isEmpty()? "не задано": CommonUtils.Quotes(toString());
+                String valueToShow = Value.isEmpty()? "не задано": Utils_.Quotes(toString());
                 getMenuItem().setText(Name.getDescription() + " : " + valueToShow);
                 break;
             case IntField:
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
index e63c71d1..ad03aeb7 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Settings;
 import Common.Database.Tables.DBTable;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Utils;
 import _VisualDVM.Repository.Component.ComponentType;
 
@@ -43,7 +43,7 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
         AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.AutoBugReportsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
         AddSetting(new DBSetting(SettingName.AutoTestsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
-        if (CommonUtils.isWindows())
+        if (Utils_.isWindows())
             AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.SmallScreen, 0, SettingType.SapforFlag, ComponentType.Visualiser));
         //совместимость. указываем явно чтобы не были видны в меню.
diff --git a/src/_VisualDVM/GlobalData/Splitter/SplittersDBTable.java b/src/_VisualDVM/GlobalData/Splitter/SplittersDBTable.java
index 99df37f9..337f531a 100644
--- a/src/_VisualDVM/GlobalData/Splitter/SplittersDBTable.java
+++ b/src/_VisualDVM/GlobalData/Splitter/SplittersDBTable.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Splitter;
 import Common.Database.Tables.DBTable;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 import javax.swing.*;
 import java.lang.reflect.Field;
@@ -32,7 +32,7 @@ public class SplittersDBTable extends DBTable<String, Splitter> {
                 }
             }
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
     public void Save(Object form) {
@@ -44,7 +44,7 @@ public class SplittersDBTable extends DBTable<String, Splitter> {
                 getDb().Update(splitter);
             }
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
index 6e99753a..82471f84 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
@@ -1,7 +1,7 @@
 package _VisualDVM.GlobalData.Tasks.CompilationTask;
 import Common.CommonConstants;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -64,7 +64,7 @@ public class CompilationTask extends Task {
                     break;
             }
         }
-        CommonUtils.db.Update(this);
+        Utils_.db.Update(this);
     }
     //---------------------------------------------------
     @Override
@@ -80,7 +80,7 @@ public class CompilationTask extends Task {
                         belongsToProject(Current.getProject());
     }
     public Makefile getMakefile() {
-        return CommonUtils.db.getById(Makefile.class, makefile_id);
+        return Utils_.db.getById(Makefile.class, makefile_id);
     }
     @Override
     public String getFullCommand() {
@@ -90,7 +90,7 @@ public class CompilationTask extends Task {
         LinkedHashMap<Integer, RunTask> res = new LinkedHashMap<>();
         //так не получится. не правильно назвал ключевое поле. F...
         // return Global.db.getMapByFKi(this, RunTask.class);
-        for (RunTask runTask : ((GlobalDatabase)CommonUtils.db).runTasks.Data.values()) {
+        for (RunTask runTask : ((GlobalDatabase) Utils_.db).runTasks.Data.values()) {
             if (runTask.compilation_task_id == id)
                 res.put(runTask.id, runTask);
         }
@@ -102,7 +102,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 + " " + CommonUtils.RBrackets(file.name);
+                String replacement = file.last_assembly_name + " " + Utils_.RBrackets(file.name);
                 output = output.replace(file.last_assembly_name, replacement);
                 errors = errors.replace(file.last_assembly_name, replacement);
             }
diff --git a/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java b/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java
index e84b1127..ac73b441 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.Passes;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor;
 import Visual_DVM_2021.Passes.ProcessPass;
@@ -9,7 +9,7 @@ public abstract class TaskLocalPass<S extends TaskSupervisor> extends ProcessPas
         try {
             supervisor = s_class.newInstance();
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     @Override
diff --git a/src/_VisualDVM/GlobalData/Tasks/QueueSystem/QueueSystem.java b/src/_VisualDVM/GlobalData/Tasks/QueueSystem/QueueSystem.java
index c9e12520..b92f8924 100644
--- a/src/_VisualDVM/GlobalData/Tasks/QueueSystem/QueueSystem.java
+++ b/src/_VisualDVM/GlobalData/Tasks/QueueSystem/QueueSystem.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.QueueSystem;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Tasks.Task;
 import _VisualDVM.GlobalData.Tasks.TaskState;
 public class QueueSystem {
@@ -28,9 +28,9 @@ public class QueueSystem {
             }
     }
     public String getCheckTaskCommand(Task task) {
-        return check_command + " " + CommonUtils.DQuotes(task.PID);
+        return check_command + " " + Utils_.DQuotes(task.PID);
     }
     public String getCancelTaskCommand(Task task) {
-        return cancel_command + " " + CommonUtils.DQuotes(task.PID);
+        return cancel_command + " " + Utils_.DQuotes(task.PID);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java
index 5845401a..a133bde6 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java
@@ -1,7 +1,7 @@
 package _VisualDVM.GlobalData.Tasks.RunTask;
 import Common.CommonConstants;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -39,7 +39,7 @@ public class RunTask extends Task {
         super.DropResults();
         Utils.forceDeleteWithCheck(getLocalStsFile());
         CleanTime = 0;
-        CommonUtils.db.Update(this);
+        Utils_.db.Update(this);
     }
     @Override
     public File getHome() {
@@ -62,18 +62,18 @@ public class RunTask extends Task {
                         compilation_task_id == Current.getCompilationTask().id;
     }
     public RunConfiguration getRunConfiguration() {
-        return ((GlobalDatabase)CommonUtils.db).runConfigurations.Data.get(run_configuration_id);
+        return ((GlobalDatabase) Utils_.db).runConfigurations.Data.get(run_configuration_id);
     }
     public CompilationTask getCompilationTask() {
-        return ((GlobalDatabase)CommonUtils.db).compilationTasks.Data.get(compilation_task_id);
+        return ((GlobalDatabase) Utils_.db).compilationTasks.Data.get(compilation_task_id);
     }
     public void UpdateLastStsName(String file_name) {
         if (!last_sts_name.equals(file_name)) {
             last_sts_name = file_name;
             try {
-                CommonUtils.db.Update(this);
+                Utils_.db.Update(this);
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
             }
         }
     }
@@ -92,7 +92,7 @@ public class RunTask extends Task {
         try {
             if (p != null) CleanTime = Double.parseDouble(p);
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
     @Override
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
index 09242f91..824b1cd5 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
@@ -33,7 +33,7 @@ public class LinuxLocalCompilationSupervisor extends LinuxLocalTaskSupervisor<Co
     protected void ValidateTaskResults() throws Exception {
         if (getBinary().exists()) {
             File renamed_binary = Paths.get(getProjectCopy().getAbsolutePath(),
-                    CommonUtils.getDateName("spf")).toFile();
+                    Utils_.getDateName("spf")).toFile();
             task.binary_name = renamed_binary.getName();
             Files.move(getBinary().toPath(), renamed_binary.toPath(), StandardCopyOption.REPLACE_EXISTING);
             task.state = TaskState.Done;
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
index 06d7877f..9ead4f1c 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
@@ -24,10 +24,10 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
         User user = task.getUser();
         return
                 String.join(" ",
-                        CommonUtils.DQuotes(user.getStarterFile()),
-                        CommonUtils.DQuotes(user.getLauncherFile()),
+                        Utils_.DQuotes(user.getStarterFile()),
+                        Utils_.DQuotes(user.getLauncherFile()),
                         String.valueOf(task.maxtime),
-                        CommonUtils.DQuotes(getCoupDeGrace()),
+                        Utils_.DQuotes(getCoupDeGrace()),
                         task.getFullCommand()
                 );
     }
@@ -48,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("Задача активна, идентификатор " + CommonUtils.Brackets(task.PID));
+            pass.ShowMessage1("Задача активна, идентификатор " + Utils_.Brackets(task.PID));
             RefreshProgress();
             do {
                 Thread.sleep(getTaskCheckPeriod() * 1000L);
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
index 8a6de8f6..09ac69f8 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Local;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
@@ -44,7 +44,7 @@ public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor
         return Paths.get(task.getUser().getLocalProjectsDir().getAbsolutePath(), project.getUniqKey()).toFile();
     }
     protected File getBinary() {
-        return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (CommonUtils.isWindows() ? ".exe" : "")).toFile();
+        return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (Utils_.isWindows() ? ".exe" : "")).toFile();
     }
     protected File getProjectOutput() {
         return Paths.get(getProjectCopy().getAbsolutePath(), Constants.out_file).toFile();
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
index a5660630..244b7fcb 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.Makefile.Makefile;
@@ -19,7 +19,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso
     }
     @Override
     protected String getScriptText() {
-        return CommonUtils.DQuotes(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt";
+        return Utils_.DQuotes(((GlobalDatabase) Utils_.db).settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt";
     }
     //скорее всего как то выделить подготовку к компиляции как метод предка.
     @Override
@@ -45,7 +45,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso
     protected void ValidateTaskResults() throws Exception {
         if (getBinary().exists()) {
             File renamed_binary = Paths.get(getProjectCopy().getAbsolutePath(),
-                    CommonUtils.getDateName("spf") + ".exe").toFile();
+                    Utils_.getDateName("spf") + ".exe").toFile();
             task.binary_name = renamed_binary.getName();
             Files.move(getBinary().toPath(), renamed_binary.toPath(), StandardCopyOption.REPLACE_EXISTING);
             task.state = TaskState.Done;
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java
index f1054f44..48402e2d 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
 import _VisualDVM.GlobalData.Tasks.Task;
 import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -21,7 +21,7 @@ public abstract class WindowsLocalTaskSupervisor<T extends Task> extends LocalTa
             try {
                 AbortTask();
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
             }
             task.state = TaskState.AbortedByTimeout;
         }
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
index 214ff529..3acbeb47 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.GlobalData.Tasks.QueueSystem.MVS;
@@ -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=" + CommonUtils.DQuotes(mvs_time) + " ./run";
+        String res = "maxtime=" + Utils_.DQuotes(mvs_time) + " ./run";
         if (!env.isEmpty())
             res = env + " " + res;
         /*
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
index a9364a6e..517e8509 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -36,7 +36,7 @@ public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<Compilatio
     @Override
     protected void ValidateTaskResults() throws Exception {
         if (pass.user.connection.Exists(getBinary())) {
-            RemoteFile renamed_binary = new RemoteFile(getRemoteProject().full_name, CommonUtils.getDateName("spf_" + getBinary().name));
+            RemoteFile renamed_binary = new RemoteFile(getRemoteProject().full_name, Utils_.getDateName("spf_" + getBinary().name));
             pass.user.connection.sftpChannel.rename(getBinary().full_name, renamed_binary.full_name);
             task.binary_name = renamed_binary.name;
             task.state = TaskState.Done;
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
index e88bb5bf..cf257cfc 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor;
@@ -77,10 +77,10 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
     protected String getStartCommand() {
         String res =
                 String.join(" ",
-                        CommonUtils.DQuotes(getStarter()),
-                        CommonUtils.DQuotes(getLauncher()),
+                        Utils_.DQuotes(getStarter()),
+                        Utils_.DQuotes(getLauncher()),
                         String.valueOf(task.maxtime),
-                        CommonUtils.DQuotes(getCoupDeGrace()),
+                        Utils_.DQuotes(getCoupDeGrace()),
                         task.getFullCommand()
                 );
         return res;
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
index e146210e..8090b749 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.Tasks.Task;
 import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -16,7 +16,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
     public void ShowTaskState(){
 
 
-        CommonUtils.db.tables.get(task.getClass()).ShowUI(task.getPK());
+        Utils_.db.tables.get(task.getClass()).ShowUI(task.getPK());
     }
     public void Init(T task_in, P pass_in, db_project_info project_in) {
         task = task_in;
@@ -25,7 +25,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
         try {
             project.CleanInterruptFile();
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
     protected void PrepareWorkspace() throws Exception {
@@ -96,7 +96,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
             task.state = TaskState.AbortedByUser;
             ShowTaskState();
         }
-        pass.ShowMessage1("Задача " + CommonUtils.Brackets(task.state.getDescription()));
+        pass.ShowMessage1("Задача " + Utils_.Brackets(task.state.getDescription()));
         task.EndDate = (new Date()).getTime();
         pass.ShowMessage2("Получение результатов");
         AchieveResults();
@@ -119,7 +119,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
             if (task.PID.isEmpty())
                 throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
             task.StartDate = (new Date()).getTime();
-            pass.ShowMessage1("Задача активна, идентификатор " + CommonUtils.Brackets(task.PID));
+            pass.ShowMessage1("Задача активна, идентификатор " + Utils_.Brackets(task.PID));
             RefreshProgress();
             do {
                 Thread.sleep(getTaskCheckPeriod() * 1000);
@@ -132,6 +132,6 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
         }
     }
     public void UpdateTask() throws Exception {
-        CommonUtils.db.Update(task);
+        Utils_.db.Update(task);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/Task.java b/src/_VisualDVM/GlobalData/Tasks/Task.java
index 4baf9b49..2e46aecd 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Task.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Task.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Tasks;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.Utils;
@@ -44,7 +44,7 @@ public abstract class Task extends iDBObject {
         EndDate = 0;
         Time = 0;
         state = TaskState.Inactive;
-        CommonUtils.db.Update(this);
+        Utils_.db.Update(this);
     }
     //</editor-fold>
     //<editor-fold desc="локальные файлы">
@@ -66,10 +66,10 @@ public abstract class Task extends iDBObject {
         return new Date(EndDate);
     }
     public Machine getMachine() {
-        return CommonUtils.db.getById(Machine.class, machine_id);
+        return Utils_.db.getById(Machine.class, machine_id);
     }
     public User getUser() {
-        return CommonUtils.db.getById(User.class, user_id);
+        return Utils_.db.getById(User.class, user_id);
     }
     protected String getTextResult(File file) {
         return (file.exists()) ? Utils.ReadAllText(file) : "файл не найден. Задача еще не выполнялась или была завершена некорректно";
@@ -92,9 +92,9 @@ public abstract class Task extends iDBObject {
         if (state != state_in) {
             state = state_in;
             try {
-                CommonUtils.db.Update(this);
+                Utils_.db.Update(this);
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
             }
         }
     }
diff --git a/src/_VisualDVM/GlobalData/User/UI/UserFields.java b/src/_VisualDVM/GlobalData/User/UI/UserFields.java
index 2ee2c7c7..e38ecc19 100644
--- a/src/_VisualDVM/GlobalData/User/UI/UserFields.java
+++ b/src/_VisualDVM/GlobalData/User/UI/UserFields.java
@@ -1,5 +1,5 @@
 package _VisualDVM.GlobalData.User.UI;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Menus.TextEditorMenu;
 import Common.Visual.TextField.StyledPasswordField;
 import Common.Visual.TextField.StyledTextField;
@@ -27,7 +27,7 @@ public class UserFields implements DialogFields {
             public void actionPerformed(ActionEvent e) {
                 password_visible = !password_visible;
                 tfPassword.setEchoChar(password_visible ? unmask : mask);
-                bPasswordVisibility.setIcon(CommonUtils.getIcon("/icons/" + (password_visible ? "Show" : "Hide") + "Password.png"));
+                bPasswordVisibility.setIcon(Utils_.getIcon("/icons/" + (password_visible ? "Show" : "Hide") + "Password.png"));
             }
         });
     }
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index 952d73cb..f512705a 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -1,5 +1,5 @@
 package _VisualDVM;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Visual.Menus.StableMenuItem;
 import Visual_DVM_2021.Passes.PassCode;
 import Common.Passes.Pass;
@@ -158,7 +158,7 @@ public class GlobalProperties {
         //-
         menu_item.addActionListener(e -> {
             if (Pass.passes.get(PassCode.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
-                menu_item.setIcon(CommonUtils.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                menu_item.setIcon(Utils_.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
         });
         menu.add(menu_item);
     }
@@ -184,7 +184,7 @@ public class GlobalProperties {
     }
     public void Update() {
         try {
-            CommonUtils.jsonToFile(this, getFile());
+            Utils_.jsonToFile(this, getFile());
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/src/_VisualDVM/ProjectData/Files/DBProjectFile.java b/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
index 69ea70e9..7d9a8a93 100644
--- a/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
+++ b/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.Files;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.Utils;
@@ -85,7 +85,7 @@ public class DBProjectFile extends ProjectFile {
         if (data.length > 1) {
             String[] data1 = data[1].split(":");
             if (data1.length > 0) {
-                file = CommonUtils.toW(data1[0]);//.substring(1));
+                file = Utils_.toW(data1[0]);//.substring(1));
 //первый символ тут всегда пробел. слеши всегда виндовые.
             }
         }
@@ -97,7 +97,7 @@ public class DBProjectFile extends ProjectFile {
                 lastLine = line_in;
                 father.db.Update(this);
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
             }
         }
     }
@@ -156,7 +156,7 @@ public class DBProjectFile extends ProjectFile {
         String default_options = "";
         switch (languageName) {
             case fortran:
-                default_options += " -spf -noProject -o " + CommonUtils.DQuotes(getDepFile().getAbsolutePath());
+                default_options += " -spf -noProject -o " + Utils_.DQuotes(getDepFile().getAbsolutePath());
                 switch (style) {
                     case free:
                         default_options += " -f90";
@@ -292,7 +292,7 @@ public class DBProjectFile extends ProjectFile {
                 father.db.Update(this);
                 return true;
             } catch (Exception e) {
-                CommonUtils.MainLog.PrintException(e);
+                Utils_.MainLog.PrintException(e);
             }
         }
         return false;
@@ -304,7 +304,7 @@ public class DBProjectFile extends ProjectFile {
                 father.db.Update(this);
                 return true;
             } catch (Exception e) {
-                CommonUtils.MainLog.PrintException(e);
+                Utils_.MainLog.PrintException(e);
             }
         }
         return false;
@@ -316,7 +316,7 @@ public class DBProjectFile extends ProjectFile {
                 father.db.Update(this);
                 return true;
             } catch (Exception e) {
-                CommonUtils.MainLog.PrintException(e);
+                Utils_.MainLog.PrintException(e);
             }
         }
         return false;
@@ -390,10 +390,10 @@ public class DBProjectFile extends ProjectFile {
         father.db.Update(this);
     }
     public String getUnixName() {
-        return CommonUtils.toU(name);
+        return Utils_.toU(name);
     }
     public String getQObjectName() {
-        return CommonUtils.DQuotes(getUnixName() + ".o");
+        return Utils_.DQuotes(getUnixName() + ".o");
     }
 
     @Override
@@ -401,7 +401,7 @@ public class DBProjectFile extends ProjectFile {
         return name;
     }
     public String getProjectNameWithoutExtension() {
-        String extension = CommonUtils.getExtension(file);
+        String extension = Utils_.getExtension(file);
         return name.substring(0, name.length() - (extension.length() + 1));
     }
     public void importSettings(DBProjectFile parent, boolean sapforStyle) throws Exception {
diff --git a/src/_VisualDVM/ProjectData/Files/ProjectFile.java b/src/_VisualDVM/ProjectData/Files/ProjectFile.java
index 0aca6a84..b3c7e648 100644
--- a/src/_VisualDVM/ProjectData/Files/ProjectFile.java
+++ b/src/_VisualDVM/ProjectData/Files/ProjectFile.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.Files;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.ProjectData.LanguageName;
@@ -48,7 +48,7 @@ public class ProjectFile extends DBObject {
             }
         }
         //-
-        switch (CommonUtils.getExtensionFromName(name_in)) {
+        switch (Utils_.getExtensionFromName(name_in)) {
             case "f":
             case "fdv":
             case "for":
@@ -87,7 +87,7 @@ public class ProjectFile extends DBObject {
                 fileType = FileType.forbidden;
                 break;
             case "":
-                if (CommonUtils.isIntegerValue(name_in)) {
+                if (Utils_.isIntegerValue(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 CommonUtils.toU(file.getName());
+        return Utils_.toU(file.getName());
     }
     @Override
     public String toString() {
         return file.getName();
     }
     public String getQSourceName() {
-        return CommonUtils.DQuotes(getUnixName());
+        return Utils_.DQuotes(getUnixName());
     }
     public String getStyleOptions() {
         if (languageName == LanguageName.fortran) {
diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
index fb9ba374..9dc94c65 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Visual.Editor.CaretInfo;
 import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
 import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
@@ -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))
-                        && !CommonUtils.isRBracketsBalanced(getCaretInfo().before);
+                        && !Utils_.isRBracketsBalanced(getCaretInfo().before);
     }
     //итоговая функция, определяющая наличие директивы в автозаполнении
     public boolean Check() {
diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java
index b66f74d6..7ec4ce7e 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
 public class IntervalDirective extends BaseDirective {
     protected String prefix;
@@ -19,9 +19,9 @@ public class IntervalDirective extends BaseDirective {
     }
     @Override
     public String getReplacementText() {
-        prefix = CommonUtils.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
+        prefix = Utils_.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
         word = name.getText();
-        suffix = CommonUtils.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
+        suffix = Utils_.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
         String pp = prefix.replace(" ", "");
         String ps = suffix.replace(" ", "");
         if ((!ps.isEmpty()) && (ps.charAt(0) != ','))
diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java
index 3bbd7312..8ee2e6c7 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
 //промежуточный тип. относится ко всем директивам со скобками и требующим запятых.
 public class SpecDirective extends BaseDirective {
@@ -16,9 +16,9 @@ public class SpecDirective extends BaseDirective {
     }
     @Override
     public String getReplacementText() {
-        prefix = CommonUtils.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
+        prefix = Utils_.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
         word = get_word();
-        suffix = CommonUtils.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
+        suffix = Utils_.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
         String pp = prefix.replace(" ", "");
         String ps = suffix.replace(" ", "");
         if (!pp.isEmpty() && (pp.charAt(pp.length() - 1) != ',') && (pp.charAt(pp.length() - 1) != '('))
diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
index 4c6db4dd..25540063 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.Files.UI.Editor;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -46,7 +46,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
         highlighter = (RSyntaxTextAreaHighlighter) getHighlighter();
         autoComplete = new SapforAutoComplete(this);
         //-------------------------
-        float font_size = (float) ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.EditorFontSize).toInt32();
+        float font_size = (float) ((GlobalDatabase) Utils_.db).settings.get(SettingName.EditorFontSize).toInt32();
         setFont(getFont().deriveFont(font_size));
         //-------------------------
         setText(Utils.ReadAllText(file.file).replace("\r", " "));
@@ -151,7 +151,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
                             painter
                     ));
                 } catch (BadLocationException ex) {
-                    CommonUtils.MainLog.PrintException(ex);
+                    Utils_.MainLog.PrintException(ex);
                 }
             }
         }
@@ -167,7 +167,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
             Pair<Long, Integer> p = file.gcov_info.line_info.get(lineNum);
             Color color = never;
             if (p.getKey() > 0) {
-                color = (p.getValue() >= ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.GCOVLimit).toInt32()) ?
+                color = (p.getValue() >= ((GlobalDatabase) Utils_.db).settings.get(SettingName.GCOVLimit).toInt32()) ?
                         new Color(255, 255, (100 - p.getValue()), 90) : null;
             }
             if (color != null) {
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java b/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
index c7b1e780..e6d3757c 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.Files.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 import _VisualDVM.Visual.UI;
 
@@ -41,7 +41,7 @@ public class FilesHyperlinksPanel extends JPanel {
             }
         });
         Hyperlinks.setLayoutOrientation(JList.VERTICAL);
-        Hyperlinks.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        Hyperlinks.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         add(Hyperlinks, BorderLayout.CENTER);
     }
 }
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java b/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
index 7741dbb4..6e64e30f 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.Files.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Global;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Trees.StyledTreeCellRenderer;
@@ -23,7 +23,7 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
             File dir = (File) o;
             setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
             setText(dir.getName());
-            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         } else if (o instanceof DBProjectFile) {
             DBProjectFile file = (DBProjectFile) o;
             if (Global.files_multiselection) {
@@ -32,8 +32,8 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
                 setIcon(file.GetIcon());
             }
             setText(file.file.getName());
-            if (file.IsMain()) setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeBold));
-            else setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+            if (file.IsMain()) setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeBold));
+            else setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
             if (file.state.equals(FileState.Excluded)) {
                 Map attributes = getFont().getAttributes();
                 attributes.put(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON);
diff --git a/src/_VisualDVM/ProjectData/Messages/Message.java b/src/_VisualDVM/ProjectData/Messages/Message.java
index 5d92882e..9a010fb9 100644
--- a/src/_VisualDVM/ProjectData/Messages/Message.java
+++ b/src/_VisualDVM/ProjectData/Messages/Message.java
@@ -1,7 +1,7 @@
 package _VisualDVM.ProjectData.Messages;
 import Common.Current_;
 import Common.Mode;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
@@ -31,7 +31,7 @@ public class Message extends FileObject {
                 (Global.mode != Mode.Normal)) {
             value = value_in;
         } else {
-            value = !((GlobalDatabase)CommonUtils.db).settings.get(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in);
+            value = !((GlobalDatabase) Utils_.db).settings.get(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in);
         }
     }
     // last code - 183
@@ -397,9 +397,9 @@ public class Message extends FileObject {
                         }
                     } while (idx != -1);
                     if (sum != splited.length && !message.equals("")) {
-                        CommonUtils.CopyToClipboard(message);
+                        Utils_.CopyToClipboard(message);
                         throw new PassException("Ошибка при декодировании сообщений на русском языке\n" +
-                                "message=" + CommonUtils.Brackets(message));
+                                "message=" + Utils_.Brackets(message));
                     }
                     idx = 0;
                     String result = "";
diff --git a/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java b/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java
index 93ee7020..abc972bd 100644
--- a/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java
+++ b/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java
@@ -1,6 +1,6 @@
 package _VisualDVM.ProjectData.Messages.Recommendations;
 import Common.Database.Objects.iDBObject;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode;
 import com.sun.org.glassfish.gmbal.Description;
@@ -19,18 +19,18 @@ public class MessageRecommendation extends iDBObject {
     public MessageRecommendation(PassCode passCode_in) {
         type = RecommendationType.Transformation;
         argName = passCode_in.toString();
-        text = "Выполните преобразование " + CommonUtils.Quotes(passCode_in.getDescription());
+        text = "Выполните преобразование " + Utils_.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 " + CommonUtils.Quotes(settingName_in.getDescription());
+            text = "Включите настройку SAPFOR " + Utils_.Quotes(settingName_in.getDescription());
         else if (argValue.equals("0"))
-            text = "Отключите настройку SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
+            text = "Отключите настройку SAPFOR " + Utils_.Quotes(settingName_in.getDescription());
         else
-            text = "Задайте значение " + CommonUtils.DQuotes(argValue) + " для настройки SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
+            text = "Задайте значение " + Utils_.DQuotes(argValue) + " для настройки SAPFOR " + Utils_.Quotes(settingName_in.getDescription());
     }
     public MessageRecommendation(String text_in) {
         type = RecommendationType.Text;
diff --git a/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java b/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
index bf191dea..4966902c 100644
--- a/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
+++ b/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.Project.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import Common.Visual.Selectable;
@@ -42,7 +42,7 @@ public class VersionsTreeCellRenderer extends StyledTreeCellRenderer {
             }
         }
         setForeground(tree.getForeground());
-        setFont(CommonUI.getTheme().Fonts.get(
+        setFont(UI_.getTheme().Fonts.get(
                 version.isNew ? VisualiserFonts.NewVersion : VisualiserFonts.TreePlain));
         setText(version.getTitle());
         return this;
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index cd16aa57..c2e7d6ca 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -1,8 +1,8 @@
 package _VisualDVM.ProjectData.Project;
 import Common.CommonConstants;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
@@ -172,13 +172,13 @@ public class db_project_info extends DBObject {
         parent = parent_in;
         name = parent.GenerateVersionName(letter_in);
         languageName = parent.languageName;
-        style = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
+        style = ((GlobalDatabase) Utils_.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
         description = description_in;
         original = original_in;
         Home = Paths.get(parent_in.Home.getAbsolutePath(), name).toFile();
         parent.SaveVersionToBuild(name);
         if (!Home.mkdir()) throw new PassException("Не удалось создать папку для версии");
-        creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
+        creationDate = Utils_.getDateNumber(); //----------------------------------------------------------------------------->>>
         CreateVisualiserData();
         parent.AddVersion(this);
         //если это делать раньше, папка версии учтется как подпапка.
@@ -191,7 +191,7 @@ public class db_project_info extends DBObject {
         name = Home.getName();
         description = description_;
         if (create_data) {
-            creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
+            creationDate = Utils_.getDateNumber(); //----------------------------------------------------------------------------->>>
             CreateVisualiserData();
         }
     }
@@ -208,7 +208,7 @@ public class db_project_info extends DBObject {
         if (stored_info == null) {
             name = Home.getName();
             description = "";
-            creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
+            creationDate = Utils_.getDateNumber(); //----------------------------------------------------------------------------->>>
             db.Insert(this);
         } else
             ExtractStoredInfo(stored_info);
@@ -252,7 +252,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public void UpdatefgResistance(int resistance_in) {
@@ -260,7 +260,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public void UpdatefgScreen(double screen_in) {
@@ -268,7 +268,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public void UpdateCompilationMaxtime(int ct_in) {
@@ -276,7 +276,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public void UpdateRunMaxtime(int rt_in) {
@@ -284,7 +284,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     //</editor-fold>
@@ -301,7 +301,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public void SwitchFilterMultiplied() {
@@ -309,15 +309,15 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public boolean IsMCopy() {
         String lname = name.toLowerCase();
-        return (lname.startsWith("m") && CommonUtils.isIntegerValue(lname.substring(1)));
+        return (lname.startsWith("m") && Utils_.isIntegerValue(lname.substring(1)));
     }
     public String getTitle() {
-        return name + " " + CommonUtils.DQuotes(description);
+        return name + " " + Utils_.DQuotes(description);
     }
     public File getProjFile() {
         return Paths.get(Home.getAbsolutePath(), Constants.data, Constants.spf).toFile();
@@ -452,7 +452,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
     public boolean UpdateLanguage(LanguageName lang_in) {
@@ -543,7 +543,7 @@ public class db_project_info extends DBObject {
             db.Update(this);
             return true;
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         return false;
     }
@@ -551,14 +551,14 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public void UpdateDVMCount() {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public boolean UpdateAddictedCount() {
@@ -566,7 +566,7 @@ public class db_project_info extends DBObject {
             db.Update(this);
             return true;
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         return false;
     }
@@ -678,8 +678,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("В папке " + CommonUtils.Brackets(subdir.getAbsolutePath()) + "\n" +
-                        "уже существует папка с именем " + CommonUtils.Brackets(new_directory.getName()));
+                passLog.Writeln("В папке " + Utils_.Brackets(subdir.getAbsolutePath()) + "\n" +
+                        "уже существует папка с именем " + Utils_.Brackets(new_directory.getName()));
                 return false;
             }
         }
@@ -700,7 +700,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
     public mxGraphComponent DrawFunctionsGraph() {
@@ -718,8 +718,8 @@ public class db_project_info extends DBObject {
     }
     public boolean CheckAttachmentFile(File f, TextLog Log) {
         Utils.validateFileShortNewName(f.getName(), Log);
-        if (CommonUtils.getFileSizeMegaBytes(f) > 2)
-            Log.Writeln_("Размер вложения " + CommonUtils.Brackets(f.getName()) + " превышает 2 Мb");
+        if (Utils_.getFileSizeMegaBytes(f) > 2)
+            Log.Writeln_("Размер вложения " + Utils_.Brackets(f.getName()) + " превышает 2 Мb");
         return Log.isEmpty();
     }
     public boolean CheckAllAttachments(TextLog Log) {
@@ -848,7 +848,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 (CommonUtils.isIntegerValue(last)) {
+                if (Utils_.isIntegerValue(last)) {
                     int vn = Integer.parseInt(last);
                     if (vn > max_vn)
                         max_vn = vn;
@@ -866,7 +866,7 @@ public class db_project_info extends DBObject {
         for (DBProjectFile file : parent.db.files.Data.values()) {
             Files.copy(file.file.toPath(),
                     Paths.get(Home.getAbsolutePath(),
-                            CommonUtils.isWindows() ? file.name :
+                            Utils_.isWindows() ? file.name :
                                     file.name.replace('\\', '/')));
         }
     }
@@ -906,7 +906,7 @@ public class db_project_info extends DBObject {
         }
     }
     public void createEmptyVersion(String versionLetter, String versionDescription) throws Exception {
-        boolean needsM = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SaveModifications).toBoolean();
+        boolean needsM = ((GlobalDatabase) Utils_.db).settings.get(SettingName.SaveModifications).toBoolean();
         if (needsM)
             createModification();
         last_version = new db_project_info(
@@ -924,7 +924,7 @@ public class db_project_info extends DBObject {
         last_version.description = description_in;
         last_version.original = last_modification.name;
         last_version.Home = versionDirectory;
-        last_version.creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
+        last_version.creationDate = Utils_.getDateNumber(); //----------------------------------------------------------------------------->>>
         last_version.CreateVisualiserData();
         this.AddVersion(last_version);
     }
@@ -1090,7 +1090,7 @@ public class db_project_info extends DBObject {
         for (DBProjectFile file : db.files.Data.values()) {
             File src_file = file.file;
             File dst_file = Paths.get(dst.getAbsolutePath(),
-                    CommonUtils.isWindows() ? file.name :
+                    Utils_.isWindows() ? file.name :
                             file.name.replace('\\', '/')).toFile();
             Files.copy(src_file.toPath(), dst_file.toPath());
         }
@@ -1128,7 +1128,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 = CommonUtils.toW(splited[idx++]); //для ключа.
+                String message_file = Utils_.toW(splited[idx++]); //для ключа.
                 int numberOfMessages = Integer.parseInt(splited[idx++]);
                 if (!db.files.Data.containsKey(message_file)) {
                     throw new PassException("Ошибка при распаковке сообщений: файл: [" +
@@ -1162,7 +1162,7 @@ public class db_project_info extends DBObject {
                     String[] localSplit = splited[idx++].split(" ");
                     int m_type = Integer.parseInt(localSplit[0]);
                     if (m_type == 1) {
-                        CommonUI.Info(packed_messages);
+                        UI_.Info(packed_messages);
                         return true;
                     }
                 }
@@ -1235,7 +1235,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         for (ParallelRegion parallelRegion : parallelRegions.Data.values())
             parallelRegion.UpdateLoopsCount();
@@ -1244,7 +1244,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         for (ParallelRegion parallelRegion : parallelRegions.Data.values())
             parallelRegion.UpdateFunctionsCount();
@@ -1254,7 +1254,7 @@ public class db_project_info extends DBObject {
         try {
             db.Update(this);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         for (ParallelRegion parallelRegion : parallelRegions.Data.values())
             parallelRegion.UpdateArraysCount();
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
index 18510430..c12bd3d0 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 // это то что отображается в боковом графе файла. не путать с сапфоровским ProjectArray
@@ -13,6 +13,6 @@ public class ArrayDecl extends FileObjectWithMessages {
     }
     @Override
     public String Description() {
-        return array_loc.getDescription() + " массив " + CommonUtils.Brackets(array_name);
+        return array_loc.getDescription() + " массив " + Utils_.Brackets(array_name);
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
index 216caf6a..f23351a5 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
@@ -39,7 +39,7 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
-                if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
+                if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
                     columns.get(4).setRenderer(RendererHyperlinks);
                     columns.get(4).setEditor(EditorHyperlinks);
                 } else {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
index d3d4b042..3191e89a 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
@@ -103,7 +103,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 = CommonUtils.toW(localSplited[idxPl]);
+            String declFile = Utils_.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 +318,7 @@ public class ProjectArray extends DBObject {
                     default:
                         break;
                 }
-                res += CommonUtils.ending(i == binary.length() - 1);
+                res += Utils_.ending(i == binary.length() - 1);
             }
         }
         return res;
@@ -358,7 +358,7 @@ public class ProjectArray extends DBObject {
     }
     @Override
     public ImageIcon GetDisabledIcon() {
-        return CommonUtils.getIcon("/icons/Arrays/" + State.toString() + ".png");
+        return Utils_.getIcon("/icons/Arrays/" + State.toString() + ".png");
     }
     @Override
     public void select(boolean flag) {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
index 6bd32fe5..779b66e1 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Tables.RendererCell;
 import Common.Visual.Fonts.VisualiserFonts;
 import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
@@ -14,7 +14,7 @@ public class DimensionRenderer extends RendererCell<TemplateDimension> {
     public void Display() {
         if (value != null) {
             setText(value.state.getMaskDescription());
-            setFont(value.isBlocked() ? CommonUI.getTheme().Fonts.get(VisualiserFonts.Disabled) : CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+            setFont(value.isBlocked() ? UI_.getTheme().Fonts.get(VisualiserFonts.Disabled) : UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         }
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
index 5a61937e..ab0c4546 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Tables.DBObjectEditor;
 import Common.Visual.Fonts.VisualiserFonts;
 import _VisualDVM.Visual.UI;
@@ -17,7 +17,7 @@ public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {
     }
     @Override
     public void Action() {
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         value.SwitchState();
         setText(value.state.getMaskDescription());
         UI.getVersionsWindow().getVariantsWindow().ShowFilteredVariantsCount();
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
index c5c552fc..d88764ae 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.ControlForm;
 import Common.Visual.Tables.Grid.GridAnchestor;
@@ -26,7 +26,7 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
     @Override
     public void Clear() {
         super.Clear();
-        CommonUI.Clear(content);
+        UI_.Clear(content);
     }
     @Override
     public void CreateControl() {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
index 1bf1d2a5..b9fe4315 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Trees.StyledTreeCellRenderer;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
@@ -14,9 +14,9 @@ public class RulesTreeCellRenderer extends StyledTreeCellRenderer {
         super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
         Object o = ((DefaultMutableTreeNode) value).getUserObject();
         if (o instanceof String) {
-            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Distribution));
+            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Distribution));
         } else if (o instanceof ParallelRegion)
-            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
         setForeground(tree.getForeground());
         return this;
     }
diff --git a/src/_VisualDVM/ProjectData/SapforData/FileObject.java b/src/_VisualDVM/ProjectData/SapforData/FileObject.java
index 4e988001..a47b3a85 100644
--- a/src/_VisualDVM/ProjectData/SapforData/FileObject.java
+++ b/src/_VisualDVM/ProjectData/SapforData/FileObject.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.Visual.UI;
@@ -18,7 +18,7 @@ public abstract class FileObject extends iDBObject {
     }
     @Override
     public String getSelectionText() {
-        return "файл " + CommonUtils.Brackets(file) + " строка: " + line;
+        return "файл " + Utils_.Brackets(file) + " строка: " + line;
     }
     public DBProjectFile getFather() {
         return Current.getProject().db.files.Data.get(file);
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
index f1bbb7e5..54ebeb90 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
@@ -1,6 +1,6 @@
 package _VisualDVM.ProjectData.SapforData.Functions;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 import Visual_DVM_2021.Passes.PassCode;
@@ -25,14 +25,14 @@ public class FuncCall extends FileObjectWithMessages {
     }
     @Override
     public String Description() {
-        return "вызов " + CommonUtils.Brackets(funcName);
+        return "вызов " + Utils_.Brackets(funcName);
     }
     @Override
     public void Select(boolean flag) {
         if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
             super.Select(flag);
         } else {
-            CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
+            UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
         }
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
index dddeb7df..249843ef 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
@@ -1,6 +1,6 @@
 package _VisualDVM.ProjectData.SapforData.Functions;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Visual_DVM_2021.Passes.PassCode;
 import Common.Passes.Pass;
 
@@ -29,7 +29,7 @@ public class FuncCallH extends FuncCall {
     }
     @Override
     public String getSelectionText() {
-        return "вызов " + CommonUtils.Brackets(funcName) + " в строке " + line;
+        return "вызов " + Utils_.Brackets(funcName) + " в строке " + line;
     }
     @Override
     public void SelectAllChildren(boolean select) {
@@ -41,7 +41,7 @@ public class FuncCallH extends FuncCall {
         if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
             super.Select(flag);
         } else {
-            CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
+            UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
         }
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java
index ffd35138..02455ceb 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Functions;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Utils.Index;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
@@ -52,7 +52,7 @@ public class FuncInfo extends FileObjectWithMessages {
     //--
     @Override
     public String getSelectionText() {
-        return type.getDescription() + " " + CommonUtils.Brackets(funcName);
+        return type.getDescription() + " " + Utils_.Brackets(funcName);
     }
     public boolean isMain() {
         return type.equals(FunctionType.Main);
@@ -64,7 +64,7 @@ public class FuncInfo extends FileObjectWithMessages {
     }
     @Override
     public ImageIcon GetDisabledIcon() {
-        return CommonUtils.getIcon("/icons/Function.png");
+        return Utils_.getIcon("/icons/Function.png");
     }
     @Override
     public void SelectAllChildren(boolean select) {
@@ -77,6 +77,6 @@ public class FuncInfo extends FileObjectWithMessages {
     }
     @Override
     public String Description() {
-        return type.getDescription() + " " + CommonUtils.Brackets(funcName);
+        return type.getDescription() + " " + Utils_.Brackets(funcName);
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
index 2e86c2c0..d3a9b221 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.ControlForm;
 import com.mxgraph.swing.mxGraphComponent;
@@ -22,6 +22,6 @@ public class FunctionsGraphForm extends ControlForm<mxGraphComponent> {
     @Override
     public void Clear() {
         super.Clear();
-        CommonUI.Clear(content);
+        UI_.Clear(content);
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
index 8142ba6d..ff418125 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
@@ -1,6 +1,6 @@
 package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Visual.Menus.VisualiserMenuItem;
 import Common.Visual.Menus.StyledPopupMenu;
@@ -33,7 +33,7 @@ public class FunctionsGraphMenu extends StyledPopupMenu {
     @Override
     public void CheckElementsVisibility() {
         if (Current.HasSelectedFunction()) {
-            changeCurrent.setText("Назначить процедуру " + CommonUtils.DQuotes(Current.getSelectionFunction().funcName) + " текущей.");
+            changeCurrent.setText("Назначить процедуру " + Utils_.DQuotes(Current.getSelectionFunction().funcName) + " текущей.");
             changeCurrent.setEnabled(true);
         } else {
             changeCurrent.setText("Невозможно назначить текущую процедуру: узел графа не выбран");
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
index 03dfe22e..54d7b436 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
@@ -1,7 +1,7 @@
 package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
@@ -244,7 +244,7 @@ public class FunctionsGraphUI extends mxGraph {
                                         break;
                                     case Standard:
                                     case NotFound:
-                                        CommonUI.Info("процедура " + CommonUtils.Brackets(func_name) + " " + fi.type.getDescription());
+                                        UI_.Info("процедура " + Utils_.Brackets(func_name) + " " + fi.type.getDescription());
                                         break;
                                 }
                                 break;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java
index e263f06b..5001463b 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 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(CommonUtils.Brackets(name + "," + neighbor));
+                edges.add(Utils_.Brackets(name + "," + neighbor));
             }
         }
     }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java b/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java
index 6af662c1..63e88cdb 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Includes;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.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 "включение: " + CommonUtils.Brackets(file);
+        return "включение: " + Utils_.Brackets(file);
     }
     //мб на будущее расширить, в какой строке находится команда икнлудить файл.
     // но это уже к Сапфору
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java b/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java
index 89d5386e..0281a433 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Includes;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.SapforData.FileObject;
 
 import javax.swing.*;
@@ -19,7 +19,7 @@ public class FileInfo extends FileObject {
     }
     @Override
     public ImageIcon GetDisabledIcon() {
-        return CommonUtils.getIcon("/icons/File.png");
+        return Utils_.getIcon("/icons/File.png");
     }
     @Override
     public void SelectAllChildren(boolean select) {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
index e91083f9..6929b29c 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Regions;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
@@ -39,7 +39,7 @@ public class ParallelRegion extends DBObject {
         //распаковка Lines -----------------------------------------------
         //---------------------------------------------------------------
         for (int i = 0; i < lines_size; ++i) {
-            String line_file = CommonUtils.toW(localSplited[1]);
+            String line_file = Utils_.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/_VisualDVM/Repository/BugReport/BugReport.java b/src/_VisualDVM/Repository/BugReport/BugReport.java
index f5a5cd2b..364e6969 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReport.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReport.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Repository.BugReport;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.rDBObject;
@@ -64,7 +64,7 @@ public class BugReport extends rDBObject {
         project_version = version_in;
         visualiser_version = Global.visualiser.version;
         sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version;
-        sapfor_settings = ((GlobalDatabase)CommonUtils.db).settings.getSapforSettingsText();
+        sapfor_settings = ((GlobalDatabase) Utils_.db).settings.getSapforSettingsText();
         percentage = 0;
         description = description_in;
         date = new Date().getTime();
diff --git a/src/_VisualDVM/Repository/BugReport/BugReportInterface.java b/src/_VisualDVM/Repository/BugReport/BugReportInterface.java
index aad6de26..948a8d3e 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReportInterface.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReportInterface.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Repository.BugReport;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import Common.Utils.TextLog;
@@ -61,7 +61,7 @@ public class BugReportInterface {
         return true;
     }
     public static String getMailTitlePrefix(BugReport object) {
-        return "Ошибка " + CommonUtils.Brackets(object.id) + ", автор " + CommonUtils.Brackets(object.sender_name) + " : ";
+        return "Ошибка " + Utils_.Brackets(object.id) + ", автор " + Utils_.Brackets(object.sender_name) + " : ";
     }
     public static Vector<String> getRecipients(BugReport object) {
         Vector<String> res = new Vector<>();
diff --git a/src/_VisualDVM/Repository/Component/Component.java b/src/_VisualDVM/Repository/Component/Component.java
index 1cf63778..a3a36736 100644
--- a/src/_VisualDVM/Repository/Component/Component.java
+++ b/src/_VisualDVM/Repository/Component/Component.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Repository.Component;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
@@ -28,7 +28,7 @@ public abstract class Component extends DBObject implements Loggable {
     VFileChooser fileChooser = null; ///для ручной установки.
     public VFileChooser getFileChooser() {
         return (fileChooser == null) ? (fileChooser = new VFileChooser("выбор файла для компонента " +
-                CommonUtils.Brackets(getComponentType().getDescription()), CommonUtils.getExtension(getFile())))
+                Utils_.Brackets(getComponentType().getDescription()), Utils_.getExtension(getFile())))
                 : fileChooser;
     }
     //--
@@ -87,7 +87,7 @@ public abstract class Component extends DBObject implements Loggable {
     }
     public boolean isValidVersion(TextLog Log, String desc) {
         if (version == CommonConstants.Nan) {
-            Log.Writeln_("Не определена версия " + desc + " компонента " + CommonUtils.Brackets(getComponentType().getDescription()));
+            Log.Writeln_("Не определена версия " + desc + " компонента " + Utils_.Brackets(getComponentType().getDescription()));
             return false;
         }
         return true;
diff --git a/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java b/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java
index 3d301b78..4fa65041 100644
--- a/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java
+++ b/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Repository.Component;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Menus.DataMenuBar;
 import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Common.Visual.Fonts.VisualiserFonts;
@@ -12,7 +12,7 @@ public class ComponentsMenuBar extends DataMenuBar {
                 new VisualiserMenu(
                         "Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
                     {
-                        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
+                        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
                         add(Pass.passes.get(PassCode.ResurrectComponent).createMenuItem());
                         add(Pass.passes.get(PassCode.ResurrectComponentFromServer).createMenuItem());
                     }
diff --git a/src/_VisualDVM/Repository/Component/Instruction.java b/src/_VisualDVM/Repository/Component/Instruction.java
index c4b2dcf5..12beaefd 100644
--- a/src/_VisualDVM/Repository/Component/Instruction.java
+++ b/src/_VisualDVM/Repository/Component/Instruction.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Repository.Component;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Utils;
 
 import java.text.DateFormat;
@@ -51,7 +51,7 @@ public class Instruction extends Component {
             DateFormat df = new SimpleDateFormat("MMM dd yyyy HH:mm:ss", Locale.ENGLISH);
             date_text = df.format(getFile().lastModified());
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
 }
diff --git a/src/_VisualDVM/Repository/Component/OSDComponent.java b/src/_VisualDVM/Repository/Component/OSDComponent.java
index f19fe3d2..52e71c83 100644
--- a/src/_VisualDVM/Repository/Component/OSDComponent.java
+++ b/src/_VisualDVM/Repository/Component/OSDComponent.java
@@ -1,12 +1,12 @@
 package _VisualDVM.Repository.Component;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 public abstract class OSDComponent extends Component {
     @Override
     public String getFileName() {
-        return getComponentType().toString() + (CommonUtils.isWindows() ? ".exe" : "");
+        return getComponentType().toString() + (Utils_.isWindows() ? ".exe" : "");
     }
     @Override
     public String getNewFileName() {
-        return getComponentType().toString() + "_new" + (CommonUtils.isWindows() ? ".exe" : "");
+        return getComponentType().toString() + "_new" + (Utils_.isWindows() ? ".exe" : "");
     }
 }
diff --git a/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java b/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
index b34923f0..71874c61 100644
--- a/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
+++ b/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Repository.Component.PerformanceAnalyzer;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import analyzer.common.MessageJtoJ;
@@ -103,7 +103,7 @@ public class PerformanceAnalyzer extends Component {
                 return null;
             });
             Utils.startScript(Global.TempDirectory, Global.ComponentsDirectory, "analyzer",
-                    "java -jar -Dprism.order=sw "+ CommonUtils.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort()+ " --version" );
+                    "java -jar -Dprism.order=sw "+ Utils_.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort()+ " --version" );
             //-
             server_thread.join();
         } catch (Exception ex) {
@@ -125,7 +125,7 @@ public class PerformanceAnalyzer extends Component {
                 try {
 
                     Utils.startScript(Global.TempDirectory, Global.ComponentsDirectory, "analyzer",
-                            "java -jar -Dprism.order=sw "+ CommonUtils.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort());
+                            "java -jar -Dprism.order=sw "+ Utils_.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort());
                     //-
                 } catch (Exception ex) {
                     ex.printStackTrace();
@@ -144,7 +144,7 @@ public class PerformanceAnalyzer extends Component {
     }
     public void Start() {
         if (isActive) {
-            CommonUI.Info("Анализатор уже запущен");
+            UI_.Info("Анализатор уже запущен");
         } else {
             main_thread = new Thread(this::ServerBody);
             main_thread.start();
diff --git a/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java b/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java
index ff1d1a01..69f36336 100644
--- a/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java
+++ b/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Repository.Component.Sapfor;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 
 import java.io.BufferedReader;
@@ -47,7 +47,7 @@ public class MessagesServer {
             if (serverSocket != null)
                 serverSocket.close();
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public int getPort() {
diff --git a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
index 1a068119..b5ee7ce8 100644
--- a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Repository.Component.Sapfor;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
@@ -140,8 +140,8 @@ public abstract class Sapfor extends OSDComponent {
             RunAnalysis("SPF_GetVersionAndBuildDate", -1, "", "");
             Visualizer_2.UnpackVersionInfo(this, getResult());
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
-            CommonUI.Error("Не удалось получить версию компонента " + CommonUtils.DQuotes(getComponentType().getDescription()));
+            Utils_.MainLog.PrintException(e);
+            UI_.Error("Не удалось получить версию компонента " + Utils_.DQuotes(getComponentType().getDescription()));
         }
     }
     public abstract String getUpdateCommand();
@@ -169,9 +169,9 @@ public abstract class Sapfor extends OSDComponent {
         RunAnalysis("SPF_StatisticAnalyzer",
                 -1,
                 "",
-                CommonUtils.DQuotes(src.getAbsolutePath()) +
+                Utils_.DQuotes(src.getAbsolutePath()) +
                         " "
-                        + CommonUtils.DQuotes(dst.getAbsolutePath())
+                        + Utils_.DQuotes(dst.getAbsolutePath())
         );
     }
     public void Restart() throws Exception {
@@ -185,7 +185,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: Не удалось перейти в папку "
-                    + CommonUtils.Brackets(directory_in.getAbsolutePath()) +
+                    + Utils_.Brackets(directory_in.getAbsolutePath()) +
                     "\n" + "Код возврата: " + getErrorCode());
     }
     public String getResult() {
@@ -257,7 +257,7 @@ public abstract class Sapfor extends OSDComponent {
                     }
                 } else if (z == 1) file_text = sub;
                 else if (z == 2) {
-                    ModifiedFiles.put(CommonUtils.toW(sub), file_text);
+                    ModifiedFiles.put(Utils_.toW(sub), file_text);
                     file_text = null;
                 }
                 codeIdx += count;
@@ -336,7 +336,7 @@ public abstract class Sapfor extends OSDComponent {
                     Utils.WriteToFile(file, OldFiles.get(name));
                 }
                 OldFiles.clear();
-            } else CommonUI.Info("Сохранение файлов отсутствует.");
+            } else UI_.Info("Сохранение файлов отсутствует.");
         }
         if (cuf != null)
             Pass.passes.get(PassCode.OpenCurrentFile).Do(cuf);
@@ -353,20 +353,20 @@ public abstract class Sapfor extends OSDComponent {
         for (PassCode code : getAnalysesCodes())
             (Pass.passes.get(code)).Reset();
         //------------------------------------------------------------------------------------------>>>> пакетный режим.
-        if (CommonUI.isActive()) {
+        if (UI_.isActive()) {
             Pass.passes.get(PassCode.Precompilation).Reset();
             Pass.passes.get(PassCode.SPF_GetGCovInfo).Reset();
         }
         Global.enable_text_changed = false;
         Global.transformationPermission = TransformationPermission.None;
-        if ((CommonUI.isActive()) && (UI.HasMainWindow()) && (UI.getVersionsWindow() != null))
+        if ((UI_.isActive()) && (UI.HasMainWindow()) && (UI.getVersionsWindow() != null))
             UI.getVersionsWindow().BlockVariants();
     }
     //--------------------------------------------------------------------------->>
     //временный (?) проход, по тихому получить размерность теста, предварительно выполнив тихий парс.
     //тут все одноразовое. считаем что таблицы бд уже заполнены как надо.
     public LanguageStyle getStyle() throws Exception {
-        return ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
+        return ((GlobalDatabase) Utils_.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
     }
     //----------
     public static Vector<PassCode> getScenariosCodes() {
@@ -411,12 +411,12 @@ public abstract class Sapfor extends OSDComponent {
     //------------------------------------------------------------------------------------------------------------------
     public String getConsoleFlags() throws Exception {
         Vector<String> res = new Vector<>();
-        if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FREE_FORM).toBoolean())
+        if (((GlobalDatabase) Utils_.db).settings.get(SettingName.FREE_FORM).toBoolean())
             res.add("-f90");
-        if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.STATIC_SHADOW_ANALYSIS).toBoolean())
+        if (((GlobalDatabase) Utils_.db).settings.get(SettingName.STATIC_SHADOW_ANALYSIS).toBoolean())
             res.add("-sh");
-        res.add("-shwidth " + ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.MAX_SHADOW_WIDTH));
-        if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.KEEP_SPF_DIRECTIVES).toBoolean())
+        res.add("-shwidth " + ((GlobalDatabase) Utils_.db).settings.get(SettingName.MAX_SHADOW_WIDTH));
+        if (((GlobalDatabase) Utils_.db).settings.get(SettingName.KEEP_SPF_DIRECTIVES).toBoolean())
             res.add("-keepSPF");
         return String.join(" ", res);
     }
@@ -457,16 +457,16 @@ public abstract class Sapfor extends OSDComponent {
         Utils.delete_with_check(outputFile);
         Utils.delete_with_check(errorsFile);
         //---
-        File file = new File(data_workspace, name + (CommonUtils.isWindows() ? ".bat" : ".sh"));
+        File file = new File(data_workspace, name + (Utils_.isWindows() ? ".bat" : ".sh"));
         FileUtils.write(file,
-                CommonUtils.DQuotes(sapfor_drv)
+                Utils_.DQuotes(sapfor_drv)
                         + (flags.isEmpty() ? "" : (" " + flags))
                         + " -noLogo"
                         + " " + command +
                         " 1>" +
-                        CommonUtils.DQuotes(outputFile.getAbsolutePath()) +
+                        Utils_.DQuotes(outputFile.getAbsolutePath()) +
                         " 2>" +
-                        CommonUtils.DQuotes(errorsFile.getAbsolutePath()),
+                        Utils_.DQuotes(errorsFile.getAbsolutePath()),
                 Charset.defaultCharset());
         if (!file.setExecutable(true))
             throw new Exception("Не удалось сделать файл скрипта " + name + " исполняемым!");
@@ -480,8 +480,8 @@ public abstract class Sapfor extends OSDComponent {
                 exit_code = process.waitFor();
                 flag = true;
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
-                CommonUtils.sleep(1000);
+                Utils_.MainLog.PrintException(ex);
+                Utils_.sleep(1000);
             }
         }
         while (!flag);
@@ -531,7 +531,7 @@ public abstract class Sapfor extends OSDComponent {
     public static File temp_copy = null;
     public static File getTempCopy(File src) throws Exception {
         if (temp_copy == null || !temp_copy.exists()) {
-            temp_copy = Utils.getTempFileName("SAPFOR" + (CommonUtils.isWindows() ? ".exe" : ""));
+            temp_copy = Utils.getTempFileName("SAPFOR" + (Utils_.isWindows() ? ".exe" : ""));
             FileUtils.copyFile(src, temp_copy);
             temp_copy.setExecutable(true);
         }
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 7b76a8f9..4be1fdf2 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Repository.Component;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.SettingName;
@@ -76,8 +76,8 @@ public class Visualiser extends Component {
         System.exit(0);
     }
     public File getWorkspace() {
-        if (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).toString().isEmpty()) {
-            File workspace = new File(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).toString());
+        if (!((GlobalDatabase) Utils_.db).settings.get(SettingName.Workspace).toString().isEmpty()) {
+            File workspace = new File(((GlobalDatabase) Utils_.db).settings.get(SettingName.Workspace).toString());
             if (workspace.exists())
                 return workspace;
             else
diff --git a/src/_VisualDVM/Repository/Component/Visualizer_2.java b/src/_VisualDVM/Repository/Component/Visualizer_2.java
index 984bb82c..5891ef24 100644
--- a/src/_VisualDVM/Repository/Component/Visualizer_2.java
+++ b/src/_VisualDVM/Repository/Component/Visualizer_2.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Repository.Component;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
 import Common.Passes.PassException;
@@ -40,7 +40,7 @@ public class Visualizer_2 extends OSDComponent {
     }
     @Override
     public String getHome() {
-        return CommonUtils.getHomePath();
+        return Utils_.getHomePath();
     }
     @Override
     public void GetVersionInfo() {
@@ -48,7 +48,7 @@ public class Visualizer_2 extends OSDComponent {
             Command("get_version: ");
             UnpackVersionInfo(this, response);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     public void refreshPid(){
@@ -58,7 +58,7 @@ public class Visualizer_2 extends OSDComponent {
             PID = response;
          //   UI.Info("SERVER PID = "+Utils.Brackets(PID));
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
     }
     @Override
@@ -66,7 +66,7 @@ public class Visualizer_2 extends OSDComponent {
         super.Update();
         SendRequest("update_server: ");
         ReplaceOldFile();
-        CommonUI.Info("Сервер успешно обновлен.\n" +
+        UI_.Info("Сервер успешно обновлен.\n" +
                 "Визуализатор завершает работу.\n" +
                 "Для продолжения перезапустите визуализатор вручную.");
         System.exit(0);
@@ -120,7 +120,7 @@ public class Visualizer_2 extends OSDComponent {
             case "NOT_FOUND":
             case "WRONG":
             case "SEG_FAULT":
-                throw new PassException("Команда серверу SAPFOR вернула " + CommonUtils.Brackets(response));
+                throw new PassException("Команда серверу SAPFOR вернула " + Utils_.Brackets(response));
             default:
                 break;
         }
diff --git a/src/_VisualDVM/Repository/EmailMessage.java b/src/_VisualDVM/Repository/EmailMessage.java
index f74b6d67..8a0184ab 100644
--- a/src/_VisualDVM/Repository/EmailMessage.java
+++ b/src/_VisualDVM/Repository/EmailMessage.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Repository;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 import java.io.File;
 import java.io.Serializable;
@@ -18,6 +18,6 @@ public class EmailMessage implements Serializable {
         targets.addAll(targets_in);
     }
     public void addAttachement(File f) throws Exception {
-        files.put(f.getName(), CommonUtils.fileToBytes(f));
+        files.put(f.getName(), Utils_.fileToBytes(f));
     }
 }
diff --git a/src/_VisualDVM/Repository/RepositoryClient.java b/src/_VisualDVM/Repository/RepositoryClient.java
index e25c0db1..99bf7f62 100644
--- a/src/_VisualDVM/Repository/RepositoryClient.java
+++ b/src/_VisualDVM/Repository/RepositoryClient.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Repository;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import Common.Passes.PassException;
@@ -21,7 +21,7 @@ public abstract class RepositoryClient {
         try {
             if (isPrintOn()) {
                 FileWriter testLog = new FileWriter(getClass().getSimpleName() + "_Log.txt", true);
-                String dmessage = CommonUtils.Brackets(new Date()) + " " + message;
+                String dmessage = Utils_.Brackets(new Date()) + " " + message;
                 System.out.println(dmessage);
                 testLog.write(dmessage + "\n");
                 testLog.close();
@@ -59,7 +59,7 @@ public abstract class RepositoryClient {
         return ServerCommand(code_in, "", null);
     }
     protected void ServerConnectionError(ServerCode code_in, String logText) throws Exception {
-        throw new PassException(CommonUtils.Brackets(new Date().toString())+" Ошибка взаимодействия с сервером " + code_in);
+        throw new PassException(Utils_.Brackets(new Date().toString())+" Ошибка взаимодействия с сервером " + code_in);
     }
     public abstract void perform() throws Exception;
     public void Perform(){
@@ -68,7 +68,7 @@ public abstract class RepositoryClient {
         } catch (Exception ex) {
             ex.printStackTrace();
         } finally {
-            CommonUtils.sleep(getSleepMillis());
+            Utils_.sleep(getSleepMillis());
         }
     }
 }
diff --git a/src/_VisualDVM/Repository/RepositoryServer.java b/src/_VisualDVM/Repository/RepositoryServer.java
index 680eff1b..af399f7c 100644
--- a/src/_VisualDVM/Repository/RepositoryServer.java
+++ b/src/_VisualDVM/Repository/RepositoryServer.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Repository;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Database;
@@ -74,7 +74,7 @@ public abstract class RepositoryServer<D extends Database> {
         if (printOn) {
             try {
                 Log = new FileWriter("Log.txt", true);
-                String dmessage = CommonUtils.Brackets("SESSION -> ") + new Date() +
+                String dmessage = Utils_.Brackets("SESSION -> ") + new Date() +
                         " " + message;
                 Log.write(dmessage + "\n");
                 Log.close();
@@ -102,7 +102,7 @@ public abstract class RepositoryServer<D extends Database> {
                 LinkedHashMap<String, File> innerFiles = new LinkedHashMap<>();
                 for (String aName : message_in.files.keySet()) {
                     File f = Utils.getTempFileName(aName);
-                    CommonUtils.bytesToFile(message_in.files.get(aName), f);
+                    Utils_.bytesToFile(message_in.files.get(aName), f);
                     innerFiles.put(aName, f);
                 }
                 Vector<String> targets_ = new Vector<>(message_in.targets);
@@ -151,9 +151,9 @@ public abstract class RepositoryServer<D extends Database> {
                             Transport.send(message);
                             done = true;
                         } catch (Exception ex) {
-                            System.out.println("Исключение во время отправки сообщения абоненту " + CommonUtils.Brackets(target));
+                            System.out.println("Исключение во время отправки сообщения абоненту " + Utils_.Brackets(target));
                             ex.printStackTrace();
-                            CommonUtils.sleep(1000);
+                            Utils_.sleep(1000);
                         } finally {
                             attempts--;
                         }
@@ -210,20 +210,20 @@ public abstract class RepositoryServer<D extends Database> {
                             switch (code) {
                                 //<editor-fold desc="файлы и почта">
                                 case ReadFile:
-                                    Print("Отправить клиенту текст файла по пути " + CommonUtils.Brackets(request.arg));
+                                    Print("Отправить клиенту текст файла по пути " + Utils_.Brackets(request.arg));
                                     response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.ReadAllText(new File(request.arg)));
                                     break;
                                 case SendFile:
                                     //нам пришел файл.
-                                    Print("Получить от клиента файл, и распаковать его по пути " + CommonUtils.Brackets(request.arg));
+                                    Print("Получить от клиента файл, и распаковать его по пути " + Utils_.Brackets(request.arg));
                                     request.Unpack(); //распаковка идет по его аргу-пути назначения
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     break;
                                 case ReceiveFile:
-                                    Print("Отправить клиенту файл по пути " + CommonUtils.Brackets(request.arg));
+                                    Print("Отправить клиенту файл по пути " + Utils_.Brackets(request.arg));
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     File file = new File(request.arg);
-                                    response.object = file.exists() ? CommonUtils.fileToBytes(file) : null;
+                                    response.object = file.exists() ? Utils_.fileToBytes(file) : null;
                                     break;
                                 case Email:
                                     Print("Отправка сообщения электронной почты");
diff --git a/src/_VisualDVM/Repository/Server/ComponentsServer.java b/src/_VisualDVM/Repository/Server/ComponentsServer.java
index 97f7382e..7276c5d9 100644
--- a/src/_VisualDVM/Repository/Server/ComponentsServer.java
+++ b/src/_VisualDVM/Repository/Server/ComponentsServer.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Repository.Server;
 import Common.Database.Objects.DBObject;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.Account.Account;
@@ -99,9 +99,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                     Print("Отправить клиенту архив всех архивов баг репортов");
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                     ZipFolderPass zip = new ZipFolderPass();
-                    File archives = new File(CommonUtils.getDateName("Bugs"));
+                    File archives = new File(Utils_.getDateName("Bugs"));
                     if (zip.Do("Bugs", archives.getAbsolutePath())) {
-                        response.object = CommonUtils.fileToBytes(archives);
+                        response.object = Utils_.fileToBytes(archives);
                         Print("Архив успешно запакован");
                     } else throw new RepositoryRefuseException("Не удалось запаковать архивы");
                     break;
@@ -135,24 +135,24 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 case ReceiveBugReportsDatabase:
                     Print("Получить базу данных баг репортов");
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
-                    response.object = CommonUtils.fileToBytes(db.getFile());
+                    response.object = Utils_.fileToBytes(db.getFile());
                     break;
                 case ReceiveBugReport:
                     Print("Скачать баг репорт по ключу " + request.arg);
-                    File bugArchive = Paths.get(CommonUtils.getHomePath(), "Bugs", request.arg).toFile();
+                    File bugArchive = Paths.get(Utils_.getHomePath(), "Bugs", request.arg).toFile();
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
-                    response.object = CommonUtils.fileToBytes(bugArchive);
+                    response.object = Utils_.fileToBytes(bugArchive);
                     break;
                 case SendBugReport:
                     Print("Отправить баг репорт " + request.arg);
-                    File bugArchive1 = Paths.get(CommonUtils.getHomePath(), "Bugs", request.arg).toFile();
-                    CommonUtils.bytesToFile((byte[]) request.object, bugArchive1);
+                    File bugArchive1 = Paths.get(Utils_.getHomePath(), "Bugs", request.arg).toFile();
+                    Utils_.bytesToFile((byte[]) request.object, bugArchive1);
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                     break;
                 //</editor-fold>
                 case GetComponentsBackups:
                     Print("Получить список сохраненных версий компонента " + request.arg);
-                    File backupsDirectory = Paths.get(CommonUtils.getHomePath(), "Components", request.arg, "Backups").toFile();
+                    File backupsDirectory = Paths.get(Utils_.getHomePath(), "Components", request.arg, "Backups").toFile();
                     //--
                     if (backupsDirectory.exists()) {
                         File[] files = backupsDirectory.listFiles(File::isFile);
@@ -182,9 +182,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                                     3
                     );
                     Print("Опубликовать компонент " + sComponentType);
-                    File componentFile = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, componentFileName).toFile();
-                    File versionFile = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, "version.txt").toFile();
-                    File backupsFolder = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, "Backups").toFile();
+                    File componentFile = Paths.get(Utils_.getHomePath(), "Components", sComponentType, componentFileName).toFile();
+                    File versionFile = Paths.get(Utils_.getHomePath(), "Components", sComponentType, "version.txt").toFile();
+                    File backupsFolder = Paths.get(Utils_.getHomePath(), "Components", sComponentType, "Backups").toFile();
                     //0 архивация старой версии, если она есть.
                     if (componentFile.exists()) {
                         String versionText = "";
@@ -200,11 +200,11 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                         FileUtils.moveFile(componentFile, backupFile);
                     }
                     //1 распаковка компонента
-                    CommonUtils.bytesToFile((byte[]) request.object, componentFile);
+                    Utils_.bytesToFile((byte[]) request.object, componentFile);
                     //2 запись версии компонента
                     FileUtils.writeStringToFile(versionFile, sComponentVersion);
                     //3 запись в журнал компонента
-                    File changesLog = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, "changes.txt").toFile();
+                    File changesLog = Paths.get(Utils_.getHomePath(), "Components", sComponentType, "changes.txt").toFile();
                     FileWriter writer = new FileWriter(changesLog.getAbsolutePath(), true);
                     BufferedWriter bufferWriter = new BufferedWriter(writer);
                     bufferWriter.write(componentChangeRecord);
@@ -217,11 +217,11 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                     String sComponentType_ = packed_[0];
                     String sComponentMinimalVersion = packed_[1];
                     Print("Поднять минимальную версию компонента " + sComponentType_);
-                    File minimal_versionFile = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType_, "minimal_version.txt").toFile();
+                    File minimal_versionFile = Paths.get(Utils_.getHomePath(), "Components", sComponentType_, "minimal_version.txt").toFile();
                     FileUtils.writeStringToFile(minimal_versionFile, sComponentMinimalVersion);
                     //-
                     //3 запись в журнал компонента
-                    File changesLog_ = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType_, "changes.txt").toFile();
+                    File changesLog_ = Paths.get(Utils_.getHomePath(), "Components", sComponentType_, "changes.txt").toFile();
                     FileWriter writer_ = new FileWriter(changesLog_.getAbsolutePath(), true);
                     BufferedWriter bufferWriter_ = new BufferedWriter(writer_);
                     bufferWriter_.write("Минимальная версия поднята до " + sComponentMinimalVersion + "\n");
@@ -233,10 +233,10 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 case ReceiveComponent:
                     String[] packed1 = request.arg.split("\n");
                     //тип/имя файла
-                    File componentFile1 = Paths.get(CommonUtils.getHomePath(), "Components", packed1[0], packed1[1]).toFile();
+                    File componentFile1 = Paths.get(Utils_.getHomePath(), "Components", packed1[0], packed1[1]).toFile();
                     Print("Получить компонент " + packed1[0]);
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
-                    response.object = CommonUtils.fileToBytes(componentFile1);
+                    response.object = Utils_.fileToBytes(componentFile1);
                     break;
                 default:
                     throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
@@ -246,8 +246,8 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                     LinkedHashMap<ComponentType, String> response_actual_versions_ = new LinkedHashMap<>();
                     for (String sType : types) {
                         ComponentType componentType = ComponentType.valueOf(sType);
-                        File vFile = Paths.get(CommonUtils.getHomePath(), "Components", sType, "version.txt").toFile();
-                        String v_string = CommonUtils.removeCharacters(
+                        File vFile = Paths.get(Utils_.getHomePath(), "Components", sType, "version.txt").toFile();
+                        String v_string = Utils_.removeCharacters(
                                 Utils.ReadAllText(vFile),
                                 "\n", "\r"
                         );
@@ -262,8 +262,8 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                     LinkedHashMap<ComponentType, String> response_minimal_versions_ = new LinkedHashMap<>();
                     for (String sType : types_) {
                         ComponentType componentType = ComponentType.valueOf(sType);
-                        File vFile = Paths.get(CommonUtils.getHomePath(), "Components", sType, "minimal_version.txt").toFile();
-                        String mv_string = CommonUtils.removeCharacters(
+                        File vFile = Paths.get(Utils_.getHomePath(), "Components", sType, "minimal_version.txt").toFile();
+                        String mv_string = Utils_.removeCharacters(
                                 Utils.ReadAllText(vFile),
                                 "\n", "\r"
                         );
@@ -275,7 +275,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 case GetComponentChangesLog:
                     Print("Получить журнал изменений компонента " + request.arg);
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
-                    response.object = CommonUtils.fileToBytes(Paths.get(CommonUtils.getHomePath(), "Components", request.arg, "changes.txt").toFile());
+                    response.object = Utils_.fileToBytes(Paths.get(Utils_.getHomePath(), "Components", request.arg, "changes.txt").toFile());
                     break;
                 case CheckURLRegistered:
                     Print("Проверить учетную запись на машине");
@@ -308,17 +308,17 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                             File program = Paths.get(project.getAbsolutePath(), fileName).toFile();
                             //--
                             File convertedProgram = Paths.get(program.getParent(),
-                                    CommonUtils.getFileNameWithoutExtension(program) + ".DVMH." +
+                                    Utils_.getFileNameWithoutExtension(program) + ".DVMH." +
                                             (projectLanguage.equals(LanguageName.fortran) ? "f" : "c")
                             ).toFile();
                             String command =
-                                    CommonUtils.DQuotes(server_dvm_drv) + " " +
+                                    Utils_.DQuotes(server_dvm_drv) + " " +
                                             projectLanguage.getDVMCompile() + "dv " +
                                             options + " "
-                                            + CommonUtils.DQuotes(program.getName());
+                                            + Utils_.DQuotes(program.getName());
                             //--
                             File fileWorkspace = program.getParentFile();
-                            Process process = Utils.startScript(workspace, fileWorkspace, CommonUtils.getDateName("convert_script"), command);
+                            Process process = Utils.startScript(workspace, fileWorkspace, Utils_.getDateName("convert_script"), command);
                             process.waitFor();
                             String convertationOut = Utils.readAllOutput(process);
                             convertationOut = convertationOut.replace(program.getName(), fileName); //для учета пути.
@@ -337,7 +337,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                         response.arg = String.join("\n", badFiles) + "|" + output;
                         File resultArchive = new File(workspace, projectName + "_result.zip");
                         if (ComponentsServer.zip.Do(project.getAbsolutePath(), resultArchive.getAbsolutePath())) {
-                            response.object = CommonUtils.fileToBytes(resultArchive);
+                            response.object = Utils_.fileToBytes(resultArchive);
                         } else
                             throw new RepositoryRefuseException("Внутренняя ошибка. Не удалось запаковать версию");
                         //--
@@ -417,7 +417,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 //-------------------------------------
                 Thread.sleep(60000);
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
             }
         }
     });
diff --git a/src/_VisualDVM/Repository/Server/ServerExchangeUnit_2021.java b/src/_VisualDVM/Repository/Server/ServerExchangeUnit_2021.java
index c81a83ac..c79d24aa 100644
--- a/src/_VisualDVM/Repository/Server/ServerExchangeUnit_2021.java
+++ b/src/_VisualDVM/Repository/Server/ServerExchangeUnit_2021.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Repository.Server;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 import java.io.File;
 import java.io.Serializable;
@@ -29,13 +29,13 @@ public class ServerExchangeUnit_2021 implements Serializable {
     }
     //--------
     public void Unpack() throws Exception {
-        CommonUtils.bytesToFile((byte[]) object, new File(arg));
+        Utils_.bytesToFile((byte[]) object, new File(arg));
     }
     public void Unpack(File file) throws Exception {
-        CommonUtils.bytesToFile((byte[]) object, file);
+        Utils_.bytesToFile((byte[]) object, file);
     }
     public void Print() {
-        System.out.println("codeName=" + CommonUtils.Brackets(codeName));
+        System.out.println("codeName=" + Utils_.Brackets(codeName));
         System.out.println(arg);
     }
 }
diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java b/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java
index 8603e18e..9774e2ed 100644
--- a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java
+++ b/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Repository.Subscribes.UI;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Global;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.GlobalData.Account.AccountRole;
@@ -21,11 +21,11 @@ public class SubscriberForm extends DBObjectDialog<Subscriber, SubscriberFields>
     public void validateFields() {
         if (fields.tfName.getText().isEmpty())
             Log.Writeln("Имя учётной записи не может быть пустым");
-        CommonUtils.validateEmail(fields.tfAddress.getText(), Log);
+        Utils_.validateEmail(fields.tfAddress.getText(), Log);
         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_("Адрес электронной почты " + CommonUtils.Brackets(fields.tfAddress.getText()) + " уже есть в списке.");
+            Log.Writeln_("Адрес электронной почты " + Utils_.Brackets(fields.tfAddress.getText()) + " уже есть в списке.");
         }
     }
     @Override
@@ -33,7 +33,7 @@ public class SubscriberForm extends DBObjectDialog<Subscriber, SubscriberFields>
         fields.tfName.setText(Result.name);
         fields.tfAddress.setText(Result.address);
         fields.cbMail.setSelected(Result.mailOn!=0);
-        CommonUI.TrySelect(fields.cbRole, Result.role);
+        UI_.TrySelect(fields.cbRole, Result.role);
     }
     @Override
     public void SetEditLimits() {
diff --git a/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java b/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
index 1d4b3be9..1deb57f5 100644
--- a/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ServerObjectsCache;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
 import _VisualDVM.TestingSystem.Common.Group.Group;
@@ -24,21 +24,21 @@ public class ConfigurationCache extends VisualCache {
         if (configuration.packedGroupsJson.isEmpty()) {
             groupsJson = new GroupsJson(); //просто пустой
         } else {
-            groupsJson = CommonUtils.gson.fromJson(configuration.packedGroupsJson, GroupsJson.class);
+            groupsJson = Utils_.gson.fromJson(configuration.packedGroupsJson, GroupsJson.class);
         }
         //--
         if (testsJson == null) {
             if (configuration.packedTestsJson.isEmpty())
                 testsJson = new TestsJson(); //просто пустой
             else
-                testsJson = CommonUtils.gson.fromJson(configuration.packedTestsJson, TestsJson.class);
+                testsJson = Utils_.gson.fromJson(configuration.packedTestsJson, TestsJson.class);
         }
         //-
         if (settingsJson == null) {
             if (configuration.packedSettingsJson.isEmpty())
                 settingsJson = new SettingsArrayJson(); //просто пустой
             else
-                settingsJson = CommonUtils.gson.fromJson(configuration.packedSettingsJson, SettingsArrayJson.class);
+                settingsJson = Utils_.gson.fromJson(configuration.packedSettingsJson, SettingsArrayJson.class);
         }
         //-
         LinkedHashMap<String, Vector<String>> gmap = new LinkedHashMap<>();
diff --git a/src/_VisualDVM/ServerObjectsCache/PackageCache.java b/src/_VisualDVM/ServerObjectsCache/PackageCache.java
index c858deba..213f284a 100644
--- a/src/_VisualDVM/ServerObjectsCache/PackageCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/PackageCache.java
@@ -1,5 +1,5 @@
 package _VisualDVM.ServerObjectsCache;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
 import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
@@ -12,7 +12,7 @@ public class PackageCache extends VisualCache{
         if (testingPackage.packedConfigurationsJson.isEmpty())
             configurationsJson = new ConfigurationsJson(); //просто пустой
         else
-            configurationsJson = CommonUtils.gson.fromJson(testingPackage.packedConfigurationsJson, ConfigurationsJson.class);
+            configurationsJson = Utils_.gson.fromJson(testingPackage.packedConfigurationsJson, ConfigurationsJson.class);
         //---
         configurationsDescriptions=new Vector<>();
         for(ConfigurationJson configurationJson: configurationsJson.array)
diff --git a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
index 626e29a0..5442a0b4 100644
--- a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
+++ b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
@@ -1,7 +1,7 @@
 package _VisualDVM.TestingSystem.Common.Configuration;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Utils.TextLog;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Group.Json.GroupsJson;
@@ -33,7 +33,7 @@ public class Configuration extends riDBObject {
         autoTesting = (autoTesting == 0) ? 1 : 0;
     }
     public ImageIcon GetAutoIcon() {
-        return CommonUtils.getIcon("/Common/icons/" + (autoTesting == 1 ? "RedPick" : "NotPick") + ".png");
+        return Utils_.getIcon("/Common/icons/" + (autoTesting == 1 ? "RedPick" : "NotPick") + ".png");
     }
     //--
     @Description("DEFAULT ''")
@@ -44,13 +44,13 @@ public class Configuration extends riDBObject {
     public String packedSettingsJson = "";
     //--
     public void saveGroupsAsJson(Vector<Group> groups) {
-        packedGroupsJson = CommonUtils.gson.toJson(new GroupsJson(groups));
+        packedGroupsJson = Utils_.gson.toJson(new GroupsJson(groups));
     }
     public void saveTestsAsJson(Vector<Test> tests) {
-        packedTestsJson = CommonUtils.gson.toJson(new TestsJson(tests));
+        packedTestsJson = Utils_.gson.toJson(new TestsJson(tests));
     }
     public void saveSettingsAsJson(Vector<Settings> settings) {
-        packedSettingsJson = CommonUtils.gson.toJson(new SettingsArrayJson(settings));
+        packedSettingsJson = Utils_.gson.toJson(new SettingsArrayJson(settings));
     }
     //--
     @Override
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/Group.java b/src/_VisualDVM/TestingSystem/Common/Group/Group.java
index 846501b4..721c0dcc 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/Group.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/Group.java
@@ -1,6 +1,6 @@
 package _VisualDVM.TestingSystem.Common.Group;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
@@ -46,7 +46,7 @@ public class Group extends riDBObject {
     @Override
     public void select(boolean flag) {
         super.select(flag);
-        if (CommonUI.isActive())
+        if (UI_.isActive())
             UI.getMainWindow().ShowCheckedTestsCount();
     }
     //--
@@ -67,7 +67,7 @@ public class Group extends riDBObject {
             int i = 1;
             for (ProjectFile program : programs.get(language)) {
                 //--
-                String object = CommonUtils.DQuotes(language + "_" + i + ".o");
+                String object = Utils_.DQuotes(language + "_" + i + ".o");
                 module_objects.add(object);
                 module_body +=
                         object + ":\n" +
@@ -84,7 +84,7 @@ public class Group extends riDBObject {
                 ++i;
             }
             titles.add(String.join("\n",
-                    LANG_ + "COMMAND=" + CommonUtils.DQuotes(dvm_drv) + " " +
+                    LANG_ + "COMMAND=" + Utils_.DQuotes(dvm_drv) + " " +
                             language.getDVMCompile(),
                     LANG_ + "FLAGS=" + flags_in,
                     LANG_ + "OBJECTS=" + String.join(" ", module_objects),
@@ -100,12 +100,12 @@ public class Group extends riDBObject {
         Vector<String> titles = new Vector<>();
         Vector<String> objects = new Vector<>();
         Vector<String> bodies = new Vector<>();
-        String binary = CommonUtils.DQuotes("0");
+        String binary = Utils_.DQuotes("0");
         //----->>
         generateForLanguage(dvm_drv, programs, language, titles, objects, bodies, flags_in);
         //----->>
         return String.join("\n",
-                "LINK_COMMAND=" + CommonUtils.DQuotes(dvm_drv) + " " +
+                "LINK_COMMAND=" + Utils_.DQuotes(dvm_drv) + " " +
                         language.getDVMLink(),
                 "LINK_FLAGS=" + flags_in + "\n",
                 String.join("\n", titles),
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
index 1e91d303..dfb9d734 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.Common.Group;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
@@ -120,8 +120,8 @@ public class GroupsDBTable extends iDBTable<Group> {
             @Override
             public void fillFields() {
                 fields.tfName.setText(Result.description);
-                CommonUI.TrySelect(fields.cbType, Result.type);
-                CommonUI.TrySelect(fields.cbLanguage, Result.language);
+                UI_.TrySelect(fields.cbType, Result.type);
+                UI_.TrySelect(fields.cbLanguage, Result.language);
             }
             @Override
             public void ProcessResult() {
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java
index 3271e5e6..333f5194 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.Common.Group;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Controls.MenuBarButton;
@@ -29,7 +29,7 @@ public class GroupsMenuBar extends DataMenuBar {
                 });
             }
             public void Mark() {
-                setIcon(CommonUtils.getIcon(GroupsDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
     }
diff --git a/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java b/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
index cf02904b..f33acdd5 100644
--- a/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
+++ b/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
@@ -2,7 +2,7 @@ package _VisualDVM.TestingSystem.Common.MachineProcess;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Mode;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.GlobalProperties;
 import _VisualDVM.Utils;
@@ -33,9 +33,9 @@ public class MachineProcess extends DBObject {
         userName = p.user_name;
         userPassword = p.user_password;
         userWorkspace = p.user_workspace;
-        testingSystemRoot =CommonUtils.getHomePath();
+        testingSystemRoot = Utils_.getHomePath();
         serverName = Global.testingServer.name;
-        id = CommonUtils.getDateName(machineAddress + "_" + machinePort + "_" + userName);
+        id = Utils_.getDateName(machineAddress + "_" + machinePort + "_" + userName);
     }
     @Override
     public Object getPK() {
@@ -86,7 +86,7 @@ public class MachineProcess extends DBObject {
             InetAddress localAddress = InetAddress.getByName(Global.properties.ServerAddress);
             local = localAddress.getHostAddress().equals(address.getHostAddress());
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
         return local;
     }
@@ -96,21 +96,21 @@ public class MachineProcess extends DBObject {
             File workspace = getWorkspace();
             Utils.CheckAndCleanDirectory(workspace);
             //копирование визуализатора
-            File src = new File(CommonUtils.getHomeDirectory(), "TestingSystem.jar");
+            File src = new File(Utils_.getHomeDirectory(), "TestingSystem.jar");
             File supervisor = new File(workspace, "VisualSapfor.jar");
             FileUtils.copyFile(src, supervisor);
             //создание настроек
             GlobalProperties properties = new GlobalProperties(Global.properties);
             properties.Mode = Mode.MachineQueue;
-            CommonUtils.jsonToFile(properties, new File(workspace, "properties"));
+            Utils_.jsonToFile(properties, new File(workspace, "properties"));
             Vector<String> args = new Vector<>();
-            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));
+            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));
             //--
             Utils.startScript(workspace, workspace,
                     "start",
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Test.java b/src/_VisualDVM/TestingSystem/Common/Test/Test.java
index 1417f0d5..eef5494c 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/Test.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/Test.java
@@ -1,7 +1,7 @@
 package _VisualDVM.TestingSystem.Common.Test;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
@@ -54,7 +54,7 @@ public class Test extends riDBObject {
     @Override
     public void select(boolean flag) {
         super.select(flag);
-        if (CommonUI.isActive())
+        if (UI_.isActive())
             UI.getMainWindow().ShowCheckedTestsCount();
     }
     //---
@@ -95,7 +95,7 @@ public class Test extends riDBObject {
         if (testArchive.exists())
             FileUtils.forceDelete(testArchive);
         //--
-        CommonUtils.bytesToFile(project_archive_bytes, tmpArchive); // распаковка байтов.
+        Utils_.bytesToFile(project_archive_bytes, tmpArchive); // распаковка байтов.
         //--
         UnzipFolderPass unzipFolderPass = new UnzipFolderPass();
         if (!unzipFolderPass.Do(
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingBar.java b/src/_VisualDVM/TestingSystem/Common/TestingBar.java
index 87ef353e..aeda54cf 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingBar.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingBar.java
@@ -1,6 +1,6 @@
 package _VisualDVM.TestingSystem.Common;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Global;
 import Common.Visual.Controls.MenuBarButton;
 import _VisualDVM.Visual.Menus.VisualiserMenuBar;
@@ -45,7 +45,7 @@ public class TestingBar extends VisualiserMenuBar {
                 });
             }
             public void Mark() {
-                setIcon(CommonUtils.getIcon(Global.properties.EmailOnTestingProgress ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                setIcon(Utils_.getIcon(Global.properties.EmailOnTestingProgress ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
         //--
@@ -66,7 +66,7 @@ public class TestingBar extends VisualiserMenuBar {
                 });
             }
             public void Mark() {
-                setIcon(CommonUtils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                setIcon(Utils_.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
         //--
@@ -75,13 +75,13 @@ public class TestingBar extends VisualiserMenuBar {
         sCheckTime.setMaximumSize(new Dimension(60, 26));
         sCheckTime.setModel(new SpinnerNumberModel(Global.properties.CheckTestingIntervalSeconds, 10, 3600, 1));
         sCheckTime.setValue(Global.properties.CheckTestingIntervalSeconds);
-        CommonUI.MakeSpinnerRapid(sCheckTime, e -> {
+        UI_.MakeSpinnerRapid(sCheckTime, e -> {
             Global.properties.updateField("CheckTestingIntervalSeconds", sCheckTime.getValue());
             if (Global.properties.AutoCheckTesting) TestingServer.ResetTimer();
         });
         add(new JLabel(" сек ") {
             {
-                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
             }
         });
         addSeparator();
@@ -89,7 +89,7 @@ public class TestingBar extends VisualiserMenuBar {
         addPasses(PassCode.StartTestingServer, PassCode.ShutdownTestingServer, PassCode.PublishTestingServer);
     }
     public void ShowAutoCheckTesting() {
-        autorefreshButton.setIcon(CommonUtils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));
+        autorefreshButton.setIcon(Utils_.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));
     }
     public void showServerAdminLabel(boolean flag) {
         serverAdminLabel.setVisible(flag);
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
index ffc2d592..eeb2b283 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.Common.TestingPackage;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
@@ -71,17 +71,17 @@ public abstract class TestingPackage<J> extends riDBObject {
         return new File(getLocalWorkspace(), Constants.LOADED);
     }
     public void saveJson() throws Exception {
-        CommonUtils.jsonToFile(package_json, getJsonFile());
+        Utils_.jsonToFile(package_json, getJsonFile());
     }
     public void readJson() throws Exception {
-        package_json = (J) CommonUtils.jsonFromFile(getJsonFile(), getJsonClass());
+        package_json = (J) Utils_.jsonFromFile(getJsonFile(), getJsonClass());
     }
     public void destructor() {
         package_json = null;
     }
     //----------------------------------------------------------
     public void saveConfigurationsAsJson(Vector<? extends Configuration> configurations) {
-        packedConfigurationsJson = CommonUtils.gson.toJson(new ConfigurationsJson(configurations));
+        packedConfigurationsJson = Utils_.gson.toJson(new ConfigurationsJson(configurations));
     }
     //определить завершен пакет с ошибками или нет.
     public void checkFinishState() throws Exception{
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
index 3c88d30c..137a7d0e 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
@@ -1,6 +1,6 @@
 package _VisualDVM.TestingSystem.Common;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
@@ -63,7 +63,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
         if (testingPackage.needsEmail == 1) {
             EmailMessage message = new EmailMessage();
             message.subject = "Состояние пакета тестирования "+packageDescription()+ " "+
-                     CommonUtils.Brackets(testingPackage.id) + " изменилось на " + CommonUtils.Brackets(testingPackage.state.getDescription());
+                     Utils_.Brackets(testingPackage.id) + " изменилось на " + Utils_.Brackets(testingPackage.state.getDescription());
             message.text = testingPackage.description;
             message.targets.add(testingPackage.sender_address);
             ServerCommand(ServerCode.Email, message);
@@ -195,9 +195,9 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
         String userWorkspace = args[4];
         String testingSystemRoot = args[5];
         serverName = args[6];
-        supervisorHome = CommonUtils.getHomeDirectory(); //при инициализации это текущая папка.
+        supervisorHome = Utils_.getHomeDirectory(); //при инициализации это текущая папка.
         //---
-        CommonUtils.MainLog = new Loggable() {
+        Utils_.MainLog = new Loggable() {
             @Override
             public String getLogHomePath() {
                 return supervisorHome.getAbsolutePath();
@@ -207,20 +207,20 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
                 return Global.mode.toString();
             }
         };
-        CommonUtils.MainLog.ClearLog();
+        Utils_.MainLog.ClearLog();
         //--
-        CommonUtils.setHomePath(testingSystemRoot);
+        Utils_.setHomePath(testingSystemRoot);
         Global.CheckTestingSystemDirectories();
         //---
         machine = new Machine(machineAddress, machineAddress, machinePort, MachineType.Server);
         user = new User(userName, userPassword, userWorkspace);
         //---
-        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(CommonUtils.getHomePath()));
+        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(Utils_.getHomePath()));
         Print("serverName=" + serverName);
         Print("=====");
         //----
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index c32e93f9..cb88abea 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -1,6 +1,6 @@
 package _VisualDVM.TestingSystem.Common;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Global;
@@ -127,8 +127,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     }
     public TestingServer() {
         super(TestsDatabase.class);
-        name = CommonUtils.getDateName("testingServer");
-        System.out.println("ServerName=" + CommonUtils.Brackets(name));
+        name = Utils_.getDateName("testingServer");
+        System.out.println("ServerName=" + Utils_.Brackets(name));
     }
     //основа
     @Override
@@ -147,7 +147,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         while (true) {
             dvmTestingChecker.Perform();
             sapforTestingPlanner.Perform();
-            CommonUtils.sleep(5000);
+            Utils_.sleep(5000);
         }
     });
     //------>>>
@@ -179,7 +179,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 EmailMessage message = Log.isEmpty() ?
                         new EmailMessage(
                                 "Запущено автоматическое тестирование версии " + request.arg + " системы SAPFOR",
-                                "Пакет "+ CommonUtils.Brackets(autoPackage.id), new Vector<>()) :
+                                "Пакет "+ Utils_.Brackets(autoPackage.id), new Vector<>()) :
                         new EmailMessage(
                                 "Не удалось запустить автоматическое тестирование версии " + request.arg + " системы SAPFOR",
                                 Log.toString(),
@@ -192,14 +192,14 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 test_id = Integer.parseInt(request.arg);
                 if (db.tests.containsKey(test_id)) {
                     test = db.tests.get(test_id);
-                    response = new ServerExchangeUnit_2021(ServerCode.OK, "", CommonUtils.fileToBytes(test.getArchive()));
+                    response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils_.fileToBytes(test.getArchive()));
                 } else
                     throw new RepositoryRefuseException("Теста с именем " + request.arg + " не существует");
                 break;
             case ReceiveTestsDatabase:
                 Print("Получить базу данных тестов");
                 response = new ServerExchangeUnit_2021(ServerCode.OK);
-                response.object = CommonUtils.fileToBytes(db.getFile());
+                response.object = Utils_.fileToBytes(db.getFile());
                 break;
             //---
             case RefreshDVMTests:
@@ -296,7 +296,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 pathname.isFile()
                         && !pathname.getName().equals("settings")
                         && !pathname.getName().equals("test-analyzer.sh")
-                        && CommonUtils.getExtension(pathname).startsWith(languageName.getDVMCompile()));
+                        && Utils_.getExtension(pathname).startsWith(languageName.getDVMCompile()));
         ;
         if (files != null) {
             groupFiles = new Vector<>(Arrays.asList(files));
@@ -422,7 +422,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         File workspace = dvmPackage.getLocalWorkspace();
         File results_zip = new File(workspace, "results.zip");
         File package_json = dvmPackage.getJsonFile();
-        response.object = new Pair(CommonUtils.fileToBytes(results_zip), CommonUtils.fileToBytes(package_json));
+        response.object = new Pair(Utils_.fileToBytes(results_zip), Utils_.fileToBytes(package_json));
     }
     private void DownloadDVMPackages() throws Exception {
         Vector<Integer> ids = (Vector<Integer>) request.object;
@@ -434,7 +434,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             File workspace = dvmPackage.getLocalWorkspace();
             File results_zip = new File(workspace, "results.zip");
             File package_json = dvmPackage.getJsonFile();
-            res.add(new Pair<>(dvmPackage_id, new Pair(CommonUtils.fileToBytes(results_zip), CommonUtils.fileToBytes(package_json))));
+            res.add(new Pair<>(dvmPackage_id, new Pair(Utils_.fileToBytes(results_zip), Utils_.fileToBytes(package_json))));
         }
         response = new ServerExchangeUnit_2021(ServerCode.OK);
         response.object = res;
@@ -450,7 +450,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         ZipFolderPass zipFolderPass = new ZipFolderPass();
         zipFolderPass.Do(workspace.getAbsolutePath(), results_zip.getAbsolutePath());
         if (results_zip.exists())
-            response.object = CommonUtils.fileToBytes(results_zip);
+            response.object = Utils_.fileToBytes(results_zip);
         else
             throw new RepositoryRefuseException("Не удалось заархивировать пакет тестирования SAPFOR с ключом " + sapforPackage_id);
     }
@@ -484,12 +484,12 @@ 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 " + CommonUtils.Brackets(package_id) + " не существует.");
+                throw new RepositoryRefuseException("Пакета задач DVM " + Utils_.Brackets(package_id) + " не существует.");
             DVMPackage dvmPackage = db.dvmPackages.get(package_id);
             File json = dvmPackage.getJsonFile();
             if (!json.exists())
-                throw new RepositoryRefuseException("Не найден JSON файл для пакета задач DVM " + CommonUtils.Brackets(package_id));
-            jsons.add((DVMPackage_json) CommonUtils.jsonFromFile(json, DVMPackage_json.class));
+                throw new RepositoryRefuseException("Не найден JSON файл для пакета задач DVM " + Utils_.Brackets(package_id));
+            jsons.add((DVMPackage_json) Utils_.jsonFromFile(json, DVMPackage_json.class));
         }
         response = new ServerExchangeUnit_2021(ServerCode.OK);
         response.object = jsons;
@@ -499,12 +499,12 @@ 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 " + CommonUtils.Brackets(package_id) + " не существует.");
+                throw new RepositoryRefuseException("Пакета задач SAPFOR " + Utils_.Brackets(package_id) + " не существует.");
             SapforPackage sapforPackage = db.sapforPackages.get(package_id);
             File json = sapforPackage.getJsonFile();
             if (!json.exists())
-                throw new RepositoryRefuseException("Не найден JSON файл для пакета задач SAPFOR " + CommonUtils.Brackets(package_id));
-            jsons.add((SapforPackage_json) CommonUtils.jsonFromFile(json, SapforPackage_json.class));
+                throw new RepositoryRefuseException("Не найден JSON файл для пакета задач SAPFOR " + Utils_.Brackets(package_id));
+            jsons.add((SapforPackage_json) Utils_.jsonFromFile(json, SapforPackage_json.class));
         }
         response = new ServerExchangeUnit_2021(ServerCode.OK);
         response.object = jsons;
@@ -563,7 +563,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Global.TempDirectory,
                 "get_version",
                 "wget --user dvmhuser --password dvmh2013  -P " +
-                        CommonUtils.DQuotes(Global.TempDirectory.getAbsolutePath()) +
+                        Utils_.DQuotes(Global.TempDirectory.getAbsolutePath()) +
                         "  http://svn.dvm-system.org/svn/dvmhrepo/sapfor/experts/Sapfor_2017/_src/Utils/version.h"
         ).waitFor();
         if (!versionFile.exists())
@@ -583,7 +583,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Global.TempDirectory,
                 "get_version",
                 "wget --user dvmhuser --password dvmh2013  -P " +
-                        CommonUtils.DQuotes(Global.TempDirectory.getAbsolutePath()) +
+                        Utils_.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/_VisualDVM/TestingSystem/Common/TestsDatabase.java b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
index dba883af..bd1c2992 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
@@ -1,6 +1,6 @@
 package _VisualDVM.TestingSystem.Common;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import Common.Database.SQLITE.SQLiteDatabase;
 import _VisualDVM.Global;
@@ -196,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("Не удалось определить размерность теста " + CommonUtils.Brackets(test.description));
+                    throw new RepositoryRefuseException("Не удалось определить размерность теста " + Utils_.Brackets(test.description));
                 break;
             case c:
                 test.max_dim = Utils.getCTestMaxDim(testFile);
@@ -224,12 +224,12 @@ public class TestsDatabase extends SQLiteDatabase {
         if (oldGroup == null) {
             Insert(group);
             for (File file : files) {
-                String testDescription = CommonUtils.getNameWithoutExtension(file.getName()) + "_" + group.language.getDVMCompile();
+                String testDescription = Utils_.getNameWithoutExtension(file.getName()) + "_" + group.language.getDVMCompile();
                 CreateTestFromSingleFile(account, sapfor, group, file, testDescription);
             }
         } else {
             for (File file : files) {
-                String testDescription = CommonUtils.getNameWithoutExtension(file.getName()) + "_" + group.language.getDVMCompile();
+                String testDescription = Utils_.getNameWithoutExtension(file.getName()) + "_" + group.language.getDVMCompile();
                 Test oldTest = tests.getTestByDescription(oldGroup.id, testDescription);
                 if (oldTest == null) {
                     CreateTestFromSingleFile(account, sapfor, oldGroup, file, testDescription);
diff --git a/src/_VisualDVM/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java b/src/_VisualDVM/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java
index 17f39a4f..433c4674 100644
--- a/src/_VisualDVM/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java
+++ b/src/_VisualDVM/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.Common.ThreadsPlanner;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Utils.InterruptThread;
 import org.apache.commons.io.FileUtils;
 
@@ -12,7 +12,7 @@ public abstract class ThreadsPlanner {
         try {
             Interrupt();
         } catch (Exception exception) {
-            CommonUtils.MainLog.PrintException(exception);
+            Utils_.MainLog.PrintException(exception);
         }
         System.exit(0);
         return null;
@@ -51,20 +51,20 @@ public abstract class ThreadsPlanner {
     }
     //--
     public void Start() {
-        CommonUtils.MainLog.Print("Planner started");
+        Utils_.MainLog.Print("Planner started");
         try {
             //--
             while (!waitingThreads.isEmpty() || !activeThreads.isEmpty()) {
-                CommonUtils.MainLog.Print(getThreadsSummary());
+                Utils_.MainLog.Print(getThreadsSummary());
                 checkActiveThreads();
                 tryStartThreads();
                 Thread.sleep(wait_ms);
             }
             //--
         } catch (Exception exception) {
-            CommonUtils.MainLog.PrintException(exception);
+            Utils_.MainLog.PrintException(exception);
         } finally {
-            CommonUtils.MainLog.Print("Planner finished");
+            Utils_.MainLog.Print("Planner finished");
             finalize();
         }
     }
@@ -84,7 +84,7 @@ public abstract class ThreadsPlanner {
         activeThreads.removeAll(toExclude);
         //--
         double progress = ((double)done_threads/threads.size())*100.0;
-        CommonUtils.MainLog.Print("done_threads="+done_threads+";all_threads="+threads.size()+";progress="+progress);
+        Utils_.MainLog.Print("done_threads="+done_threads+";all_threads="+threads.size()+";progress="+progress);
         File progress_file = new File("progress");
         try {
             FileUtils.writeStringToFile(progress_file, String.valueOf(((int)progress)));
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
index 2589940b..7fce25f1 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.DVM.DVMPackage;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Controls.MenuBarButton;
@@ -29,7 +29,7 @@ public class DVMPackagesBar extends DataMenuBar {
                 });
             }
             public void Mark() {
-                setIcon(CommonUtils.getIcon(DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
         add(new MenuBarButton() {
@@ -44,7 +44,7 @@ public class DVMPackagesBar extends DataMenuBar {
                 });
             }
             public void Mark() {
-                setIcon(CommonUtils.getIcon(DVMPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
     }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
index e430febd..54e7cdfd 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.DVM.DVMTasks;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.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=" + CommonUtils.DQuotes("1");
+                return "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
             else
-                return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + CommonUtils.DQuotes("1");
+                return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
         } else
             return environmentsSet_in;
     }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java b/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java
index 955284de..1da3cdd4 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.DVM;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -62,12 +62,12 @@ public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
             int i = 1;
             for (ProjectFile program : language_programs) {
                 //--
-                String object = CommonUtils.DQuotes(language + "_" + i + ".o");
+                String object = Utils_.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=" + CommonUtils.DQuotes(dvm_drv) + " " + language.getDVMCompile(), LANG_ + "FLAGS=" + flags, LANG_ + "OBJECTS=" + String.join(" ", module_objects), ""));
+            titles.add(String.join("\n", LANG_ + "COMMAND=" + Utils_.DQuotes(dvm_drv) + " " + language.getDVMCompile(), LANG_ + "FLAGS=" + flags, LANG_ + "OBJECTS=" + String.join(" ", module_objects), ""));
             objects.add(Utils.MFVar(LANG_ + "OBJECTS"));
             bodies.add(module_body);
         }
@@ -78,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 = CommonUtils.DQuotes("0");
+        String binary = Utils_.DQuotes("0");
         //----->>
         for (LanguageName languageName : programs.keySet()) {
             generateForLanguage(dvm_drv, languageName, programs.get(languageName), titles, objects, bodies, flags);
         }
         //----->>
-        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));
+        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));
     }
     public void getTasksInfo(List<? extends DVMTask> tasks, String file_name) throws Exception {
         LinkedHashMap<Integer, DVMTask> sorted_tasks = new LinkedHashMap<>();
@@ -111,7 +111,7 @@ public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
         try {
             if (isPrintOn()) {
                 System.out.println(message);
-                CommonUtils.MainLog.Print(message);
+                Utils_.MainLog.Print(message);
             }
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -138,16 +138,16 @@ public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
     public void perform() throws Exception {
         Print("Проверка сервера...");
         String currentServerName = (String) ServerCommand(ServerCode.GetServerName);
-        Print("имя текущего сервера " + CommonUtils.Brackets(currentServerName));
-        Print("имя сервера, создавшего нить " + CommonUtils.Brackets(serverName));
+        Print("имя текущего сервера " + Utils_.Brackets(currentServerName));
+        Print("имя сервера, создавшего нить " + Utils_.Brackets(serverName));
         if (!serverName.equals(currentServerName)) {
             Finalize("Несоответствующий сервер");
         }
-        Print("Запрос активных пакетов для машины " + CommonUtils.Brackets(machine.getURL()));
+        Print("Запрос активных пакетов для машины " + Utils_.Brackets(machine.getURL()));
         testingPackage = null;
         Vector<DVMPackage> activePackages = (Vector<DVMPackage>) ServerCommand(getActivePackagesCode(), machine.getURL(), null);
         if (activePackages.isEmpty())
-            Finalize("Не найдено активных пакетов для машины " + CommonUtils.Brackets(machine.getURL()));
+            Finalize("Не найдено активных пакетов для машины " + Utils_.Brackets(machine.getURL()));
         for (DVMPackage activePackage : activePackages)
             PerformPackage(activePackage);
     }
diff --git a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 4b692ed6..78eebdc9 100644
--- a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.DVM;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
@@ -172,26 +172,26 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
     @Override
     protected void PackageStart() throws Exception {
         String plannerStartCommand = String.join(" ",
-                CommonUtils.DQuotes(getPlanner()),
-                CommonUtils.DQuotes(user.workspace),
-                CommonUtils.DQuotes(packageRemoteWorkspace.full_name),
-                CommonUtils.DQuotes(testingPackage.kernels),
-                CommonUtils.DQuotes(testingPackage.drv));
+                Utils_.DQuotes(getPlanner()),
+                Utils_.DQuotes(user.workspace),
+                Utils_.DQuotes(packageRemoteWorkspace.full_name),
+                Utils_.DQuotes(testingPackage.kernels),
+                Utils_.DQuotes(testingPackage.drv));
         user.connection.startShellProcess(packageRemoteWorkspace, "planner_output",
                 "ulimit -s unlimited", plannerStartCommand);
         //---
         RemoteFile PID = new RemoteFile(packageRemoteWorkspace, "PID");
         while (!user.connection.Exists(PID)) {
             Print("PID not found");
-            CommonUtils.sleep(1000);
+            Utils_.sleep(1000);
         }
         testingPackage.PID = user.connection.readFromFile(PID).replace("\n", "").replace("\r", "");
         //---
-        System.out.println("PID=" + CommonUtils.Brackets(testingPackage.PID));
+        System.out.println("PID=" + Utils_.Brackets(testingPackage.PID));
         RemoteFile STARTED = new RemoteFile(packageRemoteWorkspace, "STARTED");
         while (!user.connection.Exists(STARTED)) {
             Print("waiting for package start...");
-            CommonUtils.sleep(1000);
+            Utils_.sleep(1000);
         }
     }
     @Override
@@ -234,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 " + CommonUtils.DQuotes("results.zip") + " " + CommonUtils.DQuotes("results"));
+        user.connection.performScript(packageRemoteWorkspace, "zip -r " + Utils_.DQuotes("results.zip") + " " + Utils_.DQuotes("results"));
         //---
         if (user.connection.Exists(remote_results_archive)) {
             user.connection.getSingleFile(remote_results_archive.full_name, results_archive.getAbsolutePath());
diff --git a/src/_VisualDVM/TestingSystem/DVM/UserConnection.java b/src/_VisualDVM/TestingSystem/DVM/UserConnection.java
index 27ae666d..5372ebe9 100644
--- a/src/_VisualDVM/TestingSystem/DVM/UserConnection.java
+++ b/src/_VisualDVM/TestingSystem/DVM/UserConnection.java
@@ -1,6 +1,6 @@
 package _VisualDVM.TestingSystem.DVM;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.Machine.Machine;
@@ -56,35 +56,35 @@ public class UserConnection {
             try {
                 in.close();
             } catch (Exception exception) {
-                CommonUtils.MainLog.PrintException(exception);
+                Utils_.MainLog.PrintException(exception);
             }
         }
         if (out != null) {
             try {
                 out.close();
             } catch (Exception exception) {
-                CommonUtils.MainLog.PrintException(exception);
+                Utils_.MainLog.PrintException(exception);
             }
         }
         if (pin != null) {
             try {
                 pin.close();
             } catch (Exception exception) {
-                CommonUtils.MainLog.PrintException(exception);
+                Utils_.MainLog.PrintException(exception);
             }
         }
         if (pout != null) {
             try {
                 pout.close();
             } catch (Exception exception) {
-                CommonUtils.MainLog.PrintException(exception);
+                Utils_.MainLog.PrintException(exception);
             }
         }
         if (fromServer != null) {
             try {
                 fromServer.close();
             } catch (Exception exception) {
-                CommonUtils.MainLog.PrintException(exception);
+                Utils_.MainLog.PrintException(exception);
             }
         }
         if (sftpChannel != null) sftpChannel.disconnect();
@@ -119,7 +119,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" + CommonUtils.Brackets(src.full_name));
+            Utils.WriteToFile(dst, "Размер файла превышает " + maxSize + " KB.\n" + "Файл не загружен. Его можно просмотреть на машине по адресу\n" + Utils_.Brackets(src.full_name));
         }
     }
     public void putSingleFile(File src, RemoteFile dst) throws Exception {
@@ -132,8 +132,8 @@ public class UserConnection {
     //-
     public void RMDIR(String dir) throws Exception {
         if (!dir.isEmpty() && !dir.equals("/") && !dir.equals("\\") && !dir.equals("*")) {
-            Command("rm -rf " + CommonUtils.DQuotes(dir));
-        } else throw new PassException("Недопустимый путь для удаления папки " + CommonUtils.DQuotes(dir));
+            Command("rm -rf " + Utils_.DQuotes(dir));
+        } else throw new PassException("Недопустимый путь для удаления папки " + Utils_.DQuotes(dir));
     }
     //-
     public void SynchronizeSubDirsR(File local_dir, RemoteFile remote_dir) throws Exception {
@@ -240,9 +240,9 @@ public class UserConnection {
                 sftpChannel.rm(file.full_name);
         }
         //--
-        writeToFile("cd " + CommonUtils.DQuotes(directory.full_name) + "\n" + String.join("\n", commands), script_file);
+        writeToFile("cd " + Utils_.DQuotes(directory.full_name) + "\n" + String.join("\n", commands), script_file);
         //--
-        Command(CommonUtils.DQuotes(script_file.full_name) + " 1>" + CommonUtils.DQuotes(out.full_name) + " 2>" + CommonUtils.DQuotes(err.full_name));
+        Command(Utils_.DQuotes(script_file.full_name) + " 1>" + Utils_.DQuotes(out.full_name) + " 2>" + Utils_.DQuotes(err.full_name));
         return new Pair<>(out, err);
     }
     public void putResource(RemoteFile dstDirectory, String resource_name) throws Exception {
@@ -252,7 +252,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 + " " + CommonUtils.DQuotes(module_name + ".cpp") + " -o " + CommonUtils.DQuotes(module_name);
+        String command = "g++ -O3 " + flags + " " + Utils_.DQuotes(module_name + ".cpp") + " -o " + Utils_.DQuotes(module_name);
         RemoteFile binary = new RemoteFile(modulesDirectory, module_name);
         //--
         if (Exists(binary))
@@ -322,7 +322,7 @@ public class UserConnection {
                 getSingleFile(src.full_name, dst.getAbsolutePath());
                 return true;
             } else {
-                Utils.WriteToFile(dst, "Размер файла превышает " + maxSize + " KB.\n" + "Файл не загружен. Его можно просмотреть на машине по адресу\n" + CommonUtils.Brackets(src.full_name));
+                Utils.WriteToFile(dst, "Размер файла превышает " + maxSize + " KB.\n" + "Файл не загружен. Его можно просмотреть на машине по адресу\n" + Utils_.Brackets(src.full_name));
             }
         }
         return false;
@@ -399,7 +399,7 @@ public class UserConnection {
             BufferedReader in = new BufferedReader(new InputStreamReader(execChannel.getInputStream()));
             String line = null;
             while ((line = in.readLine()) != null) {
-                System.out.println(CommonUtils.Brackets(line));
+                System.out.println(Utils_.Brackets(line));
             }
         }
         execChannel.disconnect();
@@ -437,35 +437,35 @@ public class UserConnection {
             try {
                 in.close();
             } catch (Exception exception) {
-                CommonUtils.MainLog.PrintException(exception);
+                Utils_.MainLog.PrintException(exception);
             }
         }
         if (out != null) {
             try {
                 out.close();
             } catch (Exception exception) {
-                CommonUtils.MainLog.PrintException(exception);
+                Utils_.MainLog.PrintException(exception);
             }
         }
         if (pin != null) {
             try {
                 pin.close();
             } catch (Exception exception) {
-                CommonUtils.MainLog.PrintException(exception);
+                Utils_.MainLog.PrintException(exception);
             }
         }
         if (pout != null) {
             try {
                 pout.close();
             } catch (Exception exception) {
-                CommonUtils.MainLog.PrintException(exception);
+                Utils_.MainLog.PrintException(exception);
             }
         }
         if (fromServer != null) {
             try {
                 fromServer.close();
             } catch (Exception exception) {
-                CommonUtils.MainLog.PrintException(exception);
+                Utils_.MainLog.PrintException(exception);
             }
         }
         if (shellChannel != null) shellChannel.disconnect();
@@ -481,21 +481,21 @@ public class UserConnection {
     public void waitForFileCreation(RemoteFile file) throws Exception {
         while (!Exists(file)) {
             System.out.println(file.full_name + " NOT FOUND");
-            CommonUtils.sleep(1000);
+            Utils_.sleep(1000);
         }
     }
     public void waitForFileFree(RemoteFile file) throws Exception {
         while (!Busy(file)) {
             System.out.println(file.full_name + " PERMISSION DENIED");
-            CommonUtils.sleep(1000);
+            Utils_.sleep(1000);
         }
     }
     public String startShellProcess(RemoteFile directory, String outFileName, String... commands) throws Exception {
         Vector<String> commands_ = new Vector<>();
-        commands_.add("cd " + CommonUtils.DQuotes(directory.full_name));
+        commands_.add("cd " + Utils_.DQuotes(directory.full_name));
         for (int i = 0; i < commands.length; ++i) {
             if (i == commands.length - 1) {
-                commands_.add(commands[i] + " 1>" + CommonUtils.DQuotes(outFileName));
+                commands_.add(commands[i] + " 1>" + Utils_.DQuotes(outFileName));
             } else {
                 commands_.add(commands[i]);
             }
@@ -504,7 +504,7 @@ public class UserConnection {
         if (Exists(script_file))
             sftpChannel.rm(script_file.full_name);
         writeToFile(String.join("\n", commands_), script_file);
-        String start_command = CommonUtils.DQuotes(script_file.full_name);
+        String start_command = Utils_.DQuotes(script_file.full_name);
         //--
         RemoteFile outFile = new RemoteFile(directory, outFileName);
         if (Exists(outFile))
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
index 3379ae4a..887841dd 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
@@ -1,6 +1,6 @@
 package _VisualDVM.TestingSystem.SAPFOR.Json;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Utils;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -55,7 +55,7 @@ public class SapforVersion_json implements Serializable {
         state = SapforVersionState.Empty;
         comparisonState = VersionComparisonState.Unknown;
         //--
-        String relativePath = CommonUtils.isWindows() ? CommonUtils.toW(version) : version;
+        String relativePath = Utils_.isWindows() ? Utils_.toW(version) : version;
         Home = Paths.get(configurationRoot.getAbsolutePath(), relativePath).toFile();
         files = new LinkedHashMap<>();
         //--
@@ -251,13 +251,13 @@ public class SapforVersion_json implements Serializable {
     //--
     public void createProject(File rootHome) throws Exception {
         project = null;
-        String version_ = CommonUtils.isWindows() ? CommonUtils.toW(version) : CommonUtils.toU(version);
+        String version_ = Utils_.isWindows() ? Utils_.toW(version) : Utils_.toU(version);
         project = new db_project_info();
         project.Home = Paths.get(rootHome.getAbsolutePath(), version_).toFile();
         project.name = project.Home.getName();
         project.description = description;
         project.languageName = LanguageName.fortran;
-        project.creationDate = CommonUtils.getDateNumber();
+        project.creationDate = Utils_.getDateNumber();
         //---
         FileUtils.copyDirectory(Home, project.Home);
         ///--------------------------------------
@@ -304,6 +304,6 @@ public class SapforVersion_json implements Serializable {
     }
     @Override
     public String toString() {
-        return Home.getName() + " : " + CommonUtils.Brackets(description) + " файлы: " + files.size();
+        return Home.getName() + " : " + Utils_.Brackets(description) + " файлы: " + files.size();
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java b/src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java
index f70d33d2..c92badcf 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.SAPFOR;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Utils;
 import _VisualDVM.TestingSystem.Common.TaskThread;
@@ -16,10 +16,10 @@ public class PackageModeSupervisor extends ThreadsPlanner {
     File sapfor_drv = null;
     public PackageModeSupervisor() throws Exception {
         super(2000);
-        package_json = (SapforPackage_json) CommonUtils.jsonFromFile(new File(Constants.package_json), SapforPackage_json.class);
+        package_json = (SapforPackage_json) Utils_.jsonFromFile(new File(Constants.package_json), SapforPackage_json.class);
         //--
         File sapfor_src = new File(package_json.sapfor_drv);
-        sapfor_drv = new File(CommonUtils.getHomeDirectory(), CommonUtils.getDateName("SAPFOR_F"));
+        sapfor_drv = new File(Utils_.getHomeDirectory(), Utils_.getDateName("SAPFOR_F"));
         FileUtils.copyFile(sapfor_src, sapfor_drv);
         if (!sapfor_drv.setExecutable(true))
             throw new Exception("Не удалось сделать файл " + sapfor_drv.getName() + " исполняемым!");
@@ -44,12 +44,12 @@ public class PackageModeSupervisor extends ThreadsPlanner {
     protected void finalize() {
         //записать результаты всех задач.
         try {
-            CommonUtils.jsonToFile(package_json, new File(Constants.package_json));
+            Utils_.jsonToFile(package_json, new File(Constants.package_json));
             FileUtils.writeStringToFile(new File(Constants.DONE), "");
             //--
             //Очистка
             //очистка служебных файлов.
-            Utils.deleteFilesByExtensions(CommonUtils.getHomeDirectory(),
+            Utils.deleteFilesByExtensions(Utils_.getHomeDirectory(),
                     "proj", "dep", "jar"
                     //  ,"sh", "exe", "bat"
             );
@@ -57,7 +57,7 @@ public class PackageModeSupervisor extends ThreadsPlanner {
             if (sapfor_drv.exists())
                 FileUtils.forceDelete(sapfor_drv);
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         System.exit(0);
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java b/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java
index 36c4cd49..ab9693b8 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.SAPFOR;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -41,11 +41,11 @@ public class PerformSapforTask extends Pass<SapforTask> {
         //--
         version_json = null;
         //--->>
-        parentTask = Paths.get(CommonUtils.getHomePath(),
+        parentTask = Paths.get(Utils_.getHomePath(),
                 String.valueOf(target.set_id),
                 String.valueOf(target.sapfor_configuration_id),
                 target.test_description).toFile();
-        root = Paths.get(CommonUtils.getHomePath(), String.valueOf(target.set_id), String.valueOf(target.sapfor_configuration_id)).toFile();
+        root = Paths.get(Utils_.getHomePath(), String.valueOf(target.set_id), String.valueOf(target.sapfor_configuration_id)).toFile();
         task = null;
         //--->>
         return true;
@@ -71,7 +71,7 @@ public class PerformSapforTask extends Pass<SapforTask> {
                 "transformation",
                 sapfor_drv,
                 parentTask,
-                code.getTestingCommand() + " -F " + CommonUtils.DQuotes(task.getAbsolutePath()),
+                code.getTestingCommand() + " -F " + Utils_.DQuotes(task.getAbsolutePath()),
                 target.flags,
                 Constants.out_file,
                 Constants.err_file
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
index aa7f0b45..fbb02592 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -1,6 +1,4 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
-import Common.Visual.CommonUI;
-import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Common.Utils.TextLog;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
index 35a1a09a..0281b28b 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
@@ -1,7 +1,6 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforSettings;
 import Common.Database.Objects.DBObject;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import Common.Utils.TextLog;
 import _VisualDVM.TestingSystem.Common.Settings.Settings;
@@ -80,7 +79,7 @@ public class SapforSettings extends Settings {
             if (code.isSapforStart()) {
                 if (i > first) {
                     Log.Writeln_("Неверные настройки:" + id + ": проход" +
-                            CommonUtils.Brackets(code.getDescription()) +
+                            Utils_.Brackets(code.getDescription()) +
                             " может быть только первым!");
                     res=false;
                 }
@@ -88,14 +87,14 @@ public class SapforSettings extends Settings {
             if (code.isSapforTerminal()) {
                 if (i < last) {
                     Log.Writeln_("Неверные настройки:" + id + ": проход " +
-                            CommonUtils.Brackets(code.getDescription()) +
+                            Utils_.Brackets(code.getDescription()) +
                             " может быть только последним!");
                     res= false;
                 }
             }
             if (matches.contains(code)) {
                 Log.Writeln_("Неверные настройки:" + id + ": проход " +
-                        CommonUtils.Brackets(code.getDescription()) +
+                        Utils_.Brackets(code.getDescription()) +
                         " запрещено применять более одного раза!");
                 res=false;
             } else matches.add(code);
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
index c0e2005f..02af9423 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforSettings;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
@@ -96,10 +96,10 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
             @Override
             public void ProcessResult() {
                 Result.description = fields.tfName.getText();
-                Result.FREE_FORM = CommonUtils.fromBoolean(fields.cbFREE_FORM.isSelected());
-                Result.KEEP_DVM_DIRECTIVES = CommonUtils.fromBoolean(fields.cbKEEP_DVM_DIRECTIVES.isSelected());
-                Result.KEEP_SPF_DIRECTIVES = CommonUtils.fromBoolean(fields.cbKEEP_SPF_DIRECTIVES.isSelected());
-                Result.STATIC_SHADOW_ANALYSIS = CommonUtils.fromBoolean(fields.cbSTATIC_SHADOW_ANALYSIS.isSelected());
+                Result.FREE_FORM = Utils_.fromBoolean(fields.cbFREE_FORM.isSelected());
+                Result.KEEP_DVM_DIRECTIVES = Utils_.fromBoolean(fields.cbKEEP_DVM_DIRECTIVES.isSelected());
+                Result.KEEP_SPF_DIRECTIVES = Utils_.fromBoolean(fields.cbKEEP_SPF_DIRECTIVES.isSelected());
+                Result.STATIC_SHADOW_ANALYSIS = Utils_.fromBoolean(fields.cbSTATIC_SHADOW_ANALYSIS.isSelected());
                 Result.MAX_SHADOW_WIDTH = fields.sMAX_SHADOW_WIDTH.getValue();
                 Result.packFlags();
             }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
index 3363743e..e3a386b4 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Tables.StyledCellLabel;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor;
@@ -21,7 +21,7 @@ public class SapforSettingsCommandFields implements DialogFields {
             JLabel res = new StyledCellLabel();
             res.setText(value.getDescription());
             res.setBackground(isSelected ?
-                    CommonUI.getTheme().selection_background : CommonUI.getTheme().background
+                    UI_.getTheme().selection_background : UI_.getTheme().background
             );
             return res;
         });
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
index 93e624c5..4f8da19f 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
@@ -62,7 +62,7 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
             }
             @Override
             public void fillFields() {
-                CommonUI.TrySelect(fields.cbPassCode, Result.passCode);
+                UI_.TrySelect(fields.cbPassCode, Result.passCode);
             }
             @Override
             public void ProcessResult() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index d3bbd278..6add16f1 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -1,6 +1,6 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforTask;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.TestingSystem.SAPFOR.Json.*;
@@ -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(CommonUtils.Brackets(versions.get(i).description));
+            versionsLines.add(Utils_.Brackets(versions.get(i).description));
         }
         if (!variants.isEmpty()) {
-            versionsLines.add(CommonUtils.Brackets(PassCode.CreateParallelVariants.getDescription()));
+            versionsLines.add(Utils_.Brackets(PassCode.CreateParallelVariants.getDescription()));
         }
         return String.join("→", versionsLines);
     }
@@ -167,7 +167,7 @@ public class SapforTask extends DBObject {
     @Override
     public String toString() {
         return
-                "#" + id + " группа " + CommonUtils.Brackets(group_description) + " тест " + CommonUtils.Brackets(test_description) + " параметры " + CommonUtils.Brackets(sapfor_configuration_id);
+                "#" + id + " группа " + Utils_.Brackets(group_description) + " тест " + Utils_.Brackets(test_description) + " параметры " + Utils_.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 code = PassCode.valueOf(code_s);
-            strings.add(CommonUtils.Brackets(code.getDescription()));
+            strings.add(Utils_.Brackets(code.getDescription()));
         }
         return String.join("→", strings);
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
index 81e9a003..1e1f7bf1 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -7,7 +7,7 @@ public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode {
     public ImageIcon getIcon() {
         ImageIcon res =  new ImageIcon((getClass().getResource("/icons/versions/" + getImageKey() + ".png")));
         if (res==null) {
-            CommonUtils.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
+            Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
           //  res= new ImageIcon((getClass().getResource("/icons/versions/Version.png")));
         }
         return (getImageKey() != null) ? res  : null;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
index 4def2695..7568f2a6 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
@@ -1,5 +1,5 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Controls.MenuBarButton;
@@ -30,7 +30,7 @@ public class SapforPackagesBar extends DataMenuBar {
                 });
             }
             public void Mark() {
-                setIcon(CommonUtils.getIcon(SapforPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
         add(new MenuBarButton() {
@@ -45,7 +45,7 @@ public class SapforPackagesBar extends DataMenuBar {
                 });
             }
             public void Mark() {
-                setIcon(CommonUtils.getIcon(SapforPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
index 5746ea4d..76bc92d1 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -1,7 +1,7 @@
 package _VisualDVM.TestingSystem.SAPFOR;
 import Common.CommonConstants;
 import Common.Mode;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.GlobalProperties;
 import _VisualDVM.Utils;
@@ -40,8 +40,8 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
     File repo_err;
     //--
     public SapforTestingPlanner() {
-        repo = new File(CommonUtils.getHomeDirectory(), "Repo");
-        repoSapforHome = Paths.get(CommonUtils.getHomePath(), "Repo", Constants.SAPFOR_REPOSITORY_BIN).toFile();
+        repo = new File(Utils_.getHomeDirectory(), "Repo");
+        repoSapforHome = Paths.get(Utils_.getHomePath(), "Repo", Constants.SAPFOR_REPOSITORY_BIN).toFile();
         repo_bin = new File(repoSapforHome, "Sapfor_F");
         repo_out = new File(repoSapforHome, Constants.out_file);
         repo_err = new File(repoSapforHome, Constants.err_file);
@@ -91,11 +91,11 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
     protected void PackageWorkspaceCreation() throws Exception {
         //копирование визуализатора
         File visualiser = new File(workspace, "VisualSapfor.jar");
-        FileUtils.copyFile(new File(CommonUtils.getHomeDirectory(), "TestingSystem.jar"), visualiser);
+        FileUtils.copyFile(new File(Utils_.getHomeDirectory(), "TestingSystem.jar"), visualiser);
         //создание настроек
         GlobalProperties properties = new GlobalProperties(Global.properties);
         properties.Mode = Mode.Package;
-        CommonUtils.jsonToFile(properties, new File(workspace, "properties"));
+        Utils_.jsonToFile(properties, new File(workspace, "properties"));
         //подготовка пакетного режима. Запустит его уже очередь.
         Utils.createScript(workspace, workspace, "start", "java -jar VisualSapfor.jar");
     }
@@ -109,7 +109,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         File started = new File(workspace, Constants.STARTED);
         while (!started.exists()) {
             Print("waiting for package start...");
-            CommonUtils.sleep(1000);
+            Utils_.sleep(1000);
         }
         File pid = new File(workspace, "PID");
         testingPackage.PID = FileUtils.readFileToString(pid, Charset.defaultCharset());
@@ -237,7 +237,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
                 return;
             }
             //-
-            File sapforHome = new File(Global.SapforsDirectory, CommonUtils.getDateName("sapfor"));
+            File sapforHome = new File(Global.SapforsDirectory, Utils_.getDateName("sapfor"));
             //--
             sapfor.home_path = sapforHome.getAbsolutePath();
             sapfor.languageName = LanguageName.fortran;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
index 8edb283c..90c92e4e 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
@@ -1,7 +1,7 @@
 package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.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 CommonUtils.DQuotes(call_command) + " " + version_command;
+        return Utils_.DQuotes(call_command) + " " + version_command;
     }
 }
diff --git a/src/_VisualDVM/Utils.java b/src/_VisualDVM/Utils.java
index ea72e580..de1ce854 100644
--- a/src/_VisualDVM/Utils.java
+++ b/src/_VisualDVM/Utils.java
@@ -1,9 +1,9 @@
 package _VisualDVM;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Utils.Index;
 import Common.Utils.StringTemplate;
 import Common.Utils.TextLog;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import Common.Visual.Windows.Dialog.VFileChooser_;
 import _VisualDVM.GlobalData.Settings.SettingName;
@@ -44,7 +44,7 @@ public class Utils {
             try {
                 FileUtils.forceMkdir(dir);
             } catch (Exception e) {
-                CommonUtils.MainLog.PrintException(e);
+                Utils_.MainLog.PrintException(e);
             }
         }
     }
@@ -56,14 +56,14 @@ public class Utils {
                     try {
                         forceDeleteWithCheck(f);
                     } catch (Exception e) {
-                        CommonUtils.MainLog.PrintException(e);
+                        Utils_.MainLog.PrintException(e);
                     }
                 }
         } else {
             try {
                 FileUtils.forceMkdir(dir);
             } catch (Exception e) {
-                CommonUtils.MainLog.PrintException(e);
+                Utils_.MainLog.PrintException(e);
             }
         }
     }
@@ -71,7 +71,7 @@ public class Utils {
         try {
             return new String(Files.readAllBytes(file.toPath()));
         } catch (Exception e) {
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         return "";
     }
@@ -83,7 +83,7 @@ public class Utils {
                     try {
                         forceDeleteWithCheck(f);
                     } catch (Exception e) {
-                        CommonUtils.MainLog.PrintException(e);
+                        Utils_.MainLog.PrintException(e);
                     }
                 }
             }
@@ -112,7 +112,7 @@ public class Utils {
     public static File CreateTempResourceFile(String res_name) throws Exception {
         URL u = (Utils.class.getResource("/files/" + res_name));
         InputStream i = u.openStream();
-        Path p = Paths.get(Global.TempDirectory.getAbsolutePath(), CommonUtils.getDateName(res_name));
+        Path p = Paths.get(Global.TempDirectory.getAbsolutePath(), Utils_.getDateName(res_name));
         Files.copy(i, p, StandardCopyOption.REPLACE_EXISTING);
         return p.toFile();
     }
@@ -133,13 +133,13 @@ public class Utils {
         return res;
     }
     public static File getTempFileName(String name, String ext) {
-        return Paths.get(System.getProperty("user.dir"), "Temp", CommonUtils.getDateName(name) + (ext.isEmpty() ? "" : ("." + ext))).toFile();
+        return Paths.get(System.getProperty("user.dir"), "Temp", Utils_.getDateName(name) + (ext.isEmpty() ? "" : ("." + ext))).toFile();
     }
     public static File getTempFileName(String name) {
         return getTempFileName(name, "");
     }
     public static boolean isAnchestor(File child, File anchestor) {
-        return child.getAbsolutePath().startsWith(anchestor.getAbsolutePath() + (CommonUtils.isWindows() ? "\\" : "/"));
+        return child.getAbsolutePath().startsWith(anchestor.getAbsolutePath() + (Utils_.isWindows() ? "\\" : "/"));
     }
     //при условии что это точно его предок
     public static String getRelativeAddress(File file, File anchestor) {
@@ -152,12 +152,12 @@ public class Utils {
             Log.Writeln_("Имя файла не может быть пустым");
             res = false;
         }
-        if (CommonUtils.ContainsCyrillic(name)) {
+        if (Utils_.ContainsCyrillic(name)) {
             Log.Writeln_("Имя файла не может содержать кириллицу");
             res = false;
         }
-        if (CommonUtils.ContainsForbiddenName(name)) {
-            Log.Writeln_("Имя файла не может содержать запрещённых символов\n" +  CommonUtils.printAllForbiddenCharacters());
+        if (Utils_.ContainsForbiddenName(name)) {
+            Log.Writeln_("Имя файла не может содержать запрещённых символов\n" +  Utils_.printAllForbiddenCharacters());
             res = false;
         }
         return res;
@@ -166,7 +166,7 @@ public class Utils {
     //идет по всем уровням файлов
     public static boolean validateProjectFile(File file, TextLog Log) {
         String name = file.getName();
-        if (CommonUtils.ContainsCyrillic(name) || CommonUtils.ContainsForbiddenName(name)) {
+        if (Utils_.ContainsCyrillic(name) || Utils_.ContainsForbiddenName(name)) {
             Log.Writeln_(file.getAbsolutePath());
             return false;
         }
@@ -189,7 +189,7 @@ public class Utils {
         validateProjectFolder_r(dir, files_list);
         if (!files_list.isEmpty())
             Log.Writeln_("Имена " + filesLines.length + " файлов/подпапок содержат запрещённые символы " +
-                    CommonUtils.printAllForbiddenCharacters() +
+                    Utils_.printAllForbiddenCharacters() +
                     "или кириллицу");
         //нужно проверить корень на наличие хоть одной программы.
         return Log.isEmpty();
@@ -206,11 +206,11 @@ public class Utils {
             } else return;
             if (file.exists()) {
                 attempts++;
-                System.out.println("файл " + CommonUtils.Brackets(file.getAbsolutePath()) + " занят");
+                System.out.println("файл " + Utils_.Brackets(file.getAbsolutePath()) + " занят");
                 Thread.sleep(2000);
             } else return;
         }
-        throw new PassException("Не удалось удалить файл " + CommonUtils.Brackets(file.getAbsolutePath()) + " за " + attempts + " попыток");
+        throw new PassException("Не удалось удалить файл " + Utils_.Brackets(file.getAbsolutePath()) + " за " + attempts + " попыток");
     }
     public static void GetVertices(float R, float r, float x0, float y0, int n, float phi) {
         boolean inner = false;
@@ -233,7 +233,7 @@ public class Utils {
         } catch (Exception e) {
             // тут можно обработать ошибку
             // возникает она если в передаваемый алгоритм в getInstance(,,,) не существует
-            CommonUtils.MainLog.PrintException(e);
+            Utils_.MainLog.PrintException(e);
         }
         BigInteger bigInt = new BigInteger(1, digest);
         String md5Hex = bigInt.toString(16);
@@ -264,11 +264,11 @@ public class Utils {
             } else return;
             if (file.exists()) {
                 attempts++;
-                CommonUtils.MainLog.Print("неудачная попытка удаления: файл " + CommonUtils.Brackets(file.getAbsolutePath()) + " занят");
+                Utils_.MainLog.Print("неудачная попытка удаления: файл " + Utils_.Brackets(file.getAbsolutePath()) + " занят");
                 Thread.sleep(2000);
             } else return;
         }
-        throw new PassException("Не удалось удалить файл " + CommonUtils.Brackets(file.getAbsolutePath()) + " за " + attempts + " попыток");
+        throw new PassException("Не удалось удалить файл " + Utils_.Brackets(file.getAbsolutePath()) + " за " + attempts + " попыток");
     }
     public static Socket createClientSocket(InetAddress address, int port, int timeout) throws Exception {
         Socket socket = new Socket();
@@ -286,7 +286,7 @@ public class Utils {
         if (files != null) {
             for (File file : files) {
                 if (file.isFile()) {
-                    String file_extension = CommonUtils.getExtension(file);
+                    String file_extension = Utils_.getExtension(file);
                     for (String ext : extensions) {
                         if (file_extension.equalsIgnoreCase(ext)) {
                             res.add(file);
@@ -326,8 +326,8 @@ public class Utils {
     }
     public static File createScript(File scriptDirectory, File targetDirectory, String name, String scriptText) throws Exception {
         //->
-        File scriptFile = Paths.get(scriptDirectory.getAbsolutePath(), name + (CommonUtils.isWindows() ? ".bat" : "")).toFile();
-        FileUtils.write(scriptFile, "cd " + CommonUtils.DQuotes(targetDirectory.getAbsolutePath()) + "\n" + scriptText);
+        File scriptFile = Paths.get(scriptDirectory.getAbsolutePath(), name + (Utils_.isWindows() ? ".bat" : "")).toFile();
+        FileUtils.write(scriptFile, "cd " + Utils_.DQuotes(targetDirectory.getAbsolutePath()) + "\n" + scriptText);
         if (!scriptFile.setExecutable(true)) throw new PassException("Не удалось создать исполняемый файл для скрипта");
         return scriptFile;
     }
@@ -428,7 +428,7 @@ public class Utils {
         try {
             for (String line : FileUtils.readLines(test, Charset.defaultCharset())) {
                 //  #pragma dvm array distribute[block][block], не важно
-                String packedLine = CommonUtils.removeCharacters(CommonUtils.removeRedundantSpaces(line).toLowerCase(), "\n", "\r", "\t");
+                String packedLine = Utils_.removeCharacters(Utils_.removeRedundantSpaces(line).toLowerCase(), "\n", "\r", "\t");
                 if (packedLine.startsWith(prefix)) {
                     packedLine = packedLine.substring(prefix.length());
                     boolean bracketOpen = false;
@@ -501,7 +501,7 @@ public class Utils {
     }
     protected static boolean isSource(File file) {
         if (file.isFile()) {
-            String extension = CommonUtils.getExtension(file).toLowerCase();
+            String extension = Utils_.getExtension(file).toLowerCase();
             switch (extension) {
                 case "f":
                 case "fdv":
@@ -533,7 +533,7 @@ public class Utils {
             }
         }
         if (sources.isEmpty()) {
-            if (question) return CommonUI.Question("Папка " + CommonUtils.Brackets(folder.getName()) + "\n" +
+            if (question) return UI_.Question("Папка " + Utils_.Brackets(folder.getName()) + "\n" +
                     "не содержит ни одного файла, распознанного как поддерживаемый код\n" +
                     "Всё равно открыть её как проект");
             else return false;
@@ -542,8 +542,8 @@ public class Utils {
     public static void Kill(String PID, boolean force) {
         if (!PID.isEmpty()) {
             String killCommand =
-                    force ? CommonUtils.isWindows() ? "taskkill /PID " + CommonUtils.DQuotes(PID) + " /F /T" : "kill -9 " + CommonUtils.DQuotes(PID) :
-                            CommonUtils.isWindows() ? "taskkill /PID " + CommonUtils.DQuotes(PID) : "kill -2 " + CommonUtils.DQuotes(PID);
+                    force ? Utils_.isWindows() ? "taskkill /PID " + Utils_.DQuotes(PID) + " /F /T" : "kill -9 " + Utils_.DQuotes(PID) :
+                            Utils_.isWindows() ? "taskkill /PID " + Utils_.DQuotes(PID) : "kill -2 " + Utils_.DQuotes(PID);
             System.out.println(killCommand);
             try {
                 Process killer = Utils.startScript(Global.TempDirectory, Global.TempDirectory, "killer", killCommand);
@@ -558,12 +558,12 @@ public class Utils {
         if (name.isEmpty())
             return false;
         char[] letters = name.toCharArray();
-        if (!(CommonUtils.isEnglishLetter(letters[0]) || letters[0] == '_')) {
+        if (!(Utils_.isEnglishLetter(letters[0]) || letters[0] == '_')) {
             return false;
         }
         //---
         for (int i = 1; i < letters.length; ++i) {
-            if (!(CommonUtils.isEnglishLetter(letters[i]) || letters[i] == '_' || CommonUtils.isIntegerValue(String.valueOf(letters[i])))) {
+            if (!(Utils_.isEnglishLetter(letters[i]) || letters[i] == '_' || Utils_.isIntegerValue(String.valueOf(letters[i])))) {
                 return false;
             }
         }
@@ -659,13 +659,13 @@ public class Utils {
         try {
             if (p != null) res = Double.parseDouble(p);
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
         return res;
     }
     public static void RestoreSelectedDirectory(VFileChooser_ directoryChooser) {
         String last_dir_home =
-                ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ProjectsSearchDirectory).Value;
+                ((GlobalDatabase) Utils_.db).settings.get(SettingName.ProjectsSearchDirectory).Value;
         if (!last_dir_home.isEmpty())
             directoryChooser.SetCurrentDirectory(last_dir_home);
     }
@@ -682,7 +682,7 @@ public class Utils {
     public static boolean checkFileCreation(File file) {
         for (int i = 1; i <= 10; ++i) {
             if (file.exists()) return true;
-            else CommonUtils.sleep(1000);
+            else Utils_.sleep(1000);
         }
         return false;
     }
@@ -713,11 +713,11 @@ public class Utils {
                     break;
                 case ' ':
                 case '\t':
-                    if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SpacesOn).toBoolean()) line.append(c);
+                    if (((GlobalDatabase) Utils_.db).settings.get(SettingName.SpacesOn).toBoolean()) line.append(c);
                     v_line.append(c);
                     break;
                 case '\n': //конец строки
-                    if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FortranWrapsOn).toBoolean()) {
+                    if (((GlobalDatabase) Utils_.db).settings.get(SettingName.FortranWrapsOn).toBoolean()) {
                         //оракул. лезем в начало следующей строки
                         //и анализируем первые 5 символов
                         boolean hasWrap = false;
@@ -743,7 +743,7 @@ public class Utils {
                             break;
                     }
                     //добавление строки в результат.
-                    if ((line.length() > 0) || ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.EmptyLinesOn).toBoolean()
+                    if ((line.length() > 0) || ((GlobalDatabase) Utils_.db).settings.get(SettingName.EmptyLinesOn).toBoolean()
                         //     Global.db.settings.get(SettingName.SpacesOn).toBoolean()
                     ) {
                         lines.add(line.toString());
@@ -762,7 +762,7 @@ public class Utils {
         if ((i > 0) && (c != '\n')) {
             //строка оборвалась на EOF
             //добавление строки в результат.
-            if ((line.length() > 0) ||((GlobalDatabase)CommonUtils.db).settings.get(SettingName.EmptyLinesOn).toBoolean()
+            if ((line.length() > 0) ||((GlobalDatabase) Utils_.db).settings.get(SettingName.EmptyLinesOn).toBoolean()
                 //     && Global.db.settings.get(SettingName.SpacesOn).toBoolean()
             ) {
                 lines.add(line.toString());
@@ -774,13 +774,13 @@ public class Utils {
     public static boolean CompareLines(String line1_raw, String line2_raw) {
         String line1 = line1_raw;
         String line2 = line2_raw;
-        if (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.RegisterOn).toBoolean()) {
+        if (!((GlobalDatabase) Utils_.db).settings.get(SettingName.RegisterOn).toBoolean()) {
             line1 = line1.toUpperCase();
             line2 = line2.toUpperCase();
         }
-        if (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SpacesOn).toBoolean()) {
-            line1 = CommonUtils.removeCharacters(line1, " ", "\t");
-            line2 = CommonUtils.removeCharacters(line2, " ", "\t");
+        if (!((GlobalDatabase) Utils_.db).settings.get(SettingName.SpacesOn).toBoolean()) {
+            line1 = Utils_.removeCharacters(line1, " ", "\t");
+            line2 = Utils_.removeCharacters(line2, " ", "\t");
         }
         return line1.equals(line2);
     }
diff --git a/src/_VisualDVM/Validators/DVMHelpParser.java b/src/_VisualDVM/Validators/DVMHelpParser.java
index dc7fadaf..d0f0ee08 100644
--- a/src/_VisualDVM/Validators/DVMHelpParser.java
+++ b/src/_VisualDVM/Validators/DVMHelpParser.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Validators;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
 import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
@@ -75,7 +75,7 @@ public class DVMHelpParser {
         state = HelpParserState.Search;
         for (String line_ : lines) {
             line = line_; //нужна для окружения. там пробелы нужно считать сразу.
-            t_line = CommonUtils.removeCharacters(line_.trim(), "\r");
+            t_line = Utils_.removeCharacters(line_.trim(), "\r");
             switch (state) {
                 case Search:
                     switch (t_line) {
diff --git a/src/_VisualDVM/Validators/PathValidator.java b/src/_VisualDVM/Validators/PathValidator.java
index 1fead000..7ffbd92f 100644
--- a/src/_VisualDVM/Validators/PathValidator.java
+++ b/src/_VisualDVM/Validators/PathValidator.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Validators;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Utils.TextLog;
 import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
 public class PathValidator extends Validator {
@@ -38,7 +38,7 @@ public class PathValidator extends Validator {
                         name.append(c);
                         break;
                     default:
-                        if (CommonUtils.isForbiddenCharacter(c))
+                        if (Utils_.isForbiddenCharacter(c))
                             state = PathValidatorState.Forbidden;
                         else name.append(c);
                         break;
@@ -53,7 +53,7 @@ public class PathValidator extends Validator {
                 Log.Writeln(string_name + ": имя файла или каталога в пути имеет неверный формат");
                 break;
             case Forbidden:
-                Log.Writeln(string_name + ": Составляющие путь имена содержат запрещённые символы \n" +  CommonUtils.printAllForbiddenCharacters());
+                Log.Writeln(string_name + ": Составляющие путь имена содержат запрещённые символы \n" +  Utils_.printAllForbiddenCharacters());
                 break;
             case Name:
                 if (spaces_count > 0)
diff --git a/src/_VisualDVM/Validators/ShellParser.java b/src/_VisualDVM/Validators/ShellParser.java
index 7178084f..92d8db11 100644
--- a/src/_VisualDVM/Validators/ShellParser.java
+++ b/src/_VisualDVM/Validators/ShellParser.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Validators;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 
 import java.io.InputStreamReader;
 import java.util.Vector;
@@ -172,7 +172,7 @@ public class ShellParser {
                 System.out.print(c == '\r' ? ("\\r") :
                         (c == '\n' ? "\\n\n" : c));
                 if (isCommandSymbol())
-                    System.out.print(CommonUtils.RBrackets(code));
+                    System.out.print(Utils_.RBrackets(code));
             }
         }
     }
@@ -210,7 +210,7 @@ public class ShellParser {
                 } else
                     state = ShellParserState.End;
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
                 state = ShellParserState.End;
             }
         } while (!state.equals(ShellParserState.End));
@@ -236,7 +236,7 @@ public class ShellParser {
                 } else
                     state = ShellParserState.End;
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
                 state = ShellParserState.End;
             }
         } while (!state.equals(ShellParserState.End));
@@ -261,7 +261,7 @@ public class ShellParser {
                 } else
                     return;
             } catch (Exception ex) {
-                CommonUtils.MainLog.PrintException(ex);
+                Utils_.MainLog.PrintException(ex);
                 return;
             }
         } while (!res.toString().contains(command));
diff --git a/src/_VisualDVM/Visual/Editor/BaseEditor.java b/src/_VisualDVM/Visual/Editor/BaseEditor.java
index af57d1a6..1be553d6 100644
--- a/src/_VisualDVM/Visual/Editor/BaseEditor.java
+++ b/src/_VisualDVM/Visual/Editor/BaseEditor.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Editor;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Menus.StyledPopupMenu;
 import Common.Visual.Menus.TextEditorMenu;
 import Common.Visual.Themes.ThemeElement;
@@ -45,7 +45,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
                         //todo переход в нужную строку по ctrl+g?
                         case KeyEvent.VK_Z:
                             if (getText().equals(startText)) {
-                                CommonUI.Info("Начальная версия текста достигнута.");
+                                UI_.Info("Начальная версия текста достигнута.");
                                 e.consume();
                             }
                             break;
@@ -115,8 +115,8 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
                 setSelectionEnd(getLineStartOffset(LineNum));
             }
         } catch (Exception ex) {
-            CommonUtils.MainLog.Print("Не удалось перейти на строку " + LineNum);
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.Print("Не удалось перейти на строку " + LineNum);
+            Utils_.MainLog.PrintException(ex);
         }
     }
     //------------------------------------------
@@ -129,7 +129,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
     @Override
     public void applyTheme() {
         float font_size = (float) getFont().getSize();
-        ((SPFEditorTheme)CommonUI.getTheme()).getEditorTheme().apply(this);
+        ((SPFEditorTheme) UI_.getTheme()).getEditorTheme().apply(this);
         setFont(getFont().deriveFont(font_size));
         menu.applyTheme();
         //меню связано с редактором. поэтому тема меняется только вместе с ним.
diff --git a/src/_VisualDVM/Visual/Editor/CaretInfo.java b/src/_VisualDVM/Visual/Editor/CaretInfo.java
index a6126ad5..150c22c1 100644
--- a/src/_VisualDVM/Visual/Editor/CaretInfo.java
+++ b/src/_VisualDVM/Visual/Editor/CaretInfo.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Editor;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 public class CaretInfo {
@@ -22,7 +22,7 @@ public class CaretInfo {
             prefix_word = SPFEditor.getLastWord(before, ' ', ',', ':', '.', '(', ')');
             suffix_word = SPFEditor.getFirstWord(after, ' ', ',', ':', '.', '(', ')');
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
     }
     public CaretInfo() {
diff --git a/src/_VisualDVM/Visual/Interface/FormWithSplitters.java b/src/_VisualDVM/Visual/Interface/FormWithSplitters.java
index 9528f327..c58d7b53 100644
--- a/src/_VisualDVM/Visual/Interface/FormWithSplitters.java
+++ b/src/_VisualDVM/Visual/Interface/FormWithSplitters.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Visual.Interface;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 public interface FormWithSplitters {
     default void LoadSplitters() {
-        CommonUtils.db.splitters.Load(this);
+        Utils_.db.splitters.Load(this);
     }
     default void SaveSplitters() {
-        CommonUtils.db.splitters.Save(this);
+        Utils_.db.splitters.Save(this);
     }
 }
diff --git a/src/_VisualDVM/Visual/Menus/AttachementsMenu.java b/src/_VisualDVM/Visual/Menus/AttachementsMenu.java
index 540696d5..5dcae577 100644
--- a/src/_VisualDVM/Visual/Menus/AttachementsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/AttachementsMenu.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Menus.StyledPopupMenu;
 import Common.Visual.Menus.VisualiserMenuItem;
 import _VisualDVM.Current;
@@ -23,7 +23,7 @@ public class AttachementsMenu extends StyledPopupMenu {
                         try {
                             Desktop.getDesktop().open(Current.getProject().getAttachmentsDirectory());
                         } catch (Exception ex) {
-                            CommonUtils.MainLog.PrintException(ex);
+                            Utils_.MainLog.PrintException(ex);
                         }
                     }
                 });
diff --git a/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java b/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
index 1c69c654..90cb7479 100644
--- a/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Menus.FastAccessMenuBar;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.Settings.SettingName;
@@ -34,17 +34,17 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
         repaint();
     }
     public void Refresh() {
-        CommonUI.Clear(this);
+        UI_.Clear(this);
         int i = 1;
         for (Pass pass : Pass.FAPasses) {
             if (pass.stats.HasUsages()) {
                 showPass(pass);
                 ++i;
-                if (i > (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
+                if (i > (((GlobalDatabase) Utils_.db).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
             }
         }
     }
     public void Drop(){
-        CommonUI.Clear(this);
+        UI_.Clear(this);
     }
 }
diff --git a/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java b/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java
index f053f0aa..5f6e8b65 100644
--- a/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.LanguageName;
 
 import javax.swing.*;
@@ -18,7 +18,7 @@ public abstract class LanguagesSubmenu extends VisualiserMenu {
                 JMenuItem languageItem = new StableMenuItem(languageName.getDescription());
                 String li = languageName.getIcon();
                 if (!li.isEmpty())
-                    languageItem.setIcon(CommonUtils.getIcon(li));
+                    languageItem.setIcon(Utils_.getIcon(li));
                 languageItem.addActionListener(
                         new AbstractAction() {
                             @Override
diff --git a/src/_VisualDVM/Visual/Menus/MainEditorMenu.java b/src/_VisualDVM/Visual/Menus/MainEditorMenu.java
index 9a5eec1a..13fc89e2 100644
--- a/src/_VisualDVM/Visual/Menus/MainEditorMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainEditorMenu.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Menus.TextEditorMenu;
 import Common.Visual.Menus.VisualiserMenuItem;
 import _VisualDVM.Current;
@@ -86,7 +86,7 @@ public class MainEditorMenu extends TextEditorMenu {
                                     1
                             );
                         } catch (Exception ex) {
-                            CommonUtils.MainLog.PrintException(ex);
+                            Utils_.MainLog.PrintException(ex);
                         }
                     }
                 });
@@ -103,7 +103,7 @@ public class MainEditorMenu extends TextEditorMenu {
                                     0
                             );
                         } catch (Exception ex) {
-                            CommonUtils.MainLog.PrintException(ex);
+                            Utils_.MainLog.PrintException(ex);
                         }
                     }
                 });
@@ -191,7 +191,7 @@ public class MainEditorMenu extends TextEditorMenu {
                         try {
                             Current.getSapfor().UpdateProjectFiles(false);
                         } catch (Exception ex) {
-                            CommonUtils.MainLog.PrintException(ex);
+                            Utils_.MainLog.PrintException(ex);
                         }
                     }
                 });
@@ -220,9 +220,9 @@ public class MainEditorMenu extends TextEditorMenu {
         if (!Utils.isFunctionName(selectedText)) {
             String tip = "Имя процедуры может содержать только английские буквы, цифры и подчеркивания, и не может начинаться с цифры.";
             //-
-            m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
+            m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
                     " . Выделено некорректное имя.");
-            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
+            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
                     " . Выделено некорректное имя.");
             //-
             m_inline.setToolTipText(tip);
@@ -230,40 +230,40 @@ public class MainEditorMenu extends TextEditorMenu {
             return;
         }
         if (!Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
-            m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
+            m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
                     " . Выполните проход \"Граф процедур \".");
-            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
+            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
                     " . Выполните проход \"Граф процедур \"");
             return;
         }
         if (Current.getSapfor().isIntrinsic(selectedText)) {
-            m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
+            m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
                     " . Процедура является стандартной.");
-            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
+            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
                     " . Процедура является стандартной.");
             return;
         }
         call = Current.getFile().find_func_call(selectedText);
         if (call == null) {
-            m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
+            m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
                     " . Вызов не найден в текущей строке.");
-            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
+            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
                     " . Объявление процедуры уже находится в текущей строке.");
             return;
         }
         decl = Current.getProject().allFunctions.get(call.funcName);
         if (decl.type.equals(FunctionType.NotFound)) {
-            m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
+            m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
                     " . Объявление процедуры не найдено в проекте.");
-            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
+            m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
                     " . Объявление процедуры не найдено в проекте.");
             return;
         }
         //---
         m_inline.setEnabled(true);
         m_gotoFunction.setEnabled(true);
-        m_inline.setText("Подставить вызов процедуры " + CommonUtils.Brackets(selectedText));
-        m_gotoFunction.setText("Перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText));
+        m_inline.setText("Подставить вызов процедуры " + Utils_.Brackets(selectedText));
+        m_gotoFunction.setText("Перейти к объявлению процедуры " + Utils_.Brackets(selectedText));
         //--
     }
     private void checkHeader() {
@@ -282,11 +282,11 @@ public class MainEditorMenu extends TextEditorMenu {
                 return;
             }
             if (!Current.getFile().relativeHeaders.containsKey(header_)) {
-                m_gotoHeader.setText("Невозможно перейти к заголовочному файлу " + CommonUtils.Brackets(header_) + " . Файл не найден среди включений текущего файла.");
+                m_gotoHeader.setText("Невозможно перейти к заголовочному файлу " + Utils_.Brackets(header_) + " . Файл не найден среди включений текущего файла.");
                 return;
             }
             header = Current.getFile().relativeHeaders.get(header_);
-            m_gotoHeader.setText("Переход к заголовочному файлу " + CommonUtils.Brackets(header_));
+            m_gotoHeader.setText("Переход к заголовочному файлу " + Utils_.Brackets(header_));
             m_gotoHeader.setEnabled(true);
         }
     }
@@ -304,7 +304,7 @@ public class MainEditorMenu extends TextEditorMenu {
             return;
         }
         m_loop_union.setEnabled(true);
-        m_loop_union.setText("Объединить цикл в строке " + CommonUtils.Brackets(loop.line) + " со следующим");
+        m_loop_union.setText("Объединить цикл в строке " + Utils_.Brackets(loop.line) + " со следующим");
     }
     @Override
     public void CheckElementsVisibility() {
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
index 446ae9a4..ea6f5142 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Menus.MainMenuBar;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Menus.VisualiserMenuItem;
 import _VisualDVM.Visual.Menus.VisualiserMenu;
 import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
@@ -21,7 +21,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
             @Override
             public void menuSelected(MenuEvent e) {
                 removeAll();
-                Vector<DBLastProject> projects = ((GlobalDatabase)CommonUtils.db).lastProjects.getOrdered();
+                Vector<DBLastProject> projects = ((GlobalDatabase) Utils_.db).lastProjects.getOrdered();
                 int k = 1;
                 for (DBLastProject p : projects) {
                     if (new File(p.HomePath).exists() && p.lastOpened != 0) {
@@ -34,7 +34,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
                         });
                         add(i);
                         ++k;
-                        if (k > (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LastOpenedProjectsCount).toInt32())) break;
+                        if (k > (((GlobalDatabase) Utils_.db).settings.get(SettingName.LastOpenedProjectsCount).toInt32())) break;
                     }
                 }
             }
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
index 17f25ae9..8a3b6e0e 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Menus.MainMenuBar;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Global;
 import Common.Visual.Controls.MenuBarButton;
 import _VisualDVM.Visual.Menus.VisualiserMenuBar;
@@ -30,7 +30,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 setIcon("/icons/ComponentsActual.png");
                 addActionListener(e -> {
                     if (PerformanceAnalyzer.isActive) {
-                        CommonUI.Info("Перед работой с компонентами закройте анализатор производительности!");
+                        UI_.Info("Перед работой с компонентами закройте анализатор производительности!");
                     } else {
                         Pass.passes.get(PassCode.GetComponentsActualVersions).Do();
                         Global.RefreshUpdatesStatus();
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
index 88d34c6a..565dbe13 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Visual.Menus.PropertiesSubmenu;
 import _VisualDVM.Visual.Menus.SettingsSubmenu;
 import _VisualDVM.Visual.Menus.VisualiserMenu;
@@ -15,7 +15,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
                 "FocusPassesResult"
         ));
         add(new CompactnessSettingsMenu());
-        if (CommonUtils.isWindows()) {
+        if (Utils_.isWindows()) {
             add(new SettingsSubmenu("Компиляция на локальной машине", null,
                     SettingName.LocalMakePathWindows,
                     SettingName.Kernels
@@ -37,7 +37,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
                 SettingName.FortranWrapsOn,
                 SettingName.ComparsionDiffMergeOn
         ));
-        add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).getMenuItem());
-        add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).getMenuItem());
+        add(((GlobalDatabase) Utils_.db).settings.get(SettingName.Workspace).getMenuItem());
+        add(((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).getMenuItem());
     }
 }
diff --git a/src/_VisualDVM/Visual/Menus/PassMenuItem.java b/src/_VisualDVM/Visual/Menus/PassMenuItem.java
index 8a9736e9..48e208aa 100644
--- a/src/_VisualDVM/Visual/Menus/PassMenuItem.java
+++ b/src/_VisualDVM/Visual/Menus/PassMenuItem.java
@@ -1,12 +1,12 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Menus.VisualiserMenuItem;
 import Common.Passes.Pass;
 import _VisualDVM.Visual.Controls.PassControl;
 public class PassMenuItem extends VisualiserMenuItem implements PassControl {
     @Override
     public void setIcon(String icon_path) {
-        setIcon(CommonUtils.getIcon(icon_path));
+        setIcon(Utils_.getIcon(icon_path));
     }
     public PassMenuItem(Pass pass) {
         setText(pass.getDescription());
diff --git a/src/_VisualDVM/Visual/Menus/PassesSubMenu.java b/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
index 8fa17d4b..5c147285 100644
--- a/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
+++ b/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode;
 import Common.Passes.Pass;
@@ -9,8 +9,8 @@ import javax.swing.*;
 public class PassesSubMenu extends JMenu {
     public PassesSubMenu(String title, String icon, PassCode... passes) {
         super(title);
-        setIcon(CommonUtils.getIcon(icon));
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setIcon(Utils_.getIcon(icon));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
         for (PassCode code : passes) {
             add(Pass.passes.get(code).createMenuItem());
         }
diff --git a/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java b/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
index aa6abab0..acb63df4 100644
--- a/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Menus.VisualiserMenuItem;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
@@ -32,7 +32,7 @@ public class ProjectFilesMenu extends GraphMenu {
                         try {
                             Desktop.getDesktop().open(Current.getProject().Home);
                         } catch (Exception ex) {
-                            CommonUtils.MainLog.PrintException(ex);
+                            Utils_.MainLog.PrintException(ex);
                         }
                     }
                 });
@@ -58,10 +58,10 @@ public class ProjectFilesMenu extends GraphMenu {
         });
         addSeparator();
         m_multiselection = new VisualiserMenuItem("Массовый режим работы с файлами");
-        m_multiselection.setIcon(CommonUtils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
+        m_multiselection.setIcon(Utils_.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
         m_multiselection.addActionListener(e -> {
             Global.files_multiselection = !Global.files_multiselection;
-            m_multiselection.setIcon(CommonUtils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
+            m_multiselection.setIcon(Utils_.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
             Current.getProject().SelectAllFiles(false);
             UI.getMainWindow().getProjectWindow().RefreshProjectFiles();
 
diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
index b4fd941a..bb6a63d9 100644
--- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Menus.ProjectMenuBar;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.Menus.LanguagesSubmenu;
 import _VisualDVM.Visual.Menus.SettingsSubmenu;
@@ -60,9 +60,9 @@ public class ProjectSettingsMenu extends VisualiserMenu {
                 SettingName.SaveModifications
         ));
         addSeparator();
-        add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem());
-        add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem());
-        add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.GCOVLimit).getMenuItem());
+        add(((GlobalDatabase) Utils_.db).settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem());
+        add(((GlobalDatabase) Utils_.db).settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem());
+        add(((GlobalDatabase) Utils_.db).settings.get(SettingName.GCOVLimit).getMenuItem());
     }
     public void ShowLanguage() {
         mLanguage.setText("Язык: " + Current.getProject().languageName.getDescription());
diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
index 341e44bc..591eff15 100644
--- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Visual.Menus.ProjectMenuBar;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.Menus.VisualiserMenu;
 import Common.Visual.Fonts.VisualiserFonts;
@@ -18,8 +18,8 @@ public class ProjectViewMenu extends VisualiserMenu {
         for (ProjectView view : ProjectView.values()) {
             JMenuItem m = new JMenuItem(view.getDescription()) {
                 {
-                    setIcon(CommonUtils.getIcon(view.getIcon()));
-                    setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                    setIcon(Utils_.getIcon(view.getIcon()));
+                    setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
                     addActionListener(e -> {
                         Current_.set(Current.ProjectView, view);
                         UI.getMainWindow().getProjectWindow().ShowProjectView();
diff --git a/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java b/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
index a64125a7..7892452c 100644
--- a/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Global;
 import Common.Visual.Fonts.VisualiserFonts;
 
@@ -9,8 +9,8 @@ public class PropertiesSubmenu extends JMenu {
     public PropertiesSubmenu(String title, String icon, String... settings) {
         super(title);
         if (icon != null)
-            setIcon(CommonUtils.getIcon(icon));
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
+            setIcon(Utils_.getIcon(icon));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
         for (String name : settings) {
             Global.properties.addFlagMenuItem(this, name);
         }
diff --git a/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java b/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
index 93cd698b..6a7f83d7 100644
--- a/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
+++ b/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Menus;
 import Common.Current_;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Menus.VisualiserMenuItem;
 import Common.Visual.Selectable;
 import Common.Visual.Trees.DataTree;
@@ -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("Выбрать всё для " +
-                    CommonUtils.Brackets(name));
+                    Utils_.Brackets(name));
             m_unselect_for_current.setText("Отменить выбор всех для " +
-                    CommonUtils.Brackets(name));
+                    Utils_.Brackets(name));
             //-
             m_select_for_current.setVisible(true);
             m_unselect_for_current.setVisible(true);
diff --git a/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java b/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
index 1af1eb54..0a920c02 100644
--- a/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import Common.Visual.Fonts.VisualiserFonts;
 import _VisualDVM.GlobalData.Settings.SettingName;
@@ -10,10 +10,10 @@ public class SettingsSubmenu extends JMenu {
     public SettingsSubmenu(String title, String icon, SettingName... settings) {
         super(title);
         if (icon != null)
-            setIcon(CommonUtils.getIcon(icon));
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
+            setIcon(Utils_.getIcon(icon));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
         for (SettingName c : settings) {
-            add(((GlobalDatabase)CommonUtils.db).settings.get(c).getMenuItem());
+            add(((GlobalDatabase) Utils_.db).settings.get(c).getMenuItem());
         }
     }
 }
diff --git a/src/_VisualDVM/Visual/Menus/StableMenuItem.java b/src/_VisualDVM/Visual/Menus/StableMenuItem.java
index 95ee45ea..64cfd578 100644
--- a/src/_VisualDVM/Visual/Menus/StableMenuItem.java
+++ b/src/_VisualDVM/Visual/Menus/StableMenuItem.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Menus.VisualiserMenuItem;
 
 import javax.swing.*;
@@ -15,15 +15,15 @@ class StableItemUI extends BasicMenuItemUI {
     @Override
     protected void doClick(MenuSelectionManager msm) {
         menuItem.doClick(0);
-        if (CommonUI.last_menu_path != null)
-            MenuSelectionManager.defaultManager().setSelectedPath(CommonUI.last_menu_path);
+        if (UI_.last_menu_path != null)
+            MenuSelectionManager.defaultManager().setSelectedPath(UI_.last_menu_path);
     }
 }
 public class StableMenuItem extends VisualiserMenuItem {
     {
         getModel().addChangeListener(e -> {
             if (getModel().isArmed() && isShowing())
-                CommonUI.last_menu_path = MenuSelectionManager.defaultManager().getSelectedPath();
+                UI_.last_menu_path = MenuSelectionManager.defaultManager().getSelectedPath();
         });
     }
     public StableMenuItem(String text) {
@@ -32,7 +32,7 @@ public class StableMenuItem extends VisualiserMenuItem {
     }
     public StableMenuItem(String text, String icon_path) {
         super(text);
-        setIcon(CommonUtils.getIcon(icon_path));
+        setIcon(Utils_.getIcon(icon_path));
         setUI(new StableItemUI());
     }
     public StableMenuItem() {
diff --git a/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java b/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java
index 26716565..48361c4b 100644
--- a/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java
+++ b/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java
@@ -1,11 +1,11 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Passes.Pass;
 import _VisualDVM.Visual.Controls.PassControl;
 public class StablePassMenuItem extends StableMenuItem implements PassControl {
     @Override
     public void setIcon(String icon_path) {
-        setIcon(CommonUtils.getIcon(icon_path));
+        setIcon(Utils_.getIcon(icon_path));
     }
     public StablePassMenuItem(Pass pass) {
         setText(pass.getDescription());
diff --git a/src/_VisualDVM/Visual/Menus/VersionsMenu.java b/src/_VisualDVM/Visual/Menus/VersionsMenu.java
index 61d15793..e05a4e4e 100644
--- a/src/_VisualDVM/Visual/Menus/VersionsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/VersionsMenu.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Menus.VisualiserMenuItem;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
@@ -17,10 +17,10 @@ public class VersionsMenu extends GraphMenu<DataTree> {
         add(Pass.passes.get(PassCode.DeleteLonelyM).createMenuItem());
         addSeparator();
         m_multiselection = new VisualiserMenuItem("Массовый режим работы с версиями");
-        m_multiselection.setIcon(CommonUtils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
+        m_multiselection.setIcon(Utils_.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
         m_multiselection.addActionListener(e -> {
             Global.versions_multiselection = !Global.versions_multiselection;
-            m_multiselection.setIcon(CommonUtils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
+            m_multiselection.setIcon(Utils_.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
             Current.getRoot().SelectAllVersions(false);
             UI.getVersionsWindow().getVersionsForm().getTree().updateUI();
         });
diff --git a/src/_VisualDVM/Visual/Menus/VisualiserMenu.java b/src/_VisualDVM/Visual/Menus/VisualiserMenu.java
index b2be6961..b6f41c53 100644
--- a/src/_VisualDVM/Visual/Menus/VisualiserMenu.java
+++ b/src/_VisualDVM/Visual/Menus/VisualiserMenu.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode;
 import Common.Passes.Pass;
@@ -13,9 +13,9 @@ public class VisualiserMenu extends JMenu {
         setToolTipText(text);
         if (textVisible)
             setText(text);
-        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
         if (!iconPath.isEmpty())
-            setIcon(CommonUtils.getIcon(iconPath));
+            setIcon(Utils_.getIcon(iconPath));
     }
     public VisualiserMenu(String text, String iconPath) {
         this(text, iconPath, false);
diff --git a/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java b/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
index b9e3da98..6af0f3b5 100644
--- a/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Menus;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode;
 import Common.Passes.Pass;
@@ -34,9 +34,9 @@ public class VisualiserMenuBar extends JToolBar {
     public JLabel addLabel(String text_in, String icon_path_in) {
         JLabel res = new JLabel(text_in) {
             {
-                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
                 if (icon_path_in != null) {
-                    setIcon(CommonUtils.getIcon(icon_path_in));
+                    setIcon(Utils_.getIcon(icon_path_in));
                 }
             }
         };
diff --git a/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java b/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
index d4e9b066..6564b6ed 100644
--- a/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
+++ b/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Syntax;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Themes.VisualiserTheme;
 import org.fife.ui.rsyntaxtextarea.Theme;
 public abstract class SPFEditorTheme extends VisualiserTheme {
@@ -11,7 +11,7 @@ public abstract class SPFEditorTheme extends VisualiserTheme {
         try {
             res = Theme.load(getClass().getResourceAsStream(getEditorThemePath()));
         } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
+            Utils_.MainLog.PrintException(ex);
         }
         return res;
     }
diff --git a/src/_VisualDVM/Visual/UI.java b/src/_VisualDVM/Visual/UI.java
index 45f67d00..2140895a 100644
--- a/src/_VisualDVM/Visual/UI.java
+++ b/src/_VisualDVM/Visual/UI.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Visual;
 import Common.Database.Tables.DataSet;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Menus.DataMenuBar;
 import _VisualDVM.Current;
 import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsBar;
@@ -135,44 +135,44 @@ public class UI {
         versionsMenuBar = new VersionsMenuBar();
         fastAccessMenuBar = new FastAccessMenuBar();
         //---------------------------------------------------->>
-        CommonUI.menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
-        CommonUI.menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());
+        UI_.menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
+        UI_.menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());
         //---------------------------------------------------->>
-        CommonUI.menuBars.put(GroupsDBTable.class, new GroupsMenuBar());
-        CommonUI.menuBars.put(TestDBTable.class, new TestsMenuBar());
-        CommonUI.menuBars.put(DVMConfigurationDBTable.class, new DVMConfigurationsMenuBar());
-        CommonUI.menuBars.put(DVMPackageDBTable.class, new DVMPackagesBar());
-        CommonUI.menuBars.put(SapforPackageDBTable.class, new SapforPackagesBar());
-        CommonUI.menuBars.put(DVMRunTasksSet.class, new DVMRunTasksBar());
+        UI_.menuBars.put(GroupsDBTable.class, new GroupsMenuBar());
+        UI_.menuBars.put(TestDBTable.class, new TestsMenuBar());
+        UI_.menuBars.put(DVMConfigurationDBTable.class, new DVMConfigurationsMenuBar());
+        UI_.menuBars.put(DVMPackageDBTable.class, new DVMPackagesBar());
+        UI_.menuBars.put(SapforPackageDBTable.class, new SapforPackagesBar());
+        UI_.menuBars.put(DVMRunTasksSet.class, new DVMRunTasksBar());
         //--->>>
-        CommonUI.menuBars.put(MachinesDBTable.class, new MachinesMenuBar());
-        CommonUI.menuBars.put(UsersDBTable.class, new UsersMenuBar());
-        CommonUI.menuBars.put(CompilersDBTable.class, new CompilersMenuBar());
-        CommonUI.menuBars.put(MakefilesDBTable.class, new MakefilesMenuBar());
-        CommonUI.menuBars.put(ModulesDBTable.class, new ModulesMenuBar());
-        CommonUI.menuBars.put(RunConfigurationsDBTable.class, new RunConfigurationsMenuBar());
-        CommonUI.menuBars.put(EnvironmentValuesDBTable.class, new EnvironmentValuesMenuBar());
-        CommonUI.menuBars.put(DVMParameterDBTable.class, new DVMParametersMenuBar());
-        CommonUI.menuBars.put(CompilationTasksDBTable.class, new DataMenuBar("задачи на компиляцию"));
-        CommonUI.menuBars.put(RunTasksDBTable.class, new DataMenuBar("задачи на запуск"));
+        UI_.menuBars.put(MachinesDBTable.class, new MachinesMenuBar());
+        UI_.menuBars.put(UsersDBTable.class, new UsersMenuBar());
+        UI_.menuBars.put(CompilersDBTable.class, new CompilersMenuBar());
+        UI_.menuBars.put(MakefilesDBTable.class, new MakefilesMenuBar());
+        UI_.menuBars.put(ModulesDBTable.class, new ModulesMenuBar());
+        UI_.menuBars.put(RunConfigurationsDBTable.class, new RunConfigurationsMenuBar());
+        UI_.menuBars.put(EnvironmentValuesDBTable.class, new EnvironmentValuesMenuBar());
+        UI_.menuBars.put(DVMParameterDBTable.class, new DVMParametersMenuBar());
+        UI_.menuBars.put(CompilationTasksDBTable.class, new DataMenuBar("задачи на компиляцию"));
+        UI_.menuBars.put(RunTasksDBTable.class, new DataMenuBar("задачи на запуск"));
         //---->>
-        CommonUI.menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
+        UI_.menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
         //---->>
-        CommonUI.menuBars.put(RegionsSet.class, new DataMenuBar("области распараллеливания"));
-        CommonUI.menuBars.put(ArraysSet.class, new DataMenuBar("массивы"));
-        CommonUI.menuBars.put(ArraysDBTable.class, new DataMenuBar("сохранённые состояния") {
+        UI_.menuBars.put(RegionsSet.class, new DataMenuBar("области распараллеливания"));
+        UI_.menuBars.put(ArraysSet.class, new DataMenuBar("массивы"));
+        UI_.menuBars.put(ArraysDBTable.class, new DataMenuBar("сохранённые состояния") {
             @Override
             public void createSelectionButtons(DataSet dataSet) {
                 //не нужны.
             }
         });
-        CommonUI.menuBars.put(VariantsSet.class, new VariantsMenuBar());
-        CommonUI.menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
-        CommonUI.menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode.SaveProfile, PassCode.EditProfile, PassCode.ApplyProfile, PassCode.DeleteProfile));
-        CommonUI.menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
-        CommonUI.menuBars.put(SapforSettingsDBTable.class, new SapforSettingsBar());
-        CommonUI.menuBars.put(SapforSettingsCommandsDBTable.class, new SapforSettingsCommandsBar());
-        CommonUI.menuBars.put(DVMSettingsDBTable.class, new DVMSettingsBar());
+        UI_.menuBars.put(VariantsSet.class, new VariantsMenuBar());
+        UI_.menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
+        UI_.menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode.SaveProfile, PassCode.EditProfile, PassCode.ApplyProfile, PassCode.DeleteProfile));
+        UI_.menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
+        UI_.menuBars.put(SapforSettingsDBTable.class, new SapforSettingsBar());
+        UI_.menuBars.put(SapforSettingsCommandsDBTable.class, new SapforSettingsCommandsBar());
+        UI_.menuBars.put(DVMSettingsDBTable.class, new DVMSettingsBar());
         //---->>
     }
     public static void CreateWindows() {
@@ -260,7 +260,7 @@ public class UI {
         ShowTabsNames(tabs, 0);
     }
     public static void ShowTabsNames(JTabbedPane tabs, int startIndex) {
-        boolean flag = ((GlobalDatabase) CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
+        boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
         for (int i = startIndex; i < tabs.getTabCount(); ++i)
             tabs.setTitleAt(i, flag ? tabs.getToolTipTextAt(i) : "");
     }
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index 6a4739a0..1904784f 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -163,7 +163,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         BugReportCommentAddition.setWrapStyleWord(true);
         //----------------------------------------------
         //тут развилка на то вкладки или поля.
-        SwitchScreen(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SmallScreen).toBoolean());
+        SwitchScreen(((GlobalDatabase) Utils_.db).settings.get(SettingName.SmallScreen).toBoolean());
         //-
         Global.componentsServer.db.bugReports.mountUI(bugReportsPanel);
         Global.componentsServer.db.subscribers.mountUI(subscribersPanel);
@@ -287,7 +287,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
     CommentFields commentFields = new CommentFields();
     @Override
     public void SwitchScreen(boolean small) {
-        CommonUI.Clear(descriptionPanel);
+        UI_.Clear(descriptionPanel);
         //------------------------------------------------------------------
         descriptionInterface = small ? descriptionTabs : descriptionFields;
         descriptionInterface.setEditorScroll(bugDescriptionScroll);
@@ -297,7 +297,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         descriptionPanel.revalidate();
         descriptionPanel.repaint();
         //---------
-        CommonUI.Clear(commentPanel);
+        UI_.Clear(commentPanel);
         //------------------------------------------------------------------
         commentInterface = small ? commentTabs : commentFields;
         commentInterface.setEditorScroll(bugCommentScroll);
@@ -367,7 +367,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         settingsTools = new VisualiserMenuBar();
     }
     public void EnableBugreports() {
-        CommonUI.Clear(accountPanel);
+        UI_.Clear(accountPanel);
         accountPanel.add(SC10);
         UI.getMainWindow().SwitchTestingTabs(true);
     }
@@ -436,9 +436,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
     }
     @Override
     public void ShowAccount() {
-        lAccountName.setText(CommonUtils.Brackets(Current.getAccount().name));
-        lAccountMail.setText(CommonUtils.Brackets(Current.getAccount().email));
-        lAccountRole.setText(CommonUtils.Brackets(Current.getAccount().role.getDescription()));
+        lAccountName.setText(Utils_.Brackets(Current.getAccount().name));
+        lAccountMail.setText(Utils_.Brackets(Current.getAccount().email));
+        lAccountRole.setText(Utils_.Brackets(Current.getAccount().role.getDescription()));
         switch (Current.getAccount().role) {
             case Undefined:
               ///  UI.Clear(accountPanel);
diff --git a/src/_VisualDVM/Visual/Windows/ComparisonForm.java b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
index edd99c7b..e4b92941 100644
--- a/src/_VisualDVM/Visual/Windows/ComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Visual.Windows;
 import Common.CommonConstants;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Visual.Editor.BaseEditor;
@@ -81,7 +81,7 @@ public abstract class ComparisonForm<T> {
             applyObject();
             showObject();
         } else
-            CommonUI.Info(log.toString());
+            UI_.Info(log.toString());
     }
     public void ApplyObject(DBObject object_in){
         RemoveObject();
@@ -254,7 +254,7 @@ public abstract class ComparisonForm<T> {
                         int master_lineNum = Body.getCaretLineNumber();
                         slave.Body.setCaretPosition(slave.Body.getLineStartOffset(master_lineNum));
                     } catch (Exception ex) {
-                        CommonUtils.MainLog.PrintException(ex);
+                        Utils_.MainLog.PrintException(ex);
                     }
                 }
             });
diff --git a/src/_VisualDVM/Visual/Windows/DebugForm.java b/src/_VisualDVM/Visual/Windows/DebugForm.java
index ca46184b..34ed67f4 100644
--- a/src/_VisualDVM/Visual/Windows/DebugForm.java
+++ b/src/_VisualDVM/Visual/Windows/DebugForm.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Visual.Interface.DebugWindow;
 import _VisualDVM.Visual.Interface.FormWithSplitters;
@@ -68,22 +68,22 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
     //-
     @Override
     public void ShowAll() {
-        ((GlobalDatabase)CommonUtils.db).makefiles.ShowUI();
-        ((GlobalDatabase)CommonUtils.db).runConfigurations.ShowUI();
-        ((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
-        ((GlobalDatabase)CommonUtils.db).runTasks.ShowUI();
+        ((GlobalDatabase) Utils_.db).makefiles.ShowUI();
+        ((GlobalDatabase) Utils_.db).runConfigurations.ShowUI();
+        ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
+        ((GlobalDatabase) Utils_.db).runTasks.ShowUI();
     }
     public DebugForm(){
         LoadSplitters();
         //--
-        ((GlobalDatabase)CommonUtils.db).makefiles.mountUI(makefilesPanel);
-        ((GlobalDatabase)CommonUtils.db).modules.mountUI(modulesPanel);
-        ((GlobalDatabase)CommonUtils.db).runConfigurations.mountUI(runConfigurationsPanel);
-        ((GlobalDatabase)CommonUtils.db).environmentValues.mountUI(environmentsPanel);
-        ((GlobalDatabase)CommonUtils.db).dvmParameters.mountUI(dvmParametersPanel);
+        ((GlobalDatabase) Utils_.db).makefiles.mountUI(makefilesPanel);
+        ((GlobalDatabase) Utils_.db).modules.mountUI(modulesPanel);
+        ((GlobalDatabase) Utils_.db).runConfigurations.mountUI(runConfigurationsPanel);
+        ((GlobalDatabase) Utils_.db).environmentValues.mountUI(environmentsPanel);
+        ((GlobalDatabase) Utils_.db).dvmParameters.mountUI(dvmParametersPanel);
         //-
-        ((GlobalDatabase)CommonUtils.db).compilationTasks.mountUI(compilationTasksPanel);
-        ((GlobalDatabase)CommonUtils.db).runTasks.mountUI(runTasksPanel);
+        ((GlobalDatabase) Utils_.db).compilationTasks.mountUI(compilationTasksPanel);
+        ((GlobalDatabase) Utils_.db).runTasks.mountUI(runTasksPanel);
         //--
         singleCompilationTaskMaster = new CompilationTasksComparisonForm(singleCompilationTaskSlave = new CompilationTasksComparisonForm(null));
         singleRunTaskMaster = new RunTasksComparisonForm(singleRunTaskSlave = new RunTasksComparisonForm(null));
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index 7c3ac83f..2307107b 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Visual.Windows;
 import Common.CommonConstants;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.Editor.Viewer;
@@ -173,29 +173,29 @@ public class FileForm implements FileWindow, FormWithSplitters {
     //----
     @Override
     public void ShowWarningsCount() {
-        boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
+        boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
         messagesTabs.setTitleAt(1, (flag ? "Предупреждения: " : "") + file.father.db.warnings.getVisibleKeys().size());
     }
     @Override
     public void ShowErrorsCount() {
-        boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
+        boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
         messagesTabs.setTitleAt(2, (flag ? "Ошибки: " : "") + file.father.db.errors.getVisibleKeys().size());
     }
     @Override
     public void ShowNotesCount() {
-        boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
+        boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
         messagesTabs.setTitleAt(0, (flag ? "Примечания: " : "") + file.father.db.notes.getVisibleKeys().size());
     }
     @Override
     public void ShowRecommendationsCount() {
-        boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
+        boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
         messagesTabs.setTitleAt(3, (flag ? "Рекомендации: " : "") + file.father.db.recommendations.getVisibleKeys().size());
     }
     //---
     @Override
     public void RefreshTabsNames() {
         UI.ShowTabsNames(graphsTabs);
-        boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
+        boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
         //--
         ShowNotesCount();
         ShowWarningsCount();
@@ -216,7 +216,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
     }
     @Override
     public void ShowText() {
-        CommonUI.Clear(editorPanel);
+        UI_.Clear(editorPanel);
         editorPanel.add(new RTextScrollPane(Body = new SPFEditor(file)));
         UI.getSearchReplaceWindow().updateEditor(Body);
     }
@@ -235,7 +235,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
     }
     @Override
     public void ShowNoMessages() {
-        boolean full_tiles = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
+        boolean full_tiles = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
         file.father.db.notes.ClearUI();
         file.father.db.warnings.ClearUI();
         file.father.db.errors.ClearUI();
@@ -367,31 +367,31 @@ public class FileForm implements FileWindow, FormWithSplitters {
     //--
     @Override
     public void CollapseGraphs() {
-        CommonUtils.db.splitters.get("SC12").position = SC12.getDividerLocation();
-        CommonUI.Clear(editorBackground);
+        Utils_.db.splitters.get("SC12").position = SC12.getDividerLocation();
+        UI_.Clear(editorBackground);
         editorBackground.add(editorPanel);
     }
     @Override
     public void ExpandGraphs() {
-        CommonUI.Clear(editorBackground);
+        UI_.Clear(editorBackground);
         SC12.setRightComponent(editorPanel);
         editorBackground.add(SC12);
         //--
-        SC12.setDividerLocation(CommonUtils.db.splitters.get("SC12").position);
+        SC12.setDividerLocation(Utils_.db.splitters.get("SC12").position);
         SC12.updateUI();
     }
     @Override
     public void CollapseMessages() {
-        CommonUtils.db.splitters.get("SC1").position = SC1.getDividerLocation();
-        CommonUI.Clear(content);
+        Utils_.db.splitters.get("SC1").position = SC1.getDividerLocation();
+        UI_.Clear(content);
         content.add(editorBackground);
     }
     @Override
     public void ExpandMessages() {
-        CommonUI.Clear(content);
+        UI_.Clear(content);
         SC1.setLeftComponent(editorBackground);
         content.add(SC1);
-        SC1.setDividerLocation(CommonUtils.db.splitters.get("SC1").position);
+        SC1.setDividerLocation(Utils_.db.splitters.get("SC1").position);
         SC1.updateUI();
     }
 }
diff --git a/src/_VisualDVM/Visual/Windows/FunctionsForm.java b/src/_VisualDVM/Visual/Windows/FunctionsForm.java
index 4ab925ef..c887307f 100644
--- a/src/_VisualDVM/Visual/Windows/FunctionsForm.java
+++ b/src/_VisualDVM/Visual/Windows/FunctionsForm.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Windows;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Visual.TextField.StyledTextField;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
@@ -115,19 +115,19 @@ public class FunctionsForm implements FunctionsWindow {
         sDepth.setModel(new SpinnerNumberModel(1,
                 0, 64, 1
         ));
-        CommonUI.MakeSpinnerRapid(sIterations, e -> {
+        UI_.MakeSpinnerRapid(sIterations, e -> {
             Current.getProject().UpdatefgIterations((int) sIterations.getValue());
             FunctionsGraphUI.ffTimer.restart();
         });
-        CommonUI.MakeSpinnerRapid(sResistance, e -> {
+        UI_.MakeSpinnerRapid(sResistance, e -> {
             Current.getProject().UpdatefgResistance((int) sResistance.getValue());
             FunctionsGraphUI.ffTimer.restart();
         });
-        CommonUI.MakeSpinnerRapid(sScreen, e -> {
+        UI_.MakeSpinnerRapid(sScreen, e -> {
             Current.getProject().UpdatefgScreen((double) sScreen.getValue());
             FunctionsGraphUI.ffTimer.restart();
         });
-        CommonUI.MakeSpinnerRapid(sDepth, e -> {
+        UI_.MakeSpinnerRapid(sDepth, e -> {
                 SPF_GetGraphFunctionPositions.depth = (int) sDepth.getValue();
                 FunctionsGraphUI.ffTimer.restart();
         });
diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java
index fb289ac6..7873a878 100644
--- a/src/_VisualDVM/Visual/Windows/MainForm.java
+++ b/src/_VisualDVM/Visual/Windows/MainForm.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -61,7 +61,7 @@ public class MainForm extends Form implements MainWindow {
         if (UI.getDebugWindow() != null)
             ((FormWithSplitters) UI.getDebugWindow()).SaveSplitters();
         //--
-        ((GlobalDatabase)CommonUtils.db).SaveCredentials();
+        ((GlobalDatabase) Utils_.db).SaveCredentials();
         //--
         Global.FinishApplication();
     }
@@ -101,7 +101,7 @@ public class MainForm extends Form implements MainWindow {
     }
     private void InstallCallbackPanel() {
         globalTabs.insertTab("Обратная связь",
-                CommonUtils.getIcon("/icons/Bug.png"),
+                Utils_.getIcon("/icons/Bug.png"),
                 (callbackForm = new CallbackForm()).getContent(),
                 "Журнал ошибок и связь с разработчиками", 1);
     }
@@ -113,7 +113,7 @@ public class MainForm extends Form implements MainWindow {
     }
     private void InstallTestsPanel() {
         globalTabs.insertTab("Тесты",
-                CommonUtils.getIcon("/icons/Library.PNG"),
+                Utils_.getIcon("/icons/Library.PNG"),
                 (testsForm = new TestsForm()).getContent(),
                 "Библиотека тестов на сервере", 2);
     }
@@ -126,7 +126,7 @@ public class MainForm extends Form implements MainWindow {
     private void InstallTestingPanel() {
         testingForm = new TestingForm();
         globalTabs.insertTab("Тестирование",
-                CommonUtils.getIcon("/icons/Session.png"),
+                Utils_.getIcon("/icons/Session.png"),
                 testingForm.getContent(),
                 "Система тестирования", 3);
     }
@@ -235,7 +235,7 @@ public class MainForm extends Form implements MainWindow {
         getTestsWindow().ShowAll();
         if (getTestingWindow() != null)
             getTestingWindow().ShowAll();
-        CommonUI.windowsStack.push(this);
+        UI_.windowsStack.push(this);
         super.Show();
     }
     @Override
diff --git a/src/_VisualDVM/Visual/Windows/ProfilesFields.java b/src/_VisualDVM/Visual/Windows/ProfilesFields.java
index f59671d0..85716597 100644
--- a/src/_VisualDVM/Visual/Windows/ProfilesFields.java
+++ b/src/_VisualDVM/Visual/Windows/ProfilesFields.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Visual.Interface.FormWithSplitters;
@@ -16,7 +16,7 @@ public class ProfilesFields implements DialogFields, FormWithSplitters {
         return content;
     }
     public ProfilesFields(){
-        ((GlobalDatabase)CommonUtils.db).sapforProfiles.mountUI(profilesPanel);
-        ((GlobalDatabase)CommonUtils.db).sapforProfilesSettings.mountUI(settingsPanel);
+        ((GlobalDatabase) Utils_.db).sapforProfiles.mountUI(profilesPanel);
+        ((GlobalDatabase) Utils_.db).sapforProfilesSettings.mountUI(settingsPanel);
     }
 }
diff --git a/src/_VisualDVM/Visual/Windows/ProfilesForm.java b/src/_VisualDVM/Visual/Windows/ProfilesForm.java
index 06760a83..0f0ed849 100644
--- a/src/_VisualDVM/Visual/Windows/ProfilesForm.java
+++ b/src/_VisualDVM/Visual/Windows/ProfilesForm.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.Dialog;
 import Common.Database.Objects.DBForm.DBForm;
 import _VisualDVM.GlobalData.GlobalDatabase;
@@ -18,13 +18,13 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
     }
     @Override
     public void Init(Object... params) {
-        if (((GlobalDatabase)CommonUtils.db).sapforProfiles.size() > 0) {
-            for (Object key : ((GlobalDatabase)CommonUtils.db).sapforProfiles.Data.keySet()) {
-                ((GlobalDatabase)CommonUtils.db).sapforProfiles.ShowUI(key);
+        if (((GlobalDatabase) Utils_.db).sapforProfiles.size() > 0) {
+            for (Object key : ((GlobalDatabase) Utils_.db).sapforProfiles.Data.keySet()) {
+                ((GlobalDatabase) Utils_.db).sapforProfiles.ShowUI(key);
                 return;
             }
         } else {
-            ((GlobalDatabase)CommonUtils.db).sapforProfiles.ShowUI();
+            ((GlobalDatabase) Utils_.db).sapforProfiles.ShowUI();
         }
     }
     @Override
@@ -58,8 +58,8 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
         return "Profiles"; //можно было бы через имя класса
     }
     public void LoadWindowParameters() throws Exception {
-        if (((GlobalDatabase)CommonUtils.db).forms.Data.containsKey(getFormKey())) {
-            info = ((GlobalDatabase)CommonUtils.db).forms.Data.get(getFormKey());
+        if (((GlobalDatabase) Utils_.db).forms.Data.containsKey(getFormKey())) {
+            info = ((GlobalDatabase) Utils_.db).forms.Data.get(getFormKey());
             info.Apply(this);
             return;
         }
@@ -68,8 +68,8 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
     public void SaveWindowParameters() throws Exception {
         if (info != null) {
             info.Init(this);
-            CommonUtils.db.Update(info);
+            Utils_.db.Update(info);
         } else
-            CommonUtils.db.Insert(new DBForm(getFormKey(), this));
+            Utils_.db.Insert(new DBForm(getFormKey(), this));
     }
 }
diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java
index 6bca5c62..7feb44f6 100644
--- a/src/_VisualDVM/Visual/Windows/ProjectForm.java
+++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -84,7 +84,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
         UI.getDebugWindow().ShowAll();
         ShowAllAnalyses();
         ShowProjectView();
-        SwitchScreen(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SmallScreen).toBoolean());
+        SwitchScreen(((GlobalDatabase) Utils_.db).settings.get(SettingName.SmallScreen).toBoolean());
         RefreshTabsNames();
         //--
         if (Global.properties.collapseProjectTrees)
@@ -172,7 +172,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
                 projectTabs.setSelectedIndex(0);
             }
         });
-        CommonUI.Clear(fileBackground);
+        UI_.Clear(fileBackground);
         //filesTabs.removeAll();
     }
     @Override
@@ -254,10 +254,10 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
     }
     @Override
     public void ShowProjectView() {
-        CommonUI.Clear(projectViewPanel);
+        UI_.Clear(projectViewPanel);
         ProjectView view = Current.getProjectView();
         menuBar.getProjectViewMenu().setToolTipText(view.getDescription());
-        menuBar.getProjectViewMenu().setIcon(CommonUtils.getIcon(view.getIcon()));
+        menuBar.getProjectViewMenu().setIcon(Utils_.getIcon(view.getIcon()));
         switch (view) {
             case Files:
                 projectViewPanel.add(filesForm.getContent());
@@ -277,13 +277,13 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
     //-
     private void InstallVersionsPanel() {
         projectTabs.insertTab("",
-                CommonUtils.getIcon("/icons/VersionsTree.png"),
+                Utils_.getIcon("/icons/VersionsTree.png"),
                 UI.getVersionsWindow().getContent(),
                 "Версии", 5);
     }
     private void InstallDebugPanel() {
         projectTabs.insertTab("",
-                CommonUtils.getIcon("/icons/Command.png"),
+                Utils_.getIcon("/icons/Command.png"),
                 UI.getDebugWindow().getContent(),
                 "Компиляция и запуск", 6);
     }
@@ -294,16 +294,16 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
     //--
     @Override
     public void CollapseProjectTrees() {
-        CommonUtils.db.splitters.get("SC3").position = SC3.getDividerLocation();
+        Utils_.db.splitters.get("SC3").position = SC3.getDividerLocation();
         //---
-        CommonUI.Clear(projectBackground);
+        UI_.Clear(projectBackground);
         projectBackground.add(fileBackground);
     }
     @Override
     public void ExpandProjectTrees() {
         SC3.setLeftComponent(fileBackground);
         projectBackground.add(SC3);
-        SC3.setDividerLocation(CommonUtils.db.splitters.get("SC3").position);
+        SC3.setDividerLocation(Utils_.db.splitters.get("SC3").position);
         SC3.updateUI();
     }
 }
\ No newline at end of file
diff --git a/src/_VisualDVM/Visual/Windows/ProjectsChooser.java b/src/_VisualDVM/Visual/Windows/ProjectsChooser.java
index b4df1108..7a706b05 100644
--- a/src/_VisualDVM/Visual/Windows/ProjectsChooser.java
+++ b/src/_VisualDVM/Visual/Windows/ProjectsChooser.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.VFileChooser_;
 import _VisualDVM.Constants;
 
@@ -12,7 +12,7 @@ public class ProjectsChooser extends VFileChooser_ {
             @Override
             public boolean accept(File f) {
                 return
-                        !CommonUtils.ContainsCyrillic(f.getAbsolutePath()) &&
+                        !Utils_.ContainsCyrillic(f.getAbsolutePath()) &&
                                 !f.getName().equalsIgnoreCase(Constants.data)
                         ;
             }
diff --git a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
index 55f8671f..9805f246 100644
--- a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Windows;
 import Common.Current_;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.Visual.Controls.ShortLabel;
@@ -75,7 +75,7 @@ public class SapforPackagesComparisonForm {
                 showObject();
             }
         } else
-            CommonUI.Info(log.toString());
+            UI_.Info(log.toString());
     }
     public void ApplyObject(DBObject object_in) {
         RemoveObject();
@@ -116,7 +116,7 @@ public class SapforPackagesComparisonForm {
     }
     //---
     public void showNoTree() {
-        CommonUI.Clear(treePanel);
+        UI_.Clear(treePanel);
     }
     public void showObject() {
         lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : ""));
diff --git a/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
index 378622cc..a8fa4bc9 100644
--- a/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import Common.Visual.Controls.MenuBarButton;
@@ -82,10 +82,10 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
         } else {
             if (isReady()) {
                 if (getMaster().isReady()) {
-                    boolean ExtensionsOn = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean();
-                    String name1 = ExtensionsOn ? getMaster().file.file.getName() : CommonUtils.getFileNameWithoutExtension(getMaster().file.file);
-                    String name2 = ExtensionsOn ? file.file.getName() : CommonUtils.getFileNameWithoutExtension(file.file);
-                    if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
+                    boolean ExtensionsOn = ((GlobalDatabase) Utils_.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);
+                    if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
                         if (name1.equalsIgnoreCase(name2))
                             master.DoComparePass(true);
                     } else
@@ -113,7 +113,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
     @Override
     protected void showObject() {
         lObjectName.setText(object.toString());
-        lObjectName.setToolTipText(object.Home.getName() + " : " + CommonUtils.Brackets(object.description));
+        lObjectName.setToolTipText(object.Home.getName() + " : " + Utils_.Brackets(object.description));
         cbFile.removeAllItems();
         for (ProjectFile file : object.files.values())
             cbFile.addItem(file);
@@ -155,15 +155,15 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
             cbFile.setSelectedIndex(-1);
             for (int i = 0; i < cbFile.getItemCount(); ++i) {
                 ProjectFile projectFile = cbFile.getItemAt(i);
-                if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
+                if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
                     //если учитываем расширения, ищем полное совпадение
                     if (projectFile.file.getName().equals(file_name)) {
                         cbFile.setSelectedIndex(i);
                         return true;
                     }
                 } else {
-                    if (CommonUtils.getNameWithoutExtension(projectFile.file.getName()).equals(
-                            CommonUtils.getNameWithoutExtension(file_name))) {
+                    if (Utils_.getNameWithoutExtension(projectFile.file.getName()).equals(
+                            Utils_.getNameWithoutExtension(file_name))) {
                         cbFile.setSelectedIndex(i);
                         return true;
                     }
diff --git a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
index 2f81098c..561e35b7 100644
--- a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
+++ b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import Common.Visual.Windows.Form;
 import _VisualDVM.Current;
 import Common.Visual.TextField.StyledTextField;
@@ -104,8 +104,8 @@ public class SearchReplaceForm extends Form {
         }
     }
     public void applyParams() {
-        String toFind = CommonUtils.hideRegularMetasymbols(tfFind.getText());
-        String toReplace = CommonUtils.hideRegularMetasymbols(tfReplace.getText());
+        String toFind = Utils_.hideRegularMetasymbols(tfFind.getText());
+        String toReplace = Utils_.hideRegularMetasymbols(tfReplace.getText());
         context.setSearchFor(toFind);
         context.setMatchCase(registerOn.isSelected());
         context.setWholeWord(wholeWordOn.isSelected());
@@ -148,7 +148,7 @@ public class SearchReplaceForm extends Form {
     }
     public void showNoFilesMatches() {
         lFilesMatchesCount.setText("—");
-        CommonUI.Clear(filesTreePanel);
+        UI_.Clear(filesTreePanel);
     }
     public void showFilesMatches() {
         long total = 0;
diff --git a/src/_VisualDVM/Visual/Windows/TasksComparisonForm.java b/src/_VisualDVM/Visual/Windows/TasksComparisonForm.java
index 96c9a70e..5af6c823 100644
--- a/src/_VisualDVM/Visual/Windows/TasksComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/TasksComparisonForm.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Windows;
 import Common.Database.Objects.DBObject;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import Common.Visual.Controls.MenuBarButton;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.Settings.SettingName;
@@ -29,7 +29,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
                         //в отличие от комбо боксов, тут события нажатия на кнопку, нет.
                         if (isReady()) {
                             if (slave.isReady()) {
-                                if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
+                                if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
                                     DoComparePass(true);
                                 } else
                                     DoShowPass(true);
@@ -40,7 +40,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
                     } else {
                         if (isReady()) {
                             if (master.isReady()) {
-                                if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
+                                if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
                                     master.DoComparePass(true);
                                 } else
                                     master.DoShowPass(true);
diff --git a/src/_VisualDVM/Visual/Windows/TestingForm.java b/src/_VisualDVM/Visual/Windows/TestingForm.java
index cc969280..759709a1 100644
--- a/src/_VisualDVM/Visual/Windows/TestingForm.java
+++ b/src/_VisualDVM/Visual/Windows/TestingForm.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Visual.Windows;
 import Common.CommonConstants;
 import Common.Current_;
-import Common.Utils.CommonUtils;
-import Common.Visual.CommonUI;
+import Common.Utils.Utils_;
+import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -130,9 +130,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         SC65.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc65Listener);
         SC66.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc66Listener);
         //-
-        ((GlobalDatabase)CommonUtils.db).machines.mountUI(machinesPanel);
-        ((GlobalDatabase)CommonUtils.db).users.mountUI(usersPanel);
-        ((GlobalDatabase)CommonUtils.db).compilers.mountUI(compilersPanel);
+        ((GlobalDatabase) Utils_.db).machines.mountUI(machinesPanel);
+        ((GlobalDatabase) Utils_.db).users.mountUI(usersPanel);
+        ((GlobalDatabase) Utils_.db).compilers.mountUI(compilersPanel);
         //-
         Global.testingServer.db.dvm_configurations.mountUI(configurationsPanel);
         Global.testingServer.db.dvmPackages.mountUI(dvmPackagesPanel);
@@ -150,7 +150,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     //-
     @Override
     public void ShowAll() {
-        ((GlobalDatabase)CommonUtils.db).machines.ShowUI();
+        ((GlobalDatabase) Utils_.db).machines.ShowUI();
         Global.testingServer.db.dvm_configurations.ShowUI();
         Global.testingServer.db.dvmPackages.ShowUI();
         Global.testingServer.db.sapforPackages.ShowUI();
@@ -273,33 +273,33 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public void RestoreLastCredentials() {
         Credentials credentials = (Credentials) Current_.get(Current.Credentials);
         if (credentials.machine_id != CommonConstants.Nan) {
-            if (((GlobalDatabase)CommonUtils.db).machines.containsKey(credentials.machine_id)) {
-                ((GlobalDatabase)CommonUtils.db).machines.ShowUI(credentials.machine_id);
-                if (((GlobalDatabase)CommonUtils.db).users.containsKey(credentials.user_id)) {
-                    ((GlobalDatabase)CommonUtils.db).users.ShowUI(credentials.user_id);
+            if (((GlobalDatabase) Utils_.db).machines.containsKey(credentials.machine_id)) {
+                ((GlobalDatabase) Utils_.db).machines.ShowUI(credentials.machine_id);
+                if (((GlobalDatabase) Utils_.db).users.containsKey(credentials.user_id)) {
+                    ((GlobalDatabase) Utils_.db).users.ShowUI(credentials.user_id);
                 } else {
                     credentials.user_id = CommonConstants.Nan;
-                    ((GlobalDatabase)CommonUtils.db).UpdateCredentials();
+                    ((GlobalDatabase) Utils_.db).UpdateCredentials();
                 }
-                if (((GlobalDatabase)CommonUtils.db).compilers.containsKey(credentials.compiler_id)) {
-                    ((GlobalDatabase)CommonUtils.db).compilers.ShowUI(credentials.compiler_id);
+                if (((GlobalDatabase) Utils_.db).compilers.containsKey(credentials.compiler_id)) {
+                    ((GlobalDatabase) Utils_.db).compilers.ShowUI(credentials.compiler_id);
                 } else {
                     credentials.compiler_id = CommonConstants.Nan;
-                    ((GlobalDatabase)CommonUtils.db).UpdateCredentials();
+                    ((GlobalDatabase) Utils_.db).UpdateCredentials();
                 }
                 //-
-                if (((GlobalDatabase)CommonUtils.db).makefiles.containsKey(credentials.makefile_id)) {
-                    ((GlobalDatabase)CommonUtils.db).makefiles.ShowUI(credentials.makefile_id);
+                if (((GlobalDatabase) Utils_.db).makefiles.containsKey(credentials.makefile_id)) {
+                    ((GlobalDatabase) Utils_.db).makefiles.ShowUI(credentials.makefile_id);
                 } else {
                     credentials.makefile_id = CommonConstants.Nan;
-                    ((GlobalDatabase)CommonUtils.db).UpdateCredentials();
+                    ((GlobalDatabase) Utils_.db).UpdateCredentials();
                 }
                 //-
-                if (((GlobalDatabase)CommonUtils.db).runConfigurations.containsKey(credentials.runconfiguration_id)) {
-                    ((GlobalDatabase)CommonUtils.db).runConfigurations.ShowUI(credentials.runconfiguration_id);
+                if (((GlobalDatabase) Utils_.db).runConfigurations.containsKey(credentials.runconfiguration_id)) {
+                    ((GlobalDatabase) Utils_.db).runConfigurations.ShowUI(credentials.runconfiguration_id);
                 } else {
                     credentials.runconfiguration_id = CommonConstants.Nan;
-                    ((GlobalDatabase)CommonUtils.db).UpdateCredentials();
+                    ((GlobalDatabase) Utils_.db).UpdateCredentials();
                 }
             } else {
                 credentials.machine_id = CommonConstants.Nan;
@@ -308,14 +308,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
                 credentials.remotesapfor_id = CommonConstants.Nan;
                 credentials.makefile_id = CommonConstants.Nan;
                 credentials.runconfiguration_id = CommonConstants.Nan;
-                ((GlobalDatabase)CommonUtils.db).UpdateCredentials();
+                ((GlobalDatabase) Utils_.db).UpdateCredentials();
             }
         }
     }
     @Override
     public void CollapseCredentials() {
-        CommonUtils.db.splitters.get("SC71").position = SC71.getDividerLocation();
-        CommonUI.Clear(credentialsPanel);
+        Utils_.db.splitters.get("SC71").position = SC71.getDividerLocation();
+        UI_.Clear(credentialsPanel);
         credentialsPanel.add(UI.credentialsBar);
         SC71.setDividerLocation(30);
         SC71.setDividerSize(0);
@@ -324,7 +324,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     }
     @Override
     public void ExpandCredentials() {
-        CommonUI.Clear(credentialsPanel);
+        UI_.Clear(credentialsPanel);
         credentialsPanel.add(SC18);
         SC71.setDividerLocation(200);
         SC71.setDividerSize(3);
diff --git a/src/_VisualDVM/Visual/Windows/VariantsForm.java b/src/_VisualDVM/Visual/Windows/VariantsForm.java
index d4a885d1..4c6053a6 100644
--- a/src/_VisualDVM/Visual/Windows/VariantsForm.java
+++ b/src/_VisualDVM/Visual/Windows/VariantsForm.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import Common.Visual.Trees.TreeForm;
 import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionsTableForm;
@@ -34,7 +34,7 @@ public class VariantsForm implements VariantsWindow {
             @Override
             public void actionPerformed(ActionEvent e) {
                 Current.getProject().SwitchFilterDistributed();
-                BDistributed.setIcon(CommonUtils.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                BDistributed.setIcon(Utils_.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
                 ShowVariantsFilter();
                 ShowFilteredVariantsCount();
             }
@@ -43,7 +43,7 @@ public class VariantsForm implements VariantsWindow {
             @Override
             public void actionPerformed(ActionEvent e) {
                 Current.getProject().SwitchFilterMultiplied();
-                bMultiplied.setIcon(CommonUtils.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                bMultiplied.setIcon(Utils_.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
                 ShowVariantsFilter();
                 ShowFilteredVariantsCount();
             }
@@ -68,8 +68,8 @@ public class VariantsForm implements VariantsWindow {
     }
     @Override
     public void ShowVariantsFilterButtons() {
-        BDistributed.setIcon(CommonUtils.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
-        bMultiplied.setIcon(CommonUtils.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
+        BDistributed.setIcon(Utils_.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
+        bMultiplied.setIcon(Utils_.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
     }
     @Override
     public void ShowVariantsFilter() {
diff --git a/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java b/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java
index 90dcb4af..88cd2173 100644
--- a/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Windows;
-import Common.Utils.CommonUtils;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Utils;
 import _VisualDVM.GlobalData.GlobalDatabase;
@@ -35,10 +35,10 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
             } else {
                 if (isReady()) {
                     if (getMaster().isReady()) {
-                        boolean ExtensionsOn = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean();
-                        String name1 = ExtensionsOn ? getMaster().file.file.getName() : CommonUtils.getFileNameWithoutExtension(getMaster().file.file);
-                        String name2 = ExtensionsOn ? file.file.getName() : CommonUtils.getFileNameWithoutExtension(file.file);
-                        if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
+                        boolean ExtensionsOn = ((GlobalDatabase) Utils_.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);
+                        if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
                             if (name1.equalsIgnoreCase(name2))
                                 master.DoComparePass(true);
                         } else
@@ -83,15 +83,15 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
         cbFile.setSelectedIndex(-1);
         for (int i = 0; i < cbFile.getItemCount(); ++i) {
             ProjectFile projectFile = cbFile.getItemAt(i);
-            if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
+            if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
                 //если учитываем расширения, ищем полное совпадение
                 if (projectFile.file.getName().equals(file_in.file.getName())) {
                     cbFile.setSelectedIndex(i);
                     return true;
                 }
             } else {
-                if (CommonUtils.getNameWithoutExtension(projectFile.file.getName()).equals(
-                        CommonUtils.getNameWithoutExtension(file_in.file.getName()))) {
+                if (Utils_.getNameWithoutExtension(projectFile.file.getName()).equals(
+                        Utils_.getNameWithoutExtension(file_in.file.getName()))) {
                     cbFile.setSelectedIndex(i);
                     return true;
                 }
@@ -106,6 +106,6 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
     }
     @Override
     protected boolean fortranWrapsOn() {
-        return ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FortranWrapsOn).toBoolean();
+        return ((GlobalDatabase) Utils_.db).settings.get(SettingName.FortranWrapsOn).toBoolean();
     }
 }
diff --git a/src/_VisualDVM/Visual/Windows/VersionsForm.java b/src/_VisualDVM/Visual/Windows/VersionsForm.java
index a0dcf255..8b143fdc 100644
--- a/src/_VisualDVM/Visual/Windows/VersionsForm.java
+++ b/src/_VisualDVM/Visual/Windows/VersionsForm.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Visual.Windows;
-import Common.Visual.CommonUI;
+import Common.Visual.UI_;
 import Common.Visual.Trees.TreeForm;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.ProjectData.Project.UI.VersionsTree;
@@ -51,7 +51,7 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow {
     }
     @Override
     public void ShowNoProjectVariants() {
-        CommonUI.Clear(variantsFormPanel);
+        UI_.Clear(variantsFormPanel);
         versionsTabs.setEnabledAt(0, false);
     }
     @Override