diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 602ddf41..ad18a5da 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,56 +7,19 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/1.txt" 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_old/UI/Tables/ConfigurationAutoSwitcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/ConfigurationAutoSwitcher.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/DVMConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/SapforConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/VisualCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/ProjectsChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectsChooser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/VDirectoryChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/VFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VFileChooser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/VFileChooser_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VFileChooser_.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/UI/CompilerFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/UI/CompilerFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Component.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/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/CreateTestFromSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/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/InstallComponentFromFolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/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/ResurrectComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/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/UI/CopyProjectFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/DarkVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/DarkVisualiserTheme.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightSPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightSPFEditorTheme.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/SPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/SPFEditorTheme.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Windows/SearchReplaceForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/DarkVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/DarkVisualiserTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/FortranSPFTokenMaker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/FreeFortranSPFTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/FreeFortranSPFTokenMaker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightSPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/LightSPFEditorTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/ProvidedTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/ProvidedTokenMaker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/SPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/TokenProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/TokenProvider.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/dark_editor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/dark_editor.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/light_editor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/light_editor.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common_old/UI/Editor/BaseEditor.java b/src/Common_old/UI/Editor/BaseEditor.java
index 2e85f572..fb5f70e6 100644
--- a/src/Common_old/UI/Editor/BaseEditor.java
+++ b/src/Common_old/UI/Editor/BaseEditor.java
@@ -5,7 +5,7 @@ import Common_old.UI.Menus.StyledPopupMenu;
 import Common_old.UI.Menus.TextEditorMenu;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Windows.Dialog.DialogFields;
-import _VisualDVM.Syntax.SPFEditorTheme;
+import _VisualDVM.Visual.Syntax.SPFEditorTheme;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 
 import javax.swing.event.HyperlinkEvent;
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 2a56bd40..6ac485b5 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -28,7 +28,7 @@ import TestingSystem.DVM.RemoteDVMTestingPlanner;
 import TestingSystem.SAPFOR.PackageModeSupervisor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import _VisualDVM.Syntax.LightSPFEditorTheme;
+import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 
@@ -288,10 +288,10 @@ public class Global {
         //-
         UI.CreateComponentsForm();
         AbstractTokenMakerFactory atmf = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance();
-        atmf.putMapping("text/FortranSPF", "_VisualDVM.Syntax.FortranSPFTokenMaker");
-        atmf.putMapping("text/FreeFortranSPF", "_VisualDVM.Syntax.FreeFortranSPFTokenMaker");
+        atmf.putMapping("text/FortranSPF", "_VisualDVM.Visual.Syntax.FortranSPFTokenMaker");
+        atmf.putMapping("text/FreeFortranSPF", "_VisualDVM.Visual.Syntax.FreeFortranSPFTokenMaker");
         //  FoldParserManager.get().addFoldParserMapping("text/FortranSPF", new FortranFolder()); блоки кода. todo
-        //-------->>
+        //light_editor.xml-------->>
         //-------->>
         if (properties.AutoUpdateSearch)
             Pass_2021.passes.get(PassCode_2021.GetComponentsActualVersions).Do();
diff --git a/src/_VisualDVM/Syntax/DarkVisualiserTheme.java b/src/_VisualDVM/Visual/Syntax/DarkVisualiserTheme.java
similarity index 94%
rename from src/_VisualDVM/Syntax/DarkVisualiserTheme.java
rename to src/_VisualDVM/Visual/Syntax/DarkVisualiserTheme.java
index 1b8dda65..1e567da5 100644
--- a/src/_VisualDVM/Syntax/DarkVisualiserTheme.java
+++ b/src/_VisualDVM/Visual/Syntax/DarkVisualiserTheme.java
@@ -1,9 +1,9 @@
-package _VisualDVM.Syntax;
+package _VisualDVM.Visual.Syntax;
 import java.awt.*;
 public class DarkVisualiserTheme extends SPFEditorTheme {
     @Override
     protected String getEditorThemePath() {
-        return "/_VisualDVM/Syntax/dark_editor.xml";
+        return "/_VisualDVM/Visual/Syntax/dark_editor.xml";
     }
     @Override
     protected String getForegroundHex() {
diff --git a/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java b/src/_VisualDVM/Visual/Syntax/FortranSPFTokenMaker.java
similarity index 99%
rename from src/_VisualDVM/Syntax/FortranSPFTokenMaker.java
rename to src/_VisualDVM/Visual/Syntax/FortranSPFTokenMaker.java
index 381735ab..5c7ca3c8 100644
--- a/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java
+++ b/src/_VisualDVM/Visual/Syntax/FortranSPFTokenMaker.java
@@ -1,4 +1,6 @@
-package _VisualDVM.Syntax;
+package _VisualDVM.Visual.Syntax;
+import _VisualDVM.Visual.Syntax.ProvidedTokenMaker;
+import _VisualDVM.Visual.Syntax.TokenProvider;
 import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
 import org.fife.ui.rsyntaxtextarea.Token;
 import org.fife.ui.rsyntaxtextarea.TokenMap;
diff --git a/src/_VisualDVM/Syntax/FreeFortranSPFTokenMaker.java b/src/_VisualDVM/Visual/Syntax/FreeFortranSPFTokenMaker.java
similarity index 98%
rename from src/_VisualDVM/Syntax/FreeFortranSPFTokenMaker.java
rename to src/_VisualDVM/Visual/Syntax/FreeFortranSPFTokenMaker.java
index b958766a..533b9003 100644
--- a/src/_VisualDVM/Syntax/FreeFortranSPFTokenMaker.java
+++ b/src/_VisualDVM/Visual/Syntax/FreeFortranSPFTokenMaker.java
@@ -1,4 +1,6 @@
-package _VisualDVM.Syntax;
+package _VisualDVM.Visual.Syntax;
+import _VisualDVM.Visual.Syntax.ProvidedTokenMaker;
+import _VisualDVM.Visual.Syntax.TokenProvider;
 import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
 import org.fife.ui.rsyntaxtextarea.Token;
 import org.fife.ui.rsyntaxtextarea.TokenMap;
diff --git a/src/_VisualDVM/Syntax/LightSPFEditorTheme.java b/src/_VisualDVM/Visual/Syntax/LightSPFEditorTheme.java
similarity index 93%
rename from src/_VisualDVM/Syntax/LightSPFEditorTheme.java
rename to src/_VisualDVM/Visual/Syntax/LightSPFEditorTheme.java
index 9b7633c5..d9f222ea 100644
--- a/src/_VisualDVM/Syntax/LightSPFEditorTheme.java
+++ b/src/_VisualDVM/Visual/Syntax/LightSPFEditorTheme.java
@@ -1,9 +1,9 @@
-package _VisualDVM.Syntax;
+package _VisualDVM.Visual.Syntax;
 import java.awt.*;
 public class LightSPFEditorTheme extends SPFEditorTheme {
     @Override
     protected String getEditorThemePath() {
-        return "/_VisualDVM/Syntax/light_editor.xml";
+        return "/_VisualDVM/Visual/Syntax/light_editor.xml";
     }
     @Override
     protected String getForegroundHex() {
diff --git a/src/_VisualDVM/Syntax/ProvidedTokenMaker.java b/src/_VisualDVM/Visual/Syntax/ProvidedTokenMaker.java
similarity index 96%
rename from src/_VisualDVM/Syntax/ProvidedTokenMaker.java
rename to src/_VisualDVM/Visual/Syntax/ProvidedTokenMaker.java
index 092d1c8c..fe058499 100644
--- a/src/_VisualDVM/Syntax/ProvidedTokenMaker.java
+++ b/src/_VisualDVM/Visual/Syntax/ProvidedTokenMaker.java
@@ -1,4 +1,5 @@
-package _VisualDVM.Syntax;
+package _VisualDVM.Visual.Syntax;
+import _VisualDVM.Visual.Syntax.TokenProvider;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMaker;
 import org.fife.ui.rsyntaxtextarea.Token;
 import org.fife.ui.rsyntaxtextarea.TokenMap;
diff --git a/src/_VisualDVM/Syntax/SPFEditorTheme.java b/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
similarity index 95%
rename from src/_VisualDVM/Syntax/SPFEditorTheme.java
rename to src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
index 1780c5f0..d4e9b066 100644
--- a/src/_VisualDVM/Syntax/SPFEditorTheme.java
+++ b/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Syntax;
+package _VisualDVM.Visual.Syntax;
 import Common.Utils.CommonUtils;
 import Common.Visual.Themes.VisualiserTheme;
 import org.fife.ui.rsyntaxtextarea.Theme;
diff --git a/src/_VisualDVM/Syntax/TokenProvider.java b/src/_VisualDVM/Visual/Syntax/TokenProvider.java
similarity index 99%
rename from src/_VisualDVM/Syntax/TokenProvider.java
rename to src/_VisualDVM/Visual/Syntax/TokenProvider.java
index 06ad86e0..4d2db0ce 100644
--- a/src/_VisualDVM/Syntax/TokenProvider.java
+++ b/src/_VisualDVM/Visual/Syntax/TokenProvider.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Syntax;
+package _VisualDVM.Visual.Syntax;
 import org.fife.ui.rsyntaxtextarea.Token;
 
 import javax.swing.text.Segment;
diff --git a/src/_VisualDVM/Syntax/dark_editor.xml b/src/_VisualDVM/Visual/Syntax/dark_editor.xml
similarity index 100%
rename from src/_VisualDVM/Syntax/dark_editor.xml
rename to src/_VisualDVM/Visual/Syntax/dark_editor.xml
diff --git a/src/_VisualDVM/Syntax/light_editor.xml b/src/_VisualDVM/Visual/Syntax/light_editor.xml
similarity index 100%
rename from src/_VisualDVM/Syntax/light_editor.xml
rename to src/_VisualDVM/Visual/Syntax/light_editor.xml