diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 03224ba8..dda4cbb5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,9 @@
   </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/Loops/Json/FileLoopsJson.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FunctionsJson/FileFunctionsJson.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FunctionsJson/FunctionsJson.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/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.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/Loops/Json/LoopsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Json/LoopsJson.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncParam.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncParam.java
index f9e2630d..a7bbd29b 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncParam.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncParam.java
@@ -1,16 +1,17 @@
 package _VisualDVM.ProjectData.SapforData.Functions;
 import com.google.gson.annotations.Expose;
 
+import java.util.List;
 import java.util.Vector;
 public class FuncParam {
     static final int IN_BIT = 16;
     static final int OUT_BIT = 256;
     @Expose
-    Vector<Integer> inout_types;
+    List<Integer> inoutTypes;
     @Expose
-    Vector<String> identificators;
+    List<String> identificators;
     @Expose
-    Vector<String> parametersT;
+    List<String> parametersT;
     @Expose
     int countOfPars;
     public FuncParam() {
@@ -20,11 +21,11 @@ public class FuncParam {
         countOfPars = numPar;
         if (numPar != 0) {
             parametersT = new Vector<>(numPar);
-            inout_types = new Vector<>(numPar);
+            inoutTypes = new Vector<>(numPar);
             identificators = new Vector<>(numPar);
             for (int z = 0; z < numPar; ++z) {
                 parametersT.add("NONE_T");
-                inout_types.add(0);
+                inoutTypes.add(0);
                 identificators.add("");
             }
         }
@@ -33,13 +34,13 @@ public class FuncParam {
         if (num >= countOfPars)
             return false;
         else
-            return (inout_types.get(num) & IN_BIT) != 0;
+            return (inoutTypes.get(num) & IN_BIT) != 0;
     }
     boolean IsArgOut(int num) {
         if (num >= countOfPars)
             return false;
         else
-            return (inout_types.get(num) & OUT_BIT) != 0;
+            return (inoutTypes.get(num) & OUT_BIT) != 0;
     }
     boolean IsArgInOut(int num) {
         if (num >= countOfPars)
@@ -49,7 +50,7 @@ public class FuncParam {
     }
     public void FillParam(int num, String type, String ident, int inout) {
         parametersT.set(num, type);
-        inout_types.set(num, inout);
+        inoutTypes.set(num, inout);
         identificators.set(num, ident);
     }
     @Override
@@ -58,7 +59,7 @@ public class FuncParam {
         for (int i = 0; i < countOfPars; ++i) {
             String ps = IsArgInOut(i) ? "inout" :
                     (IsArgOut(i) ? "out" : (IsArgIn(i) ? "in" : "?!"));
-            ps += " " + inout_types.get(i) + " " + identificators.get(i) + " " + parametersT.get(i);
+            ps += " " + inoutTypes.get(i) + " " + identificators.get(i) + " " + parametersT.get(i);
             res.add(ps);
         }
         return String.join(",", res);
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FunctionsJson/FileFunctionsJson.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FunctionsJson/FileFunctionsJson.java
new file mode 100644
index 00000000..d43ee85d
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FunctionsJson/FileFunctionsJson.java
@@ -0,0 +1,12 @@
+package _VisualDVM.ProjectData.SapforData.Functions.FunctionsJson;
+import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Vector;
+public class FileFunctionsJson {
+    @Expose
+    public String file;
+    @Expose
+    public List<FuncInfo> functions = new Vector<>();
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FunctionsJson/FunctionsJson.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FunctionsJson/FunctionsJson.java
new file mode 100644
index 00000000..477b5c11
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FunctionsJson/FunctionsJson.java
@@ -0,0 +1,9 @@
+package _VisualDVM.ProjectData.SapforData.Functions.FunctionsJson;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Vector;
+public class FunctionsJson {
+    @Expose
+    public List<FileFunctionsJson> functions = new Vector<>();
+}