diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5ab5276e..c8754c47 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +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/Includes/Transformation/IncludeToInsertJson.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludesToInsertJson.java" afterDir="false" />
       <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/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.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/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.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/Includes/FileInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/FileInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Include.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Json/FileIncludesJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Json/FileIncludesJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Json/IncludesJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Json/IncludesJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
index 22c6f34c..2b8e508f 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
-import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
@@ -8,10 +7,10 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileType;
 import _VisualDVM.ProjectData.Files.LanguageStyle;
 import _VisualDVM.ProjectData.LanguageName;
-import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
-import _VisualDVM.ProjectData.SapforData.Includes.Include;
-import _VisualDVM.ProjectData.SapforData.Includes.Json.FileIncludesJson;
-import _VisualDVM.ProjectData.SapforData.Includes.Json.IncludesJson;
+import _VisualDVM.ProjectData.SapforData.Includes.Analysis.FileInfo;
+import _VisualDVM.ProjectData.SapforData.Includes.Analysis.Include;
+import _VisualDVM.ProjectData.SapforData.Includes.Analysis.Json.FileIncludesJson;
+import _VisualDVM.ProjectData.SapforData.Includes.Analysis.Json.IncludesJson;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 public class SPF_GetIncludeDependencies extends SapforAnalysis {
diff --git a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
index 4d9fd141..980c076f 100644
--- a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
+++ b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
@@ -4,11 +4,14 @@ import Common.Visual.Selectable;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforTransformation;
-import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
-import _VisualDVM.ProjectData.SapforData.Includes.Include;
+import _VisualDVM.ProjectData.SapforData.Includes.Analysis.FileInfo;
+import _VisualDVM.ProjectData.SapforData.Includes.Analysis.Include;
 
 import java.util.Vector;
 import java.util.stream.Collectors;
+
+
+
 public class SPF_InsertIncludesPass extends SapforTransformation {
     @Override
     protected PassCode necessary() {
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index 026077b3..6bdedaf0 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -32,7 +32,7 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.GraphInfo;
-import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
+import _VisualDVM.ProjectData.SapforData.Includes.Analysis.FileInfo;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegionsSet;
 import _VisualDVM.ProjectData.SapforData.SapforProperties;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/FileInfo.java
similarity index 85%
rename from src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java
rename to src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/FileInfo.java
index 27f05723..9d8fee3b 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/FileInfo.java
@@ -1,6 +1,7 @@
-package _VisualDVM.ProjectData.SapforData.Includes;
+package _VisualDVM.ProjectData.SapforData.Includes.Analysis;
 import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.SapforData.FileObject;
+import _VisualDVM.ProjectData.SapforData.Includes.Analysis.Include;
 import com.google.gson.annotations.Expose;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Include.java
similarity index 92%
rename from src/_VisualDVM/ProjectData/SapforData/Includes/Include.java
rename to src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Include.java
index 5dc56c1a..3008acc4 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Include.java
@@ -1,4 +1,4 @@
-package _VisualDVM.ProjectData.SapforData.Includes;
+package _VisualDVM.ProjectData.SapforData.Includes.Analysis;
 import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.SapforData.FileObject;
 import com.google.gson.annotations.Expose;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/Json/FileIncludesJson.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Json/FileIncludesJson.java
similarity index 62%
rename from src/_VisualDVM/ProjectData/SapforData/Includes/Json/FileIncludesJson.java
rename to src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Json/FileIncludesJson.java
index 190c0c70..332cc542 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/Json/FileIncludesJson.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Json/FileIncludesJson.java
@@ -1,5 +1,5 @@
-package _VisualDVM.ProjectData.SapforData.Includes.Json;
-import _VisualDVM.ProjectData.SapforData.Includes.Include;
+package _VisualDVM.ProjectData.SapforData.Includes.Analysis.Json;
+import _VisualDVM.ProjectData.SapforData.Includes.Analysis.Include;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/Json/IncludesJson.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Json/IncludesJson.java
similarity index 72%
rename from src/_VisualDVM/ProjectData/SapforData/Includes/Json/IncludesJson.java
rename to src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Json/IncludesJson.java
index a38c2171..31d98401 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/Json/IncludesJson.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/Json/IncludesJson.java
@@ -1,4 +1,4 @@
-package _VisualDVM.ProjectData.SapforData.Includes.Json;
+package _VisualDVM.ProjectData.SapforData.Includes.Analysis.Json;
 import com.google.gson.annotations.Expose;
 
 import java.util.Vector;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java
new file mode 100644
index 00000000..c57b55ec
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java
@@ -0,0 +1,10 @@
+package _VisualDVM.ProjectData.SapforData.Includes.Transformation;
+import com.google.gson.annotations.Expose;
+public class IncludeToInsertJson {
+    @Expose
+    public String includeName;
+    @Expose
+    public String fileName;
+    @Expose
+    public int line;
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludesToInsertJson.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludesToInsertJson.java
new file mode 100644
index 00000000..b853521f
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludesToInsertJson.java
@@ -0,0 +1,8 @@
+package _VisualDVM.ProjectData.SapforData.Includes.Transformation;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+public class IncludesToInsertJson {
+    @Expose
+    public List<IncludeToInsertJson> allIncludes;
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java
index 2230e15f..d851cc8f 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java
@@ -1,7 +1,7 @@
 package _VisualDVM.ProjectData.SapforData.Includes.UI;
 import Common.Visual.Trees.SelectableTree;
 import _VisualDVM.Global;
-import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
+import _VisualDVM.ProjectData.SapforData.Includes.Analysis.FileInfo;
 import _VisualDVM.Visual.Menus.SelectionTreeMenu;
 public class IncludesMenu extends SelectionTreeMenu {
     public IncludesMenu(SelectableTree tree_in) {