diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 3b2fa6d..03b68ee 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -5,9 +5,17 @@
     <file url="file://$PROJECT_DIR$/gumtree" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gumtree/client" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gumtree/client.diff" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/client.diff/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/client.diff/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/client/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gumtree/core" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gumtree/gen.jdt" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gumtree/gen.srcml" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/richedit" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/richedit/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cbfff81..9f27d8d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,36 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="75ef5724-93bc-4ed4-82b2-ff12411188dc" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/com/github/gumtreediff/gen/jdt/AbstractJdtVisitor.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/com/github/gumtreediff/gen/jdt/AbstractJdtVisitor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gen/jdt/exp/ExpJdtVisitor.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gen/jdt/exp/ExpJdtVisitor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/abstractPatch.py" beforeDir="false" afterPath="$PROJECT_DIR$/python/abstractPatch.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/bugReport.pdf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/common/commons.py" beforeDir="false" afterPath="$PROJECT_DIR$/python/common/commons.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/data/FixPatternMiner-1.0.0.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/data/FixPatternMiner-1.0.1.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/data/bugReports.7z.001" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/data/bugReports.7z.002" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/data/bugReports.7z.003" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/data/gumInput.7z.001" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/python/main.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/python/javaDS.py" beforeDir="false" afterPath="$PROJECT_DIR$/python/javaDS.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.yml" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/classes/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path="$PROJECT_DIR$/richedit/target/" />
-    <ignored path="$PROJECT_DIR$/gumtree/gen.srcml/target/" />
-    <ignored path="$PROJECT_DIR$/gumtree/core/target/" />
-    <ignored path="$PROJECT_DIR$/gumtree/client.diff/target/" />
-    <ignored path="$PROJECT_DIR$/gumtree/gen.jdt/target/" />
-    <ignored path="$PROJECT_DIR$/gumtree/client/target/" />
-    <ignored path="$PROJECT_DIR$/gumtree/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -40,94 +18,6 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="192">
-              <caret line="592" column="27" selection-start-line="592" selection-start-column="27" selection-end-line="592" selection-end-column="27" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/com/github/gumtreediff/gen/jdt/AbstractJdtTreeGenerator.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="375">
-              <caret line="67" selection-start-line="67" selection-end-line="67" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
-              <caret line="56" column="26" selection-start-line="56" selection-start-column="12" selection-end-line="56" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="117">
-              <caret line="23" column="24" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalActionSet.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1273">
-              <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="111" selection-start-line="111" selection-end-line="111" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="212">
-              <caret line="91" column="12" selection-start-line="91" selection-start-column="12" selection-end-line="96" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/utils/ListSorter.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="11" column="11" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/src.zip!/java/lang/Comparable.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="509">
-              <caret line="135" column="15" selection-start-line="135" selection-start-column="15" selection-end-line="135" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -175,63 +65,6 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/richedit/Launcher.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.jdt/pom.xml" />
-        <option value="$PROJECT_DIR$/gumtree/core/pom.xml" />
-        <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/utils/FileHelper.java" />
-        <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffWorker.java" />
-        <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/utils/EDiffHelper.java" />
-        <option value="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/FixPatternMiner/HunkParserTest.java" />
-        <option value="$PROJECT_DIR$/python/fixminer.sh" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/Launcher.java" />
-        <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java" />
-        <option value="$PROJECT_DIR$/python/data/callJava.sh" />
-        <option value="$PROJECT_DIR$/python/data/redis/stopServer.sh" />
-        <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java" />
-        <option value="$PROJECT_DIR$/python/javaDS.py" />
-        <option value="$PROJECT_DIR$/python/otherDatasets.py" />
-        <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TreeLoader.java" />
-        <option value="$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/io/TreeIoUtils.java" />
-        <option value="$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestActionGenerator.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlCGenerator.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlCppGenerator.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlCsGenerator.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlJavaGenerator.java" />
-        <option value="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/FixPatternMiner/BaseTest.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/SrcmlCTreeGenerator.java" />
-        <option value="$PROJECT_DIR$/.travis_native_dependencies.sh" />
-        <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java" />
-        <option value="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/NodeMap_new.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java" />
-        <option value="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java" />
-        <option value="$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestActionIo.java" />
-        <option value="$PROJECT_DIR$/richedit/pom.xml" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/.travis.yml" />
-        <option value="$PROJECT_DIR$/gumtree/pom.xml" />
-        <option value="$PROJECT_DIR$/gumtree/client.diff/pom.xml" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/python/abstractPatch.py" />
-        <option value="$PROJECT_DIR$/src/main/resources/config.yml" />
-        <option value="$PROJECT_DIR$/python/common/commons.py" />
-        <option value="$PROJECT_DIR$/python/main.py" />
-        <option value="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeGenerator.java" />
-        <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java" />
-        <option value="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/com/github/gumtreediff/gen/jdt/AbstractJdtVisitor.java" />
-        <option value="$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gen/jdt/exp/ExpJdtVisitor.java" />
-        <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java" />
-        <option value="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java" />
-      </list>
-    </option>
-  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
@@ -244,135 +77,16 @@
       </MavenImportingSettings>
     </option>
   </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="RichEdit" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="RichEdit" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="width" value="1680" />
-    <option name="height" value="1050" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="python" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="richedit" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="richedit" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="richedit" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="richedit" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="richedit" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="serval" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="richedit" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="serval" type="462c0819:PsiDirectoryNode" />
-              <item name="richedit" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="richedit" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="serval" type="462c0819:PsiDirectoryNode" />
-              <item name="richedit" type="462c0819:PsiDirectoryNode" />
-              <item name="ediff" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
+  <component name="ProjectId" id="1d1vSh6kcsH7f7UD8sxlgrJsuvj" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="last_directory_selection" value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/richedit/src/main/resource" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.38275862" />
@@ -391,25 +105,27 @@
       <recent name="$PROJECT_DIR$/src/main/resources" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager" selected="JUnit.TestJavaMiner">
+  <component name="RunManager" selected="Application.Launcher">
     <configuration default="true" type="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="Launcher" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.Launcher" />
+      <module name="RichEdit" />
+      <option name="PROGRAM_PARAMETERS" value="$PROJECT_DIR$/src/main/resources/config.yml RICHEDITSCRIPT" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="edu.lu.uni.serval.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <method v="2">
@@ -432,6 +148,23 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="TestJavaMiner.test_collections_2d6bc8_506966" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="RichEdit" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="edu.lu.uni.serval.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="edu.lu.uni.serval" />
+      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.TestJavaMiner" />
+      <option name="METHOD_NAME" value="test_collections_2d6bc8_506966" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="TestJavaMiner.test_collections_3761b5_3639ab" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="RichEdit" />
       <extension name="coverage">
@@ -449,40 +182,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestJavaMiner.test_collections_b6d038_4bdb89" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="RichEdit" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="edu.lu.uni.serval.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="edu.lu.uni.serval" />
-      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.TestJavaMiner" />
-      <option name="METHOD_NAME" value="test_collections_b6d038_4bdb89" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="TestJavaMiner.test_fuse_74c02c_a4658a" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="RichEdit" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="edu.lu.uni.serval.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="edu.lu.uni.serval" />
-      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.TestJavaMiner" />
-      <option name="METHOD_NAME" value="test_fuse_74c02c_a4658a" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="TestJavaMiner.test_fuse_cb3362_cfb295" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="RichEdit" />
       <extension name="coverage">
@@ -578,24 +277,36 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Maven.FixPatternMiner [assembly:assembly]" />
-      <item itemvalue="Maven.FixPatternMiner [package]" />
-      <item itemvalue="JUnit.TestJavaMiner.test_collections_b6d038_4bdb89" />
+      <item itemvalue="Application.Launcher" />
       <item itemvalue="JUnit.TestJavaMiner.test_collections_3761b5_3639ab" />
-      <item itemvalue="JUnit.TestJavaMiner.test_fuse_74c02c_a4658a" />
       <item itemvalue="JUnit.TestJavaMiner" />
       <item itemvalue="JUnit.TestJavaMiner.test_fuse_cb3362_cfb295" />
+      <item itemvalue="JUnit.TestJavaMiner.test_collections_2d6bc8_506966" />
+      <item itemvalue="Maven.FixPatternMiner [assembly:assembly]" />
+      <item itemvalue="Maven.FixPatternMiner [package]" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Application.Launcher" />
+        <item itemvalue="JUnit.TestJavaMiner.test_collections_2d6bc8_506966" />
         <item itemvalue="JUnit.TestJavaMiner" />
         <item itemvalue="JUnit.TestJavaMiner.test_collections_3761b5_3639ab" />
         <item itemvalue="JUnit.TestJavaMiner.test_fuse_cb3362_cfb295" />
-        <item itemvalue="JUnit.TestJavaMiner.test_fuse_74c02c_a4658a" />
-        <item itemvalue="JUnit.TestJavaMiner.test_collections_b6d038_4bdb89" />
       </list>
     </recent_temporary>
   </component>
+  <component name="ServiceViewManager">
+    <option name="viewStates">
+      <list>
+        <serviceView>
+          <treeState>
+            <expand />
+            <select />
+          </treeState>
+        </serviceView>
+      </list>
+    </option>
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -609,362 +320,216 @@
     </task>
     <servers />
   </component>
-  <component name="TestHistory">
-    <history-entry file="TestJavaMiner_test_fuse_cb3362_cfb295 - 2020.04.11 at 20h 27m 52s.xml">
-      <configuration name="TestJavaMiner.test_fuse_cb3362_cfb295" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestJavaMiner_test_fuse_cb3362_cfb295 - 2020.04.11 at 20h 28m 11s.xml">
-      <configuration name="TestJavaMiner.test_fuse_cb3362_cfb295" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestJavaMiner - 2020.04.11 at 20h 34m 25s.xml">
-      <configuration name="TestJavaMiner" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestJavaMiner_test_collections_3761b5_3639ab - 2020.04.11 at 20h 42m 20s.xml">
-      <configuration name="TestJavaMiner.test_collections_3761b5_3639ab" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestJavaMiner_test_collections_3761b5_3639ab - 2020.04.11 at 20h 42m 37s.xml">
-      <configuration name="TestJavaMiner.test_collections_3761b5_3639ab" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestJavaMiner - 2020.04.11 at 20h 43m 01s.xml">
-      <configuration name="TestJavaMiner" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestJavaMiner - 2020.04.11 at 20h 44m 33s.xml">
-      <configuration name="TestJavaMiner" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestJavaMiner - 2020.04.11 at 20h 45m 49s.xml">
-      <configuration name="TestJavaMiner" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestJavaMiner - 2020.04.11 at 20h 47m 02s.xml">
-      <configuration name="TestJavaMiner" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestJavaMiner - 2020.04.11 at 20h 48m 51s.xml">
-      <configuration name="TestJavaMiner" configurationId="JUnit" />
-    </history-entry>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
-    <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49162862" visible="true" weight="0.31074482" />
-      <window_info id="Structure" order="1" sideWeight="0.5083714" side_tool="true" visible="true" weight="0.31074482" />
-      <window_info id="Image Layers" order="2" />
-      <window_info id="Designer" order="3" />
-      <window_info id="UI Designer" order="4" />
-      <window_info id="Capture Tool" order="5" />
-      <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.4993895" weight="0.32959184" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4920635" visible="true" weight="0.32959184" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4981685" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.71428573" weight="0.32959184" />
-      <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.50183153" side_tool="true" weight="0.4" />
-      <window_info anchor="bottom" id="Version Control" order="9" />
-      <window_info anchor="bottom" id="Messages" order="10" sideWeight="0.498779" weight="0.32959184" />
-      <window_info anchor="bottom" id="Log Analyzer" order="11" />
-      <window_info anchor="bottom" id="SOQL Query" order="12" />
-      <window_info anchor="bottom" id="Anonymous Apex" order="13" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Maven" order="4" weight="0.23260073" />
-      <window_info anchor="right" id="Theme Preview" order="5" />
-      <window_info anchor="right" id="Capture Analysis" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-    </layout>
+  <component name="WindowStateProjectService">
+    <state x="880" y="387" key="#Project_Structure" timestamp="1591606458799">
+      <screen x="0" y="0" width="2560" height="1440" />
+    </state>
+    <state x="880" y="387" key="#Project_Structure/0.0.2560.1440@0.0.2560.1440" timestamp="1591606458799" />
+    <state x="744" y="383" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1591607084798">
+      <screen x="0" y="0" width="2560" height="1440" />
+    </state>
+    <state x="744" y="383" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2560.1440@0.0.2560.1440" timestamp="1591607084798" />
+    <state width="2518" height="519" key="GridCell.Tab.0.bottom" timestamp="1591609026407">
+      <screen x="0" y="0" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.0.bottom/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026407" />
+    <state width="2518" height="519" key="GridCell.Tab.0.center" timestamp="1591609026406">
+      <screen x="0" y="0" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.0.center/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026406" />
+    <state width="2518" height="519" key="GridCell.Tab.0.left" timestamp="1591609026406">
+      <screen x="0" y="0" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.0.left/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026406" />
+    <state width="2518" height="519" key="GridCell.Tab.0.right" timestamp="1591609026407">
+      <screen x="0" y="0" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.0.right/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026407" />
+    <state width="2518" height="519" key="GridCell.Tab.1.bottom" timestamp="1591609026408">
+      <screen x="0" y="0" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.1.bottom/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026408" />
+    <state width="2518" height="519" key="GridCell.Tab.1.center" timestamp="1591609026408">
+      <screen x="0" y="0" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.1.center/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026408" />
+    <state width="2518" height="519" key="GridCell.Tab.1.left" timestamp="1591609026407">
+      <screen x="0" y="0" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.1.left/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026407" />
+    <state width="2518" height="519" key="GridCell.Tab.1.right" timestamp="1591609026408">
+      <screen x="0" y="0" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.1.right/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026408" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/abstractPatch.py</url>
-          <line>295</line>
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/main.py</url>
-          <line>33</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/main.py</url>
-          <line>10</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/main.py</url>
-          <line>40</line>
-          <option name="timeStamp" value="13" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/javaDS.py</url>
-          <line>20</line>
-          <option name="timeStamp" value="15" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/javaDS.py</url>
-          <line>69</line>
-          <option name="timeStamp" value="16" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/javaDS.py</url>
-          <line>76</line>
-          <option name="timeStamp" value="17" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/javaDS.py</url>
-          <line>23</line>
-          <option name="timeStamp" value="18" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/javaDS.py</url>
-          <line>60</line>
-          <option name="timeStamp" value="19" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/main.py</url>
-          <line>51</line>
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/main.py</url>
-          <line>49</line>
-          <option name="timeStamp" value="22" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/main.py</url>
-          <line>50</line>
-          <option name="timeStamp" value="23" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/python/javaDS.py</url>
-          <line>32</line>
-          <option name="timeStamp" value="26" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java</url>
           <line>49</line>
-          <properties />
           <option name="timeStamp" value="9" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java</url>
           <line>72</line>
-          <properties />
           <option name="timeStamp" value="25" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/io/TreeIoUtils.java</url>
           <line>652</line>
-          <properties />
           <option name="timeStamp" value="31" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestActionGenerator.java</url>
           <line>60</line>
-          <properties />
           <option name="timeStamp" value="32" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java</url>
           <line>164</line>
-          <properties />
           <option name="timeStamp" value="36" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java</url>
           <line>71</line>
-          <properties />
           <option name="timeStamp" value="37" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java</url>
           <line>88</line>
-          <properties />
           <option name="timeStamp" value="38" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java</url>
           <line>21</line>
-          <properties />
           <option name="timeStamp" value="39" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java</url>
           <line>109</line>
-          <properties />
           <option name="timeStamp" value="46" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>19</line>
-          <properties />
           <option name="timeStamp" value="49" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java</url>
           <line>69</line>
-          <properties />
           <option name="timeStamp" value="50" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java</url>
           <line>72</line>
-          <properties />
           <option name="timeStamp" value="51" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java</url>
           <line>89</line>
-          <properties />
           <option name="timeStamp" value="52" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java</url>
-          <line>81</line>
-          <properties />
-          <option name="timeStamp" value="56" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>29</line>
-          <properties />
           <option name="timeStamp" value="60" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>44</line>
-          <properties />
           <option name="timeStamp" value="61" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java</url>
-          <line>50</line>
-          <properties />
-          <option name="timeStamp" value="70" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java</url>
-          <line>108</line>
-          <properties />
-          <option name="timeStamp" value="80" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>109</line>
-          <properties />
           <option name="timeStamp" value="81" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java</url>
           <line>318</line>
-          <properties />
           <option name="timeStamp" value="84" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java</url>
-          <line>90</line>
-          <properties />
-          <option name="timeStamp" value="86" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java</url>
-          <line>88</line>
-          <properties />
-          <option name="timeStamp" value="87" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>301</line>
-          <properties />
           <option name="timeStamp" value="91" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/com/github/gumtreediff/gen/jdt/AbstractJdtTreeGenerator.java</url>
-          <line>67</line>
-          <properties />
-          <option name="timeStamp" value="92" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gen/jdt/exp/ExpJdtVisitor.java</url>
           <line>1134</line>
-          <properties />
           <option name="timeStamp" value="95" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gen/jdt/exp/ExpJdtVisitor.java</url>
           <line>1243</line>
-          <properties />
           <option name="timeStamp" value="96" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>337</line>
-          <properties />
           <option name="timeStamp" value="97" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>389</line>
-          <properties />
           <option name="timeStamp" value="99" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="100" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>450</line>
-          <properties />
           <option name="timeStamp" value="102" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>461</line>
-          <properties />
           <option name="timeStamp" value="103" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java</url>
-          <line>75</line>
-          <properties />
-          <option name="timeStamp" value="104" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>594</line>
-          <properties />
           <option name="timeStamp" value="105" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>619</line>
-          <properties />
           <option name="timeStamp" value="106" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>654</line>
-          <properties />
           <option name="timeStamp" value="109" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>746</line>
-          <properties />
           <option name="timeStamp" value="112" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
           <line>776</line>
-          <properties />
           <option name="timeStamp" value="113" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java</url>
+          <line>100</line>
+          <option name="timeStamp" value="116" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java</url>
+          <line>38</line>
+          <option name="timeStamp" value="117" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java</url>
+          <line>90</line>
+          <option name="timeStamp" value="118" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java</url>
+          <line>85</line>
+          <option name="timeStamp" value="119" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -1021,559 +586,6 @@
       </expression>
     </expressions>
   </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestActionIo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestGumtreeMatcher.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="577">
-          <caret line="237" column="21" selection-start-line="237" selection-start-column="21" selection-end-line="237" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="23" column="28" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-998">
-          <caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="29" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/python/abstractPatch.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="87">
-          <caret line="106" column="40" selection-start-line="106" selection-start-column="40" selection-end-line="106" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/python/data/datasets.csv">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/python/data/dataset.csv">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" selection-start-line="5" selection-end-line="11" selection-end-column="81" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/python/common/commons.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="180" column="24" selection-start-line="180" selection-start-column="24" selection-end-line="180" selection-end-column="24" />
-          <folding>
-            <element signature="e#1#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestInputCases.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="1244" column="20" selection-start-line="1237" selection-start-column="8" selection-end-line="1244" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/resource/config.yml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="60" column="81" selection-start-line="60" selection-start-column="81" selection-end-line="60" selection-end-column="81" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/config.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/GumTreeCComparer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="22" column="24" selection-start-line="22" selection-start-column="24" selection-end-line="22" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/gen/TreeGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="42" column="23" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="26" column="32" lean-forward="true" selection-start-line="26" selection-start-column="32" selection-end-line="26" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/eclipse/tycho/org.eclipse.jdt.core/3.12.2.v20161117-1814/org.eclipse.jdt.core-3.12.2.v20161117-1814-sources.jar!/org/eclipse/jdt/core/dom/ASTParser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="804" column="19" selection-start-line="804" selection-start-column="19" selection-end-line="804" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gen/jdt/exp/ExpJdtTreeGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="27" column="48" selection-start-line="27" selection-start-column="48" selection-end-line="27" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestIntroClass.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="321">
-          <caret line="30" column="7" selection-start-line="30" selection-start-column="7" selection-end-line="30" selection-end-column="69" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="160" column="76" selection-start-line="160" selection-start-column="59" selection-end-line="160" selection-end-column="76" />
-          <folding>
-            <element signature="e#16934#16935#0" expanded="true" />
-            <element signature="e#16976#16977#0" expanded="true" />
-            <element signature="e#17012#17013#0" expanded="true" />
-            <element signature="e#17044#17045#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/tree/TreeContext.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="75" column="17" selection-start-line="75" selection-start-column="17" selection-end-line="75" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/eclipse/tycho/org.eclipse.jdt.core/3.12.2.v20161117-1814/org.eclipse.jdt.core-3.12.2.v20161117-1814-sources.jar!/org/eclipse/jdt/core/dom/ASTNode.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="2703" column="22" selection-start-line="2703" selection-start-column="22" selection-end-line="2703" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/eclipse/tycho/org.eclipse.jdt.core/3.12.2.v20161117-1814/org.eclipse.jdt.core-3.12.2.v20161117-1814-sources.jar!/org/eclipse/jdt/core/dom/AnonymousClassDeclaration.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/actions/model/Move.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/actions/model/Delete.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/actions/model/Insert.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/actions/model/Update.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/actions/model/Addition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="24" column="22" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/eclipse/tycho/org.eclipse.jdt.core/3.12.2.v20161117-1814/org.eclipse.jdt.core-3.12.2.v20161117-1814-sources.jar!/org/eclipse/jdt/core/dom/TryStatement.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="243" selection-start-line="243" selection-end-line="243" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/eclipse/tycho/org.eclipse.jdt.core/3.12.2.v20161117-1814/org.eclipse.jdt.core-3.12.2.v20161117-1814-sources.jar!/org/eclipse/jdt/core/dom/IfStatement.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="186" selection-start-line="186" selection-end-line="186" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/com/github/gumtreediff/gen/jdt/AbstractJdtVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="58" column="41" selection-start-line="58" selection-start-column="23" selection-end-line="58" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/com/github/gumtreediff/gen/jdt/cd/CdJdtVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="753">
-          <caret line="658" selection-start-line="658" selection-end-line="658" />
-          <folding>
-            <element signature="e#0#17109#0" expanded="true" />
-            <element signature="imports" expanded="true" />
-            <element signature="e#1382#1409#0" expanded="true" />
-            <element signature="e#1757#1758#0" expanded="true" />
-            <element signature="e#1779#1780#0" expanded="true" />
-            <element signature="e#1786#1816#0" expanded="true" />
-            <element signature="e#3361#3391#0" expanded="true" />
-            <element signature="e#4593#4594#0" expanded="true" />
-            <element signature="e#4618#4619#0" expanded="true" />
-            <element signature="e#4625#4655#0" expanded="true" />
-            <element signature="e#4952#4953#0" expanded="true" />
-            <element signature="e#4977#4978#0" expanded="true" />
-            <element signature="e#5340#5341#0" expanded="true" />
-            <element signature="e#5365#5366#0" expanded="true" />
-            <element signature="e#5544#5545#0" expanded="true" />
-            <element signature="e#5569#5570#0" expanded="true" />
-            <element signature="e#5926#5927#0" expanded="true" />
-            <element signature="e#5951#5952#0" expanded="true" />
-            <element signature="e#6325#6326#0" expanded="true" />
-            <element signature="e#6350#6351#0" expanded="true" />
-            <element signature="e#6357#6387#0" expanded="true" />
-            <element signature="e#7410#7411#0" expanded="true" />
-            <element signature="e#7435#7436#0" expanded="true" />
-            <element signature="e#7865#7866#0" expanded="true" />
-            <element signature="e#7890#7891#0" expanded="true" />
-            <element signature="e#7897#7927#0" expanded="true" />
-            <element signature="e#8179#8180#0" expanded="true" />
-            <element signature="e#8204#8205#0" expanded="true" />
-            <element signature="e#8211#8241#0" expanded="true" />
-            <element signature="e#8618#8619#0" expanded="true" />
-            <element signature="e#8643#8644#0" expanded="true" />
-            <element signature="e#9012#9013#0" expanded="true" />
-            <element signature="e#9037#9038#0" expanded="true" />
-            <element signature="e#9283#9284#0" expanded="true" />
-            <element signature="e#9308#9309#0" expanded="true" />
-            <element signature="e#10741#10742#0" expanded="true" />
-            <element signature="e#10766#10767#0" expanded="true" />
-            <element signature="e#11003#11004#0" expanded="true" />
-            <element signature="e#11028#11029#0" expanded="true" />
-            <element signature="e#11342#11343#0" expanded="true" />
-            <element signature="e#11367#11368#0" expanded="true" />
-            <element signature="e#11576#11577#0" expanded="true" />
-            <element signature="e#11601#11602#0" expanded="true" />
-            <element signature="e#11844#11845#0" expanded="true" />
-            <element signature="e#11869#11870#0" expanded="true" />
-            <element signature="e#12073#12074#0" expanded="true" />
-            <element signature="e#12098#12099#0" expanded="true" />
-            <element signature="e#12280#12281#0" expanded="true" />
-            <element signature="e#12305#12306#0" expanded="true" />
-            <element signature="e#12568#12569#0" expanded="true" />
-            <element signature="e#12593#12594#0" expanded="true" />
-            <element signature="e#12814#12815#0" expanded="true" />
-            <element signature="e#12839#12840#0" expanded="true" />
-            <element signature="e#13153#13154#0" expanded="true" />
-            <element signature="e#13178#13179#0" expanded="true" />
-            <element signature="e#13849#13850#0" expanded="true" />
-            <element signature="e#13874#13875#0" expanded="true" />
-            <element signature="e#14134#14135#0" expanded="true" />
-            <element signature="e#14159#14160#0" expanded="true" />
-            <element signature="e#14408#14409#0" expanded="true" />
-            <element signature="e#14433#14434#0" expanded="true" />
-            <element signature="e#14652#14653#0" expanded="true" />
-            <element signature="e#14677#14678#0" expanded="true" />
-            <element signature="e#14923#14924#0" expanded="true" />
-            <element signature="e#14948#14949#0" expanded="true" />
-            <element signature="e#14955#14985#0" expanded="true" />
-            <element signature="e#15234#15235#0" expanded="true" />
-            <element signature="e#15259#15260#0" expanded="true" />
-            <element signature="e#15483#15484#0" expanded="true" />
-            <element signature="e#15508#15509#0" expanded="true" />
-            <element signature="e#15719#15720#0" expanded="true" />
-            <element signature="e#15744#15745#0" expanded="true" />
-            <element signature="e#15751#15781#0" expanded="true" />
-            <element signature="e#16344#16345#0" expanded="true" />
-            <element signature="e#16369#16370#0" expanded="true" />
-            <element signature="e#16844#16845#0" expanded="true" />
-            <element signature="e#16869#16870#0" expanded="true" />
-            <element signature="e#17079#17080#0" expanded="true" />
-            <element signature="e#17104#17105#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/python/main.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="742">
-          <caret line="70" column="29" selection-start-line="70" selection-start-column="29" selection-end-line="70" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/utils/ASTNodeMap.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="365">
-          <caret line="64" column="36" selection-start-line="64" selection-start-column="21" selection-end-line="64" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/eclipse/tycho/org.eclipse.jdt.core/3.12.2.v20161117-1814/org.eclipse.jdt.core-3.12.2.v20161117-1814-sources.jar!/org/eclipse/jdt/core/dom/SwitchCase.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="144" selection-start-line="144" selection-end-line="144" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gen/jdt/exp/ExpJdtVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
-          <caret line="1227" column="9" selection-start-line="1227" selection-start-column="9" selection-end-line="1227" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="72" selection-start-line="72" selection-end-line="72" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/com/github/gumtreediff/gen/jdt/AbstractJdtTreeGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="67" selection-start-line="67" selection-end-line="67" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/src.zip!/java/lang/Comparable.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="509">
-          <caret line="135" column="15" selection-start-line="135" selection-start-column="15" selection-end-line="135" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/utils/ListSorter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="11" column="11" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="56" column="26" selection-start-line="56" selection-start-column="12" selection-end-line="56" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/actions/ActionGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="78" column="24" selection-start-line="78" selection-start-column="24" selection-end-line="78" selection-end-column="24" />
-          <folding>
-            <element signature="e#2460#2461#0" expanded="true" />
-            <element signature="e#2490#2491#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="117">
-          <caret line="23" column="24" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/src.zip!/java/lang/Integer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="343">
-          <caret line="1214" column="15" selection-start-line="1214" selection-start-column="15" selection-end-line="1214" selection-end-column="15" />
-          <folding>
-            <element signature="e#46394#46395#0" expanded="true" />
-            <element signature="e#46458#46459#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/actions/model/Action.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="61" column="40" lean-forward="true" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalActionSet.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1273">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="212">
-          <caret line="91" column="12" selection-start-line="91" selection-start-column="12" selection-end-line="96" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="111" selection-start-line="111" selection-end-line="111" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="592" column="27" selection-start-line="592" selection-start-column="27" selection-end-line="592" selection-end-column="27" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>Python 3.7 (fixminerEnv)</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38275862" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>fixminer_source</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38275862" />
-                <option value="0.6" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
   <component name="mavenExecuteGoalHistory">
     <option value="" />
   </component>
diff --git a/README.md b/README.md
index 0ffe7ec..22bf4c0 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,10 @@ In order to launch FixMiner, execute [fixminer.sh](python/fixminer.sh)
 
 * Update [config file](src/main/resources/config.yml) with corresponding user paths.
 
+* Install the project with maven from root. (usage [pom.xml](pom.xml))
+  ```powershell
+  mvn clean install
+  ```
 * Active the conda environment from shell
   ```powershell
   source activate fixminerEnv
@@ -81,6 +85,9 @@ In order to launch FixMiner, execute [fixminer.sh](python/fixminer.sh)
     bash fixminer.sh [JOB] [CONFIG_FILE]
      e.g. bash fixminer.sh  dataset4c /Users/projects/release/fixminer_source/src/main/resources/config.yml
 
+#### Redis Commands
+hlen diffEntry
+To see number of patches / diff entries computed rich edit
     
 #### Job Types  
 
diff --git a/fixminer.sh b/fixminer.sh
new file mode 100644
index 0000000..6354738
--- /dev/null
+++ b/fixminer.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+
+source activate fixminerEnv
+
+PYTHONPATH=$(pwd) python -u python/main.py -root $(pwd)/python -job $2 -prop $1
diff --git a/python/common/__pycache__/__init__.cpython-37.pyc b/python/common/__pycache__/__init__.cpython-37.pyc
index 46bb90d..5496b70 100644
Binary files a/python/common/__pycache__/__init__.cpython-37.pyc and b/python/common/__pycache__/__init__.cpython-37.pyc differ
diff --git a/python/javaDS.py b/python/javaDS.py
index 444e93b..10a6913 100644
--- a/python/javaDS.py
+++ b/python/javaDS.py
@@ -17,6 +17,8 @@ def createDS():
     pjList = PROJECT_LIST.split(',')
     if not os.path.exists(DATASET_PATH):
         os.mkdir(DATASET_PATH)
+    if not os.path.exists(COMMIT_DFS):
+        os.mkdir(COMMIT_DFS)
 
     subjects = pd.read_csv(join(ROOT,'data', 'dataset.csv'))
 
diff --git a/richedit/src/main/java/edu/lu/uni/serval/Launcher.java b/richedit/src/main/java/edu/lu/uni/serval/Launcher.java
index 823bf77..d3da760 100755
--- a/richedit/src/main/java/edu/lu/uni/serval/Launcher.java
+++ b/richedit/src/main/java/edu/lu/uni/serval/Launcher.java
@@ -135,7 +135,8 @@ public class Launcher {
 
             }
         } catch (Exception e) {
-            log.error(e.getMessage());
+//            log.error(e.getMessage());
+            e.printStackTrace();
 //            e.printStackTrace();
 
         }
diff --git a/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java b/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java
index c7d4ada..74e44ca 100755
--- a/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java
+++ b/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java
@@ -29,37 +29,36 @@ public class EnhancedASTDiff {
 	public static void main(String inputPath, String portInner, String dbDir, String chunkName,String srcMLPath,String parameter,String hunkLimit,String[] projectList,String patchSize,String projectType) throws Exception {
 
 
-		String parameters = String.format("\nInput path %s",inputPath);
+		String parameters = String.format("\nInput path %s", inputPath);
 		log.info(parameters);
 
 		CallShell cs = new CallShell();
-		String cmd = "bash "+dbDir + "/" + "startServer.sh" +" %s %s %s";
+		String cmd = "bash " + dbDir + "/" + "startServer.sh" + " %s %s %s";
 
-		cmd = String.format(cmd, dbDir,chunkName,Integer.valueOf(portInner));
+		cmd = String.format(cmd, dbDir, chunkName, Integer.valueOf(portInner));
 
 		cs.runShell(cmd, portInner);
 
-		JedisPool innerPool = new JedisPool(PoolBuilder.getPoolConfig(), "127.0.0.1",Integer.valueOf(portInner),20000000);
+		JedisPool innerPool = new JedisPool(PoolBuilder.getPoolConfig(), "127.0.0.1", Integer.valueOf(portInner), 20000000);
 
 		boolean isJava = false;
-		if (projectType.equals("java")){
-			isJava =true;
+		if (projectType.equals("java")) {
+			isJava = true;
 		}
 		File folder = new File(inputPath);
 		File[] listOfFiles = folder.listFiles();
-		if(listOfFiles == null){
+		if (listOfFiles == null) {
 			throw new Exception("No projects found, please verify the projects in the input path");
 		}
 		Stream<File> stream = Arrays.stream(listOfFiles);
 		List<File> folders;
-		if (projectList.length == 1 && projectList[0].equals("")){
+		if (projectList.length == 1 && projectList[0].equals("")) {
 			folders = stream
 					.filter(x -> !x.getName().startsWith("."))
 					.filter(x -> !x.getName().startsWith("cocci"))
 					.filter(x -> !x.getName().endsWith(".index"))
 					.collect(Collectors.toList());
-		}
-		else {
+		} else {
 			List<Predicate<File>> allPredicates = new ArrayList<Predicate<File>>();
 			for (String s : projectList) {
 				Predicate<File> predicate = x -> x.getName().endsWith(s);
@@ -69,20 +68,16 @@ public class EnhancedASTDiff {
 					.filter(x -> !x.getName().startsWith("."))
 					.filter(x -> !x.getName().startsWith("cocci"))
 					.filter(x -> !x.getName().endsWith(".index"))
-					.filter(allPredicates.stream().reduce(x->false, Predicate::or))
+					.filter(allPredicates.stream().reduce(x -> false, Predicate::or))
 					.collect(Collectors.toList());
 		}
 
 
-
-
-
-
 		String project = folder.getName();
 		List<MessageFile> allMessageFiles = new ArrayList<>();
-        for (File target : folders) {
+		for (File target : folders) {
 
-			List<MessageFile> msgFiles = getMessageFiles(target.toString() + "/",project,patchSize,isJava); //"/Users/anilkoyuncu/bugStudy/code/python/GumTreeInput/Apache/CAMEL/"
+			List<MessageFile> msgFiles = getMessageFiles(target.toString() + "/", project, patchSize, isJava); //"/Users/anilkoyuncu/bugStudy/code/python/GumTreeInput/Apache/CAMEL/"
 
 //			msgFiles = msgFiles.subList(0,3000);
 			if (msgFiles == null)
@@ -104,16 +99,25 @@ public class EnhancedASTDiff {
 			log.info("{} files to process ...", allMessageFiles.size());
 		}
 		boolean finalIsJava = isJava;
-		ProgressBar.wrap(allMessageFiles.stream().
-				parallel(),"Task").
+//		ProgressBar.wrap(allMessageFiles.stream().
+//				parallel(),"Task").
+//				forEach(m ->
+//						{
+//							EDiffHunkParser parser =  new EDiffHunkParser();
+//							parser.parseFixPatterns(m.getPrevFile(),m.getRevFile(), m.getDiffEntryFile(),project,innerPool,srcMLPath,hunkLimit, finalIsJava);
+//						}
+//				);
+//
+//        }
+		allMessageFiles.stream().
+				parallel().
 				forEach(m ->
 						{
-							EDiffHunkParser parser =  new EDiffHunkParser();
-							parser.parseFixPatterns(m.getPrevFile(),m.getRevFile(), m.getDiffEntryFile(),project,innerPool,srcMLPath,hunkLimit, finalIsJava);
+							EDiffHunkParser parser = new EDiffHunkParser();
+							parser.parseFixPatterns(m.getPrevFile(), m.getRevFile(), m.getDiffEntryFile(), project, innerPool, srcMLPath, hunkLimit, finalIsJava);
 						}
 				);
-
-        }
+	}
 
 	
 
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 7131ddc..ed2c912 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -7,12 +7,12 @@ coccinelle:
 
 dataset:
 #    home:   /Users/anilkoyuncu/projects/fixminer/fixminer-core/python/data/gumInputLinux
-    inputPath : /Users/anilkoyuncu/projects/test/fixminer-data/patches
-    repo:   /Users/anilkoyuncu/projects/test/fixminer-data/datasets
+    inputPath : /Users/anil.koyuncu/projects/release/fixminer-data/patches
+    repo:   /Users/anil.koyuncu/projects/release/fixminer-data/datasets
 
 fixminer:
     projectType : java
-    datapath: /Users/anilkoyuncu/projects/test/fixminer-data/
+    datapath: /Users/anil.koyuncu/projects/release/fixminer-data/
 
 
     pjName : patches
@@ -22,7 +22,7 @@ fixminer:
     hunkLimit : 2
     patchSize : 50
 
-    projectList : spring-shell,fuse,metadata,commons-codec,commons-collections,commons-compress,commons-configuration,commons-crypto,commons-csv
-    inputPath : /Users/anilkoyuncu/projects/test/fixminer-data/patches
-    redisPath : /Users/anilkoyuncu/projects/release/test/fixminer_source/python/data/redis
+    projectList : fuse
+    inputPath : /Users/anil.koyuncu/projects/release/fixminer-data/patches
+    redisPath : /Users/anil.koyuncu/projects/release/fixminer_source/python/data/redis
     srcMLPath :  /usr/local/bin/srcml