diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1db973ae..4b7f72dc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,152 +7,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/RendererVariantRank.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/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/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.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/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.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/Menus/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/FastAccessMenuBar.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/Tables/ColumnInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ConfigurationAutoRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererConfigurationAuto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/SwitcherConfigurationAuto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/EditorDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectSelectionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectSelectionRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectSelector.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectSelector.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DateRenderer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererDate.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/EditableHeaderRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendereEditableHeader.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererHiddenList.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HyperlinksRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererHyperlinks.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/MaskedIntegerValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererMaskedNanInteger.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/MultilineRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererMultiline.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ProgressBarRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererProgressBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererStatusEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/TableEditors.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/TableRenderers.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/TopLeftRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererTopLeft.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/VectorEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/EditorFilesHyperlinks.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererWrapText.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/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeRenderers.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/UI_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI.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/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI.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/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/CompilerEnvironment/CompilerEnvironmentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.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/CompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.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/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.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/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/RendererTreeRemoteFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.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/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/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CopyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CopyProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteVersion.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditAccount.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GenerateParallelVariants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GenerateParallelVariants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/StartTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/StartTestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforTransformation.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/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.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/Messages/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.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/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/RendererProjectVersion.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/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/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/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.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/RendererTreeRule.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/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/FunctionsGraphUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.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/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.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/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.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/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.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/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/TestingMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.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/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.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/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/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/RendererTreeSapforVersions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.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/Visual/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.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/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.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/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/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.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/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.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/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" />
@@ -251,11 +116,11 @@
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
+      <recent name="_VisualDVM.ProjectData.Files.UI.Editor.SPFEditor" />
+      <recent name="_VisualDVM.Repository.Component.Sapfor.Sapfor" />
       <recent name="Common.Visual.UI_" />
       <recent name="Common.Utils.Utils_" />
       <recent name="Common.Visual.CommonUI" />
-      <recent name="CommomUI" />
-      <recent name="_VisualDVM.Global" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\Visual\Windows" />
diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index 8ed344c3..bc0bef1e 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -95,7 +95,8 @@ public class Pass<T> {
             } catch (Exception ex) {
                 Utils_.MainLog.PrintException(ex);
             }
-            MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
+            if (UI.isActive())
+                MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
         }
     }
     public boolean isDone() {
diff --git a/src/Common/Visual/UI.java b/src/Common/Visual/UI.java
index 1331b23d..e31ee458 100644
--- a/src/Common/Visual/UI.java
+++ b/src/Common/Visual/UI.java
@@ -7,9 +7,8 @@ import javax.swing.event.ChangeListener;
 import javax.swing.text.DefaultFormatter;
 import java.awt.*;
 public class UI {
-    public static boolean active = false;
     public static boolean isActive() {
-        return active;
+        return (MainModule_.instance!=null)&&MainModule_.instance.hasUI();
     }
     //---
     public static void Clear(Container container) {
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index c46a59af..1ab38219 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -13,7 +13,6 @@ import _VisualDVM.Repository.Component.*;
 import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
 import _VisualDVM.Repository.Component.Sapfor.MessagesServer;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor_F;
-import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 import _VisualDVM.Repository.Server.ComponentsServer;
 import _VisualDVM.TestingSystem.Common.TestingServer;
 import _VisualDVM.TestingSystem.DVM.LocalDVMTestingPlanner;
@@ -31,14 +30,9 @@ public class Global {
     public static Mode mode = Mode.Undefined;
     //--------------------------------------------------
     public static GlobalProperties properties = new GlobalProperties();
-    //</editor-fold>
-    //------------------------------------------------------
-    public static boolean enable_text_changed = false;
     //---
     public static boolean files_multiselection = false;
     public static boolean versions_multiselection = false;
-    //---
-    public static TransformationPermission transformationPermission = TransformationPermission.None;
     //??
     public static DataSet<ComponentType, Component> Components = null;
     public static MessagesServer messagesServer = null;
@@ -221,7 +215,6 @@ public class Global {
     //--
     public static void NormalMode(int port) throws Exception {
         //-------------------------------->>
-        UI.active = true;
         mainModule = new MainModule();
         mainModule.Init();
         //--
@@ -309,7 +302,6 @@ public class Global {
         CreateLogAtComponentsPath();
         testingServer = new TestingServer();
         testingServer.ActivateDB();
-        //   testingServer.PATCH();
         testingServer.Start();
         System.exit(0);
     }
diff --git a/src/_VisualDVM/Passes/All/CombineFiles.java b/src/_VisualDVM/Passes/All/CombineFiles.java
index 7b26f29b..8eb4fff8 100644
--- a/src/_VisualDVM/Passes/All/CombineFiles.java
+++ b/src/_VisualDVM/Passes/All/CombineFiles.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
-import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.Transformation;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
+import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 import _VisualDVM.Utils;
 import _VisualDVM.Visual.Windows.CombineFilesDialog;
@@ -24,7 +24,7 @@ public class CombineFiles extends Transformation {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        switch (Global.transformationPermission) {
+        switch (Sapfor.transformationPermission) {
             case All:
                 return super.canStart(args) && target.CheckSameStyle(Log) &&
                         (fd = new CombineFilesDialog()).ShowDialog("Выберите имя итогового файла", target.files_order);
diff --git a/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java b/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java
index 6473c136..5ba749f8 100644
--- a/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java
+++ b/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
-import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.Transformation;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileType;
+import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 import org.apache.commons.io.FileUtils;
 
@@ -19,7 +19,7 @@ public class PrepareForModulesAssembly extends Transformation {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        switch (Global.transformationPermission) {
+        switch (Sapfor.transformationPermission) {
             case All:
                 return super.canStart(args) && target.CheckSameStyle(Log);
             case VariantsOnly:
diff --git a/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java b/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java
index 2067b826..c620a5ef 100644
--- a/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java
+++ b/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java
@@ -1,9 +1,9 @@
 package _VisualDVM.Passes.All;
 import Common.Visual.UI;
-import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforTransformation;
 import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
+import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 public class SPF_CreateParallelVariant extends SapforTransformation {
     ParallelVariant variant = null;
@@ -63,7 +63,7 @@ public class SPF_CreateParallelVariant extends SapforTransformation {
     }
     @Override
     protected void performDone() throws Exception {
-        Global.transformationPermission = TransformationPermission.VariantsOnly;
+        Sapfor.transformationPermission = TransformationPermission.VariantsOnly;
         target.migrateFilesSettings(target.last_version, true, true);
         if (UI.isActive())
             variant.UpdateStats(sapfor.getPredictorStats(), target.last_version.name);
diff --git a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
index 0d288982..327d0fcd 100644
--- a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
+++ b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
@@ -7,6 +7,8 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileState;
+import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
+import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 import org.apache.commons.io.FileUtils;
 
@@ -119,7 +121,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
         sapfor.GetIntrinsics();
         //--------------------------
         projLines.clear();
-        Global.transformationPermission = TransformationPermission.None;
+        Sapfor.transformationPermission = TransformationPermission.None;
         target.CreateParserOptionsDirs();
         //---------------------------
         for (DBProjectFile f : target.db.files.Data.values()) {
@@ -159,8 +161,8 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
            target.updateLog(sapfor.getOutput());
         }
          */
-        Global.transformationPermission = TransformationPermission.All;
-        Global.enable_text_changed = true;
+        Sapfor.transformationPermission = TransformationPermission.All;
+        SPFEditor.enable_text_changed = true;
     }
     /*
     @Override
diff --git a/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java b/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java
index c9161105..6d6b485d 100644
--- a/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java
+++ b/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java
@@ -5,6 +5,7 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.ProjectData.ProjectView;
+import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 
 import javax.swing.*;
@@ -81,7 +82,7 @@ public class SapforTransformation extends SapforPass {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        switch (Global.transformationPermission) {
+        switch (Sapfor.transformationPermission) {
             case All:
                 return super.canStart(args);
             case VariantsOnly:
diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
index 41c16279..d200709e 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
@@ -30,6 +30,9 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
     //--
     public static final Highlighter.HighlightPainter GreenTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
     public static final Highlighter.HighlightPainter RedTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
+    //</editor-fold>
+    //------------------------------------------------------
+    public static boolean enable_text_changed = false;
     public DBProjectFile file = null; //файл связанный с редактором
     //----
     public RSyntaxTextAreaHighlighter highlighter = null;
@@ -63,7 +66,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
             public void changedUpdate(DocumentEvent arg0) {
                 if (!switching_language) {
                     file.NeedsSave = true;
-                    if (Global.enable_text_changed && file.state != FileState.Excluded) {
+                    if (enable_text_changed && file.state != FileState.Excluded) {
                         Global.mainModule.getSapfor().ResetAllAnalyses();
                         //текст изменился, значит M ка более не актуальна.
                         file.father.dropLastModification();
diff --git a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
index 5d765432..9fc512e1 100644
--- a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
@@ -10,6 +10,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.LanguageStyle;
+import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.Repository.Component.OSDComponent;
 import _VisualDVM.Repository.Component.Visualizer_2;
 import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -27,6 +28,8 @@ public abstract class Sapfor extends OSDComponent {
     public static final int canceled_code = -99;
     public static final int invalid_proj_code = -2;
     public static File temp_copy = null;
+    //---
+    public static TransformationPermission transformationPermission = TransformationPermission.None;
     public Vector<String> Intrinsics = new Vector<>();
     public LinkedHashMap<String, String> ModifiedFiles = new LinkedHashMap<>();
     public LinkedHashMap<String, String> OldFiles = new LinkedHashMap<>();
@@ -558,8 +561,8 @@ public abstract class Sapfor extends OSDComponent {
             Global.mainModule.getPass(PassCode.Precompilation).Reset();
             Global.mainModule.getPass(PassCode.SPF_GetGCovInfo).Reset();
         }
-        Global.enable_text_changed = false;
-        Global.transformationPermission = TransformationPermission.None;
+        SPFEditor.enable_text_changed = false;
+        transformationPermission = TransformationPermission.None;
         if ((UI.isActive()) && (Global.mainModule.getUI().hasMainWindow()) && (Global.mainModule.getUI().getVersionsWindow() != null))
             Global.mainModule.getUI().getVersionsWindow().BlockVariants();
     }