From a8c8b19585bbd73aadcb1107537b7a660fb91681 Mon Sep 17 00:00:00 2001
From: ANIL KOYUNCU <anil.koyuncu@mp0360.uni.lux>
Date: Mon, 17 Feb 2020 17:48:45 +0100
Subject: [PATCH] cleanup

---
 .idea/compiler.xml                            |   9 +
 .idea/encodings.xml                           |   9 +-
 .idea/misc.xml                                |   3 +-
 .idea/vcs.xml                                 |   1 +
 .idea/workspace.xml                           | 860 +++++-------------
 pom.xml                                       |  71 +-
 .../edu/lu/uni/serval/fixminer/Launcher.java  |  10 +-
 .../fixminer/akka/compare/CompareTrees.java   | 390 ++++----
 .../akka/ediff/DefaultKryoContext.java        |  83 --
 .../fixminer/akka/ediff/HunkParserTest.java   |   8 +-
 .../fixminer/akka/ediff/TestIntroClass.java   |   2 -
 .../serval/fixminer/jobs/EnhancedASTDiff.java |   2 +-
 .../edu/lu/uni/serval/utils/EDiffHelper.java  | 195 ++--
 src/main/resource/app.properties              |   8 +-
 14 files changed, 534 insertions(+), 1117 deletions(-)
 delete mode 100644 src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/DefaultKryoContext.java

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 13d317f..de3de08 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,7 +7,16 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="FixPatternMiner" />
+        <module name="gen.jdt" />
+        <module name="gen.srcml" />
+        <module name="client.diff" />
+        <module name="fixminer_source" />
+        <module name="client" />
+        <module name="core" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simple-utils" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index e79da7e..fa513c6 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" 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/src/main/java" 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/src/main/java" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4b661a5..0918945 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,10 +5,11 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/../gumtree/pom.xml" />
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..14ca6ef 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../gumtree" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c15c296..f597035 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,161 +4,24 @@
     <list default="true" id="1c20f95f-4c0f-46a8-9b1c-3c643f73b30a" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_mpkorstanje_simmetrics_core_3_0_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_11_0_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_18_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_nanohttpd_nanohttpd_2_1_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_nanohttpd_nanohttpd_webserver_2_1_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_rabbitmq_amqp_client_4_0_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sparkjava_spark_core_2_6_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_11_2_4_11.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_typesafe_config_1_3_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_3_8_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_11.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_trove4j_trove4j_3_0_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sourceforge_jexcelapi_jxl_2_6_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_4_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_text_1_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_birt_runtime_org_eclipse_core_resources_3_10_0_v20150423_0755.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_core_contenttype_3_4_200_v20140207_1251.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_core_jobs_3_6_0_v20140424_0053.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_core_runtime_3_10_0_v20140318_2214.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_equinox_app_1_3_200_v20130910_1609.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_equinox_common_3_6_200_v20130402_1505.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_equinox_preferences_3_5_200_v20140224_1527.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_equinox_registry_3_5_400_v20140428_1507.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_server_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_servlet_9_4_4_v20170414.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_osgi_3_10_0_v20140606_1445.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_tycho_org_eclipse_jdt_core_3_12_2_v20161117_1814.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_16_1_GA.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javatuples_javatuples_1_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_9_RC1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_rendersnake_rendersnake_1_8.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_scala_lang_modules_scala_java8_compat_2_11_0_7_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_scala_lang_scala_library_2_11_8.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_13.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_8_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FixPatternMiner.iml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/TestTreeLoader.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/DocumentSimilarity.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/AkkaTreeParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/AkkaTreeParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/Compare.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/RunnableCompare.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/TreeActor.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/TreeMessage.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/TreeWorker.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffHunkParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffHunkParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffMessage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffMessage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/AkkaTreeLoader.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/CalculatePairs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/DefaultKryoContext.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/HunkParserTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/HunkParserTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/TestIntroClass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/TestIntroClass.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/ImportPairs2DB.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/MultiThreadTreeLoaderCluster.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/MultiThreadTreeLoaderCluster3.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/PatternExtractor.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/StoreEDiffInCache.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/TreeLoaderClusterL1.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/CallShell.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/CallShell.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/Checker.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/ClusterToPattern.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/ClusterToPattern.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/EDiffHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/EDiffHelper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resource/app.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resource/app.properties" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/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" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/DefaultKryoContext.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="452">
-              <caret line="36" selection-start-line="36" selection-end-line="36" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/BaseMessage.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="128">
-              <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="405">
-              <caret line="27" selection-start-line="27" selection-end-line="31" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -178,25 +41,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/akka/ediff/KryoContext.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/KryoClassRegistrator.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/CallShell.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffMessage.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffHunkParser.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/EDiffHelper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/AkkaTreeParser.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/DefaultKryoContext.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/ClusterToPattern.java" />
-        <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
   <component name="MavenImportPreferences">
     <option name="importingSettings">
       <MavenImportingSettings>
@@ -204,61 +48,18 @@
       </MavenImportingSettings>
     </option>
   </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="FixPatternMiner" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="FixPatternMiner" 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="535" />
-    <option name="height" value="1440" />
-  </component>
+  <component name="ProjectId" id="1XwN74yK7nfe6Qw7o3T7vMcUoNV" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <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="FixPatternMiner" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567787706640" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.side.proportion" value="0.0" />
   </component>
   <component name="RunManager" selected="Application.Launcher">
     <configuration name="CompareTrees" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
@@ -277,8 +78,8 @@
     </configuration>
     <configuration name="Launcher" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.fixminer.Launcher" />
-      <module name="FixPatternMiner" />
-      <option name="PROGRAM_PARAMETERS" value="$PROJECT_DIR$/../fixminer-core/python/data/app.properties L2" />
+      <module name="fixminer_source" />
+      <option name="PROGRAM_PARAMETERS" value="$PROJECT_DIR$/../fixminer-core/python/data/app.properties L2 RICHEDITSCRIPT" />
       <extension name="coverage">
         <pattern>
           <option name="PATTERN" value="edu.lu.uni.serval.fixminer.*" />
@@ -289,17 +90,118 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="TestRealCases" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="fixminer_source" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="edu.lu.uni.serval.fixminer.akka.ediff.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="edu.lu.uni.serval.fixminer.akka.ediff" />
+      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.fixminer.akka.ediff.TestRealCases" />
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="TestRealCases.test_31_B_136044_136045" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="fixminer_source" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="edu.lu.uni.serval.fixminer.akka.ediff.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="edu.lu.uni.serval.fixminer.akka.ediff" />
+      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.fixminer.akka.ediff.TestRealCases" />
+      <option name="METHOD_NAME" value="test_31_B_136044_136045" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="gen.srcml [install]" type="MavenRunConfiguration" factoryName="Maven">
+      <MavenSettings>
+        <option name="myGeneralSettings" />
+        <option name="myRunnerSettings" />
+        <option name="myRunnerParameters">
+          <MavenRunnerParameters>
+            <option name="profiles">
+              <set />
+            </option>
+            <option name="goals">
+              <list>
+                <option value="install" />
+                <option value="-DskipTests" />
+              </list>
+            </option>
+            <option name="pomFileName" value="pom.xml" />
+            <option name="profilesMap">
+              <map />
+            </option>
+            <option name="resolveToWorkspace" value="false" />
+            <option name="workingDirPath" value="$PROJECT_DIR$/../gumtree/gen.srcml" />
+          </MavenRunnerParameters>
+        </option>
+      </MavenSettings>
+      <method v="2" />
+    </configuration>
+    <configuration name="gumtree [install]" type="MavenRunConfiguration" factoryName="Maven">
+      <MavenSettings>
+        <option name="myGeneralSettings" />
+        <option name="myRunnerSettings" />
+        <option name="myRunnerParameters">
+          <MavenRunnerParameters>
+            <option name="profiles">
+              <set />
+            </option>
+            <option name="goals">
+              <list>
+                <option value="install" />
+                <option value="-DskipTests" />
+              </list>
+            </option>
+            <option name="pomFileName" value="pom.xml" />
+            <option name="profilesMap">
+              <map />
+            </option>
+            <option name="resolveToWorkspace" value="false" />
+            <option name="workingDirPath" value="$PROJECT_DIR$/../gumtree" />
+          </MavenRunnerParameters>
+        </option>
+      </MavenSettings>
+      <method v="2" />
+    </configuration>
     <list>
       <item itemvalue="Application.Launcher" />
       <item itemvalue="Application.CompareTrees" />
+      <item itemvalue="Maven.gen.srcml [install]" />
+      <item itemvalue="Maven.gumtree [install]" />
+      <item itemvalue="JUnit.TestRealCases" />
+      <item itemvalue="JUnit.TestRealCases.test_31_B_136044_136045" />
     </list>
     <recent_temporary>
       <list>
         <item itemvalue="Application.Launcher" />
+        <item itemvalue="JUnit.TestRealCases" />
+        <item itemvalue="JUnit.TestRealCases.test_31_B_136044_136045" />
         <item itemvalue="Application.CompareTrees" />
       </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>
@@ -313,37 +215,6 @@
     </task>
     <servers />
   </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="0" width="2560" height="1440" extended-state="0" />
-    <layout>
-      <window_info id="Image Layers" />
-      <window_info id="Designer" />
-      <window_info id="UI Designer" />
-      <window_info id="Capture Tool" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24980143" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Version Control" weight="0.329927" />
-      <window_info anchor="bottom" id="Terminal" weight="0.329927" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" weight="0.329927" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.329927" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.329927" />
-      <window_info anchor="bottom" id="Debug" order="3" 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="right" id="Palette" />
-      <window_info anchor="right" id="Theme Preview" />
-      <window_info anchor="right" id="Maven" visible="true" weight="0.32962668" />
-      <window_info anchor="right" id="Capture Analysis" />
-      <window_info anchor="right" id="Palette&#9;" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" 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" />
-    </layout>
-  </component>
   <component name="Vcs.Log.History.Properties">
     <option name="COLUMN_ORDER">
       <list>
@@ -354,111 +225,176 @@
       </list>
     </option>
   </component>
+  <component name="WindowStateProjectService">
+    <state x="1166" y="-948" key="#Launcher" timestamp="1581954807122">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state x="1166" y="-948" key="#Launcher/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581954807122" />
+    <state x="100" y="-1340" width="2360" height="1240" key="#com.intellij.execution.junit2.states.ComparisonFailureState$DiffDialog" timestamp="1581954640313">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state x="100" y="-1340" width="2360" height="1240" key="#com.intellij.execution.junit2.states.ComparisonFailureState$DiffDialog/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581954640313" />
+    <state x="854" y="-1129" key="#gen.srcml_[install]" timestamp="1581953518814">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state x="854" y="-1129" key="#gen.srcml_[install]/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581953518814" />
+    <state x="854" y="-1129" key="#gumtree_[install]" timestamp="1581953568803">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state x="854" y="-1129" key="#gumtree_[install]/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581953568803" />
+    <state width="2518" height="423" key="GridCell.Tab.0.bottom" timestamp="1581957957101">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="423" key="GridCell.Tab.0.bottom/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581957957101" />
+    <state width="2518" height="423" key="GridCell.Tab.0.center" timestamp="1581957957100">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="423" key="GridCell.Tab.0.center/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581957957100" />
+    <state width="2518" height="423" key="GridCell.Tab.0.left" timestamp="1581957957098">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="423" key="GridCell.Tab.0.left/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581957957098" />
+    <state width="2518" height="423" key="GridCell.Tab.0.right" timestamp="1581957957100">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="423" key="GridCell.Tab.0.right/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581957957100" />
+    <state width="2518" height="519" key="GridCell.Tab.1.bottom" timestamp="1581955054072">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.1.bottom/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581955054072" />
+    <state width="2518" height="519" key="GridCell.Tab.1.center" timestamp="1581955054071">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.1.center/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581955054071" />
+    <state width="2518" height="519" key="GridCell.Tab.1.left" timestamp="1581955054070">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.1.left/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581955054070" />
+    <state width="2518" height="519" key="GridCell.Tab.1.right" timestamp="1581955054071">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state width="2518" height="519" key="GridCell.Tab.1.right/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581955054071" />
+    <state x="947" y="-1016" key="NewModule_or_Project.wizard" timestamp="1581953235296">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state x="947" y="-1016" key="NewModule_or_Project.wizard/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581953235296" />
+    <state x="768" y="-1137" key="SettingsEditor" timestamp="1581953241154">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state x="768" y="-1137" key="SettingsEditor/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581953241154" />
+    <state width="1280" height="720" key="XDebugger.FullValuePopup" timestamp="1581954433376">
+      <screen x="0" y="-1440" width="2560" height="1440" />
+    </state>
+    <state width="1280" height="720" key="XDebugger.FullValuePopup/0.-1440.2560.1440/0.0.1792.1120@0.-1440.2560.1440" timestamp="1581954433376" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java</url>
           <line>29</line>
-          <properties />
           <option name="timeStamp" value="1" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java</url>
           <line>50</line>
-          <properties />
           <option name="timeStamp" value="2" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java</url>
-          <line>62</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java</url>
           <line>74</line>
-          <properties />
           <option name="timeStamp" value="5" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffHunkParser.java</url>
           <line>56</line>
-          <properties />
           <option name="timeStamp" value="6" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java</url>
-          <line>61</line>
-          <properties />
-          <option name="timeStamp" value="9" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java</url>
           <line>95</line>
-          <properties />
           <option name="timeStamp" value="11" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java</url>
           <line>56</line>
-          <properties />
           <option name="timeStamp" value="12" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java</url>
           <line>81</line>
-          <properties />
           <option name="timeStamp" value="14" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/EDiffHelper.java</url>
-          <line>276</line>
-          <properties />
+          <line>265</line>
           <option name="timeStamp" value="15" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java</url>
           <line>107</line>
-          <properties />
           <option name="timeStamp" value="17" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/AkkaTreeParser.java</url>
           <line>44</line>
-          <properties />
           <option name="timeStamp" value="18" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffHunkParser.java</url>
           <line>51</line>
-          <properties />
           <option name="timeStamp" value="24" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java</url>
           <line>98</line>
-          <properties />
           <option name="timeStamp" value="27" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java</url>
           <line>64</line>
-          <properties />
           <option name="timeStamp" value="28" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/ClusterToPattern.java</url>
           <line>28</line>
-          <properties />
           <option name="timeStamp" value="29" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java</url>
           <line>95</line>
-          <properties />
           <option name="timeStamp" value="31" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/TestRealCases.java</url>
+          <line>387</line>
+          <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>133</line>
+          <option name="timeStamp" value="35" />
+        </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>456</line>
+          <option name="timeStamp" value="36" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java</url>
+          <line>81</line>
+          <option name="timeStamp" value="37" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java</url>
+          <line>40</line>
+          <option name="timeStamp" value="38" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java</url>
+          <line>42</line>
+          <option name="timeStamp" value="39" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -514,384 +450,4 @@ String key = split[0] + &quot;/&quot;+split[1]+&quot;/&quot; + dist2load;</expre
       </expression>
     </expressions>
   </component>
-  <component name="editorHistoryManager">
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/src.zip!/java/io/File.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="274" column="11" selection-start-line="274" selection-start-column="11" selection-end-line="274" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/src.zip!/java/util/Map.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="295" column="9" selection-start-line="295" selection-start-column="9" selection-end-line="295" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/src.zip!/java/util/zip/Deflater.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1275">
-          <caret line="108" column="28" selection-start-line="108" selection-start-column="28" selection-end-line="108" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/src.zip!/java/util/zip/GZIPOutputStream.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="628">
-          <caret line="107" column="11" selection-start-line="107" selection-start-column="11" selection-end-line="107" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/esotericsoftware/kryo/4.0.2/kryo-4.0.2.jar!/com/esotericsoftware/kryo/Kryo.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="1394" column="63" selection-start-line="1394" selection-start-column="43" selection-end-line="1394" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.5.1/objenesis-2.5.1.jar!/org/objenesis/strategy/StdInstantiatorStrategy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="20" column="11" selection-start-line="20" selection-start-column="11" selection-end-line="20" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.5.1/objenesis-2.5.1.jar!/org/objenesis/strategy/SerializingInstantiatorStrategy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="18" column="44" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffParser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/AkkaTreeLoader.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1455">
-          <caret line="116" column="8" selection-start-line="116" selection-start-column="8" selection-end-line="116" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/TreeActor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/TreeMessage.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/TreeWorker.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/Compare.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-196">
-          <caret line="32" column="13" lean-forward="true" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/RunnableCompare.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/MultiThreadTreeLoaderCluster.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3180">
-          <caret line="235" column="21" selection-start-line="235" selection-start-column="12" selection-end-line="235" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/MultiThreadTreeLoaderCluster3.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6405">
-          <caret line="448" column="41" selection-start-line="448" selection-start-column="32" selection-end-line="448" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/ImportPairs2DB.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-182">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/StoreEDiffInCache.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1247">
-          <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$/src/main/java/edu/lu/uni/serval/fixminer/jobs/TreeLoaderClusterL1.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <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$/src/main/java/edu/lu/uni/serval/fixminer/jobs/CalculatePairs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/PatternExtractor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4422">
-          <caret line="24" column="20" lean-forward="true" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/ParserInterface.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/RunnableParser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="34" selection-start-line="34" selection-end-line="34" />
-          <folding>
-            <element signature="e#848#849#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/Parser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/PoolBuilder.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="10" column="34" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
-          <folding>
-            <element signature="e#233#234#0" expanded="true" />
-            <element signature="e#266#267#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/AkkaTreeParser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="15" column="38" lean-forward="true" selection-start-line="15" selection-start-column="38" selection-end-line="15" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="37" lean-forward="true" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffActor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-167">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffHunkParser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="137">
-          <caret line="24" column="16" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffMessage.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/EDiffWorker.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-317">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/HierarchicalActionSet.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1322">
-          <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$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/HierarchicalRegrouper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/KryoClassRegistrator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="1" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/KryoContext.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/MessageFile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="435">
-          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/DocumentSimilarity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7890">
-          <caret line="596" column="12" selection-start-line="596" selection-start-column="12" selection-end-line="596" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/DefaultKryoContext.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="452">
-          <caret line="36" selection-start-line="36" selection-end-line="36" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="389">
-          <caret line="44" column="57" lean-forward="true" selection-start-line="44" selection-start-column="57" selection-end-line="44" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/akka/BaseMessage.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/TestTreeLoader.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2649">
-          <caret line="192" column="41" lean-forward="true" selection-start-line="192" selection-start-column="41" selection-end-line="192" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/CallShell.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="328">
-          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/Checker.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="553">
-          <caret line="48" column="31" selection-start-line="48" selection-start-column="31" selection-end-line="48" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/edu/lu/uni/serval/FixPatternMiner/AppTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="38" lean-forward="true" selection-start-line="38" selection-end-line="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/EDiffHelper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4035">
-          <caret line="286" column="9" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/ClusterToPattern.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" selection-start-line="8" selection-end-line="8" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/utils/ASTNodeMap.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="27" selection-start-line="27" selection-end-line="31" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ebaa43d..6a5c552 100755
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<akka.version>2.4.11</akka.version>
+		<akka.version>2.4.17</akka.version>
 		<logback.version>1.1.2</logback.version>
 		<slf4j-api.version>1.7.7</slf4j-api.version>
 	</properties>
@@ -25,12 +25,6 @@
 		    <version>1.2</version>
 		</dependency>
 				
-		<!--<dependency>-->
-			<!--<groupId>edu.lu.uni</groupId>-->
-			<!--<artifactId>simple-utils</artifactId>-->
-			<!--<version>0.0.1-SNAPSHOT</version>-->
-		<!--</dependency>-->
-		
 		<!-- akka -->
 		<dependency>
 			<groupId>com.typesafe.akka</groupId>
@@ -41,18 +35,21 @@
 		<dependency>
 			<groupId>com.github.gumtreediff</groupId>
 			<artifactId>core</artifactId>
+			<scope>compile</scope>
 			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.github.gumtreediff</groupId>
 			<artifactId>gen.jdt</artifactId>
+			<scope>compile</scope>
 			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.github.gumtreediff</groupId>
 			<artifactId>gen.srcml</artifactId>
+			<scope>compile</scope>
 			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
 
@@ -75,18 +72,11 @@
 			<version>${logback.version}</version>
 		</dependency>
 		
-
-		<!--<dependency>-->
-			<!--<groupId>edu.lu.uni.serval</groupId>-->
-			<!--<artifactId>GitTraveller</artifactId>-->
-			<!--<version>0.0.1-SNAPSHOT</version>-->
-		<!--</dependency>-->
-
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
-			<scope>test</scope>
+<!--			<scope>test</scope>-->
 		</dependency>
 
 		<dependency>
@@ -102,65 +92,14 @@
 			<version>1.3</version>
 		</dependency>
 
-<!--		<dependency>-->
-<!--			<groupId>com.rabbitmq</groupId>-->
-<!--			<artifactId>amqp-client</artifactId>-->
-<!--			<version>4.0.0</version>-->
-<!--		</dependency>-->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-        </dependency>
 
-		<!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-core -->
-<!--		<dependency>-->
-<!--			<groupId>org.apache.lucene</groupId>-->
-<!--			<artifactId>lucene-core</artifactId>-->
-<!--			<version>4.8.0</version>-->
-<!--		</dependency>-->
-		<!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-analyzers-common -->
-<!--		<dependency>-->
-<!--			<groupId>org.apache.lucene</groupId>-->
-<!--			<artifactId>lucene-analyzers-common</artifactId>-->
-<!--			<version>4.8.0</version>-->
-<!--		</dependency>-->
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-math3 -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-math3</artifactId>
-			<version>3.6.1</version>
-		</dependency>
-
-		<!-- https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream -->
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<version>1.3.1</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>2.4</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.redisson</groupId>
-			<artifactId>redisson</artifactId>
-			<version>3.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>9.4.4.v20170414</version>
-			<scope>compile</scope>
-		</dependency>
 
-		<dependency>
-			<groupId>com.esotericsoftware</groupId>
-			<artifactId>kryo</artifactId>
-			<version>4.0.2</version>
-		</dependency>
 
 
 
diff --git a/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java b/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java
index edbc261..6f5d982 100755
--- a/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java
+++ b/src/main/java/edu/lu/uni/serval/fixminer/Launcher.java
@@ -22,7 +22,7 @@ public class Launcher {
 
         Properties appProps = new Properties();
 
-        String appConfigPath = "/Users/anilkoyuncu/projects/fixminer/fixminer_source/src/main/resource/app.properties";
+        String appConfigPath = "src/main/resource/app.properties";
 //        String appConfigPath = args[0];
         appProps.load(new FileInputStream(appConfigPath));
 
@@ -40,12 +40,12 @@ public class Launcher {
         String redisPath = appProps.getProperty("redisPath","FORKJOIN");
         String srcMLPath = appProps.getProperty("srcMLPath","FORKJOIN");
 
-        String parameter = args[2];
-//        String parameter = "L1";
+//        String parameter = args[2];
+        String parameter = "L1";
 //        String parameter = "if";
 //        String parameter = "add";
-        String jobType = args[1];
-//        String jobType = "RICHEDITSCRIPT";
+//        String jobType = args[1];
+        String jobType = "RICHEDITSCRIPT";
 //        String jobType = "LOAD";
 //        String jobType = "COMPARE";
 
diff --git a/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java b/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java
index 15bf6f3..796b487 100755
--- a/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java
+++ b/src/main/java/edu/lu/uni/serval/fixminer/akka/compare/CompareTrees.java
@@ -196,226 +196,226 @@ public class CompareTrees {
         return true;
     }
 
-        public static void coreCompare(String pairName, String treeType,JedisPool innerPool,ArrayList<String> samePairs,ArrayList<String> errorPairs, HashMap<String, String> filenames,JedisPool outerPool ) {
-
-//        if (samePairs.size() % 1000 == 0) {
-//            log.info("Same pairs size "+samePairs.size());
-//        }
-
-        ITree oldTree = null;
-        ITree newTree = null;
-        Pair<ITree, HierarchicalActionSet> oldPair = null;
-        Pair<ITree, HierarchicalActionSet> newPair = null;
-        String matchKey = null;
-
-        innerPool = outerPool;
-
-            try {
-
-                String[] split = pairName.split("/");
-
-
-                String i = split[1];
-                String j = split[2];
-                String keyName = split[0];
-                matchKey = keyName + "/" + (String.valueOf(i)) + "/" + String.valueOf(j);
-//                jedis.select(0);
-//                Set<String> keys = jedis.keys(matchKey);
-//                if (keys.size() > 0) {
-//                    jedis.del(matchKey);
-//                } else {
-//                    return;
-//                }
-//                    jedis.srem("pairs",matchKey);
-//                JedisPool outerPool = null;
-                switch (treeType) {
-                    case "single":
-
-//                        String oldShapeTree = EDiffHelper.getTreeString(keyName, i, outerPool, filenames,"shapeTree");
-//                        String newShapeTree = EDiffHelper.getTreeString(keyName, j, outerPool, filenames,"shapeTree");
+//        public static void coreCompare(String pairName, String treeType,JedisPool innerPool,ArrayList<String> samePairs,ArrayList<String> errorPairs, HashMap<String, String> filenames,JedisPool outerPool ) {
 //
-//                        String oldActionTree = EDiffHelper.getTreeString(keyName, i, outerPool, filenames,"actionTree");
-//                        String newActionTree = EDiffHelper.getTreeString(keyName, j, outerPool, filenames,"actionTree");
+////        if (samePairs.size() % 1000 == 0) {
+////            log.info("Same pairs size "+samePairs.size());
+////        }
 //
-//                        String oldTargetTree = EDiffHelper.getTreeString(keyName, i, outerPool, filenames,"targetTree");
-//                        String newTargetTree = EDiffHelper.getTreeString(keyName, j, outerPool, filenames,"targetTree");
+//        ITree oldTree = null;
+//        ITree newTree = null;
+//        Pair<ITree, HierarchicalActionSet> oldPair = null;
+//        Pair<ITree, HierarchicalActionSet> newPair = null;
+//        String matchKey = null;
+//
+//        innerPool = outerPool;
+//
+//            try {
+//
+//                String[] split = pairName.split("/");
 //
 //
-//                        if(oldShapeTree.equals(newShapeTree)){
-//                            if(oldActionTree.equals(newActionTree)){
-//                                if(oldTargetTree.equals(newTargetTree)){
-//                                    samePairs.add(matchKey);
-//                                }
-//                            }
-//                        }
-                        return;
-//                        break;
-
-
-                    case "shape":
-                        oldTree = EDiffHelper.getShapes(keyName, i,  outerPool,filenames);
-                        newTree = EDiffHelper.getShapes(keyName, j,  outerPool,filenames);
-                        break;
-                    case "action":
-
-                        oldPair = EDiffHelper.getActions(keyName, i, outerPool, filenames);
-                        newPair = EDiffHelper.getActions(keyName, j, outerPool, filenames);
-                        oldTree = oldPair.getValue0();
-                        newTree = newPair.getValue0();
-
-
-                        break;
-                    case "token":
-                        oldTree = EDiffHelper.getTokens(keyName, i, outerPool, filenames);
-                        newTree = EDiffHelper.getTokens(keyName, j, outerPool, filenames);
-
-                        String oldTokens = EDiffHelper.getNames2(oldTree);
-                        String newTokens = EDiffHelper.getNames2(newTree);
-
-                        JaroWinklerDistance jwd = new JaroWinklerDistance();
-
-
-                        Double overallSimi = Double.valueOf(0);
-
-                        if (!(oldTokens.trim().isEmpty() || newTokens.trim().isEmpty())) {
-                            overallSimi = jwd.apply(oldTokens, newTokens);
-
-                        }
-
-
-                        int retval = Double.compare(overallSimi, Double.valueOf(1));
-
-                        if (retval >= 0) {
-                            String result = i + "," + j + "," + String.join(",", oldTokens);
-//                            jedis.select(2);
-//                            jedis.set(matchKey, result);
-//                            try (Jedis jedis = innerPool.getResource()) {
-////                            jedis.del(matchKey);
-//                                jedis.select(2);
-//                                jedis.set(matchKey, result);
-//                            }
-                            samePairs.add(matchKey);
-//                            try (Jedis jedis = innerPool.getResource()) {
-////                                jedis.del(matchKey);
-//                                jedis.select(2);
-//                                jedis.set(matchKey, result);
-//                            }
-                        }
-//                    jedis.select(0);
+//                String i = split[1];
+//                String j = split[2];
+//                String keyName = split[0];
+//                matchKey = keyName + "/" + (String.valueOf(i)) + "/" + String.valueOf(j);
+////                jedis.select(0);
+////                Set<String> keys = jedis.keys(matchKey);
+////                if (keys.size() > 0) {
+////                    jedis.del(matchKey);
+////                } else {
+////                    return;
+////                }
 ////                    jedis.srem("pairs",matchKey);
-//                    jedis.del(matchKey);
-
-                        return;
-                    default:
-                        break;
-                }
-
-
-
-                if(oldTree.toStaticHashString().equals(newTree.toStaticHashString())){
-                    String editDistance = "0";
-                    String result = i + "," + j + "," + editDistance;
-                    if (editDistance.equals("0")) {
-
-                        if (treeType.equals("action")) {
-                            HierarchicalActionSet oldProject = oldPair.getValue1();
-                            HierarchicalActionSet newProject = newPair.getValue1();
-
-                            oldTree = EDiffHelper.getTargets(oldProject);
-                            newTree = EDiffHelper.getTargets(newProject);
-                            if (oldTree.toStaticHashString().equals(newTree.toStaticHashString())) {
-                                samePairs.add(matchKey);
-//                                try (Jedis jedis = innerPool.getResource()) {
-////                                    jedis.del(matchKey);
-//                                    jedis.select(2);
-//                                    jedis.set(matchKey, result);
+////                JedisPool outerPool = null;
+//                switch (treeType) {
+//                    case "single":
 //
-//                                }
-                            }
-                        } else {
-                            samePairs.add(matchKey);
-//                            try (Jedis jedis = innerPool.getResource()) {
-////                            jedis.del(matchKey);
-//                                jedis.select(2);
-//                                jedis.set(matchKey, result);
-//
-//                            }
-                        }
-                    }
-
-
-                }
-//                if(oldTree.toString().equals(newTree.toString())) {
-//                    Matcher m = Matchers.getInstance().getMatcher(oldTree, newTree);
-//                    m.match();
+////                        String oldShapeTree = EDiffHelper.getTreeString(keyName, i, outerPool, filenames,"shapeTree");
+////                        String newShapeTree = EDiffHelper.getTreeString(keyName, j, outerPool, filenames,"shapeTree");
+////
+////                        String oldActionTree = EDiffHelper.getTreeString(keyName, i, outerPool, filenames,"actionTree");
+////                        String newActionTree = EDiffHelper.getTreeString(keyName, j, outerPool, filenames,"actionTree");
+////
+////                        String oldTargetTree = EDiffHelper.getTreeString(keyName, i, outerPool, filenames,"targetTree");
+////                        String newTargetTree = EDiffHelper.getTreeString(keyName, j, outerPool, filenames,"targetTree");
+////
+////
+////                        if(oldShapeTree.equals(newShapeTree)){
+////                            if(oldActionTree.equals(newActionTree)){
+////                                if(oldTargetTree.equals(newTargetTree)){
+////                                    samePairs.add(matchKey);
+////                                }
+////                            }
+////                        }
+//                        return;
+////                        break;
 //
 //
-//                    ActionGenerator ag = new ActionGenerator(oldTree, newTree, m.getMappings());
-//                    ag.generate();
-//                    List<Action> actions = ag.getActions();
+//                    case "shape":
+//                        oldTree = EDiffHelper.getShapes(keyName, i,  outerPool,filenames);
+//                        newTree = EDiffHelper.getShapes(keyName, j,  outerPool,filenames);
+//                        break;
+//                    case "action":
+//
+//                        oldPair = EDiffHelper.getActions(keyName, i, outerPool, filenames);
+//                        newPair = EDiffHelper.getActions(keyName, j, outerPool, filenames);
+//                        oldTree = oldPair.getValue0();
+//                        newTree = newPair.getValue0();
 //
 //
-//                    String editDistance;
+//                        break;
+//                    case "token":
+//                        oldTree = EDiffHelper.getTokens(keyName, i, outerPool, filenames);
+//                        newTree = EDiffHelper.getTokens(keyName, j, outerPool, filenames);
 //
-//                    editDistance = String.valueOf(actions.size());
+//                        String oldTokens = EDiffHelper.getNames2(oldTree);
+//                        String newTokens = EDiffHelper.getNames2(newTree);
+//
+//                        JaroWinklerDistance jwd = new JaroWinklerDistance();
+//
+//
+//                        Double overallSimi = Double.valueOf(0);
+//
+//                        if (!(oldTokens.trim().isEmpty() || newTokens.trim().isEmpty())) {
+//                            overallSimi = jwd.apply(oldTokens, newTokens);
+//
+//                        }
+//
+//
+//                        int retval = Double.compare(overallSimi, Double.valueOf(1));
+//
+//                        if (retval >= 0) {
+//                            String result = i + "," + j + "," + String.join(",", oldTokens);
+////                            jedis.select(2);
+////                            jedis.set(matchKey, result);
+////                            try (Jedis jedis = innerPool.getResource()) {
+//////                            jedis.del(matchKey);
+////                                jedis.select(2);
+////                                jedis.set(matchKey, result);
+////                            }
+//                            samePairs.add(matchKey);
+////                            try (Jedis jedis = innerPool.getResource()) {
+//////                                jedis.del(matchKey);
+////                                jedis.select(2);
+////                                jedis.set(matchKey, result);
+////                            }
+//                        }
+////                    jedis.select(0);
+//////                    jedis.srem("pairs",matchKey);
+////                    jedis.del(matchKey);
+//
+//                        return;
+//                    default:
+//                        break;
+//                }
+//
+//
+//
+//                if(oldTree.toStaticHashString().equals(newTree.toStaticHashString())){
+//                    String editDistance = "0";
 //                    String result = i + "," + j + "," + editDistance;
-//
-//
 //                    if (editDistance.equals("0")) {
 //
 //                        if (treeType.equals("action")) {
-//
 //                            HierarchicalActionSet oldProject = oldPair.getValue1();
 //                            HierarchicalActionSet newProject = newPair.getValue1();
 //
 //                            oldTree = EDiffHelper.getTargets(oldProject);
 //                            newTree = EDiffHelper.getTargets(newProject);
-//
-//                            if(oldTree.toString().equals(newTree.toString())) {
-//                                m = Matchers.getInstance().getMatcher(oldTree, newTree);
-//                                m.match();
-//
-//
-//                                ag = new ActionGenerator(oldTree, newTree, m.getMappings());
-//                                ag.generate();
-//                                actions = ag.getActions();
-//
-//                                editDistance = String.valueOf(actions.size());
-//
-//                                if (editDistance.equals("0")) {
-//                                    try (Jedis jedis = innerPool.getResource()) {
-//                                        jedis.del(matchKey);
-//                                        jedis.select(2);
-//                                        jedis.set(matchKey, result);
-//                                    }
-//                                }
+//                            if (oldTree.toStaticHashString().equals(newTree.toStaticHashString())) {
+//                                samePairs.add(matchKey);
+////                                try (Jedis jedis = innerPool.getResource()) {
+//////                                    jedis.del(matchKey);
+////                                    jedis.select(2);
+////                                    jedis.set(matchKey, result);
+////
+////                                }
 //                            }
-//
-//
 //                        } else {
-//                            try (Jedis jedis = innerPool.getResource()) {
-//                                jedis.del(matchKey);
-//                                jedis.select(2);
-//                                jedis.set(matchKey, result);
-//                            }
-////                        jedis.select(2);
-////                        jedis.set(matchKey, result);
-////                        samePairs.add(matchKey);
+//                            samePairs.add(matchKey);
+////                            try (Jedis jedis = innerPool.getResource()) {
+//////                            jedis.del(matchKey);
+////                                jedis.select(2);
+////                                jedis.set(matchKey, result);
+////
+////                            }
 //                        }
-//
 //                    }
-//                }
-
-            } catch (Exception e) {
-                errorPairs.add(matchKey);
-//                jedis.select(0);
-////            jedis.srem("pairs",matchKey);
 //
-//                jedis.hset(matchKey, "0", "1");
-
-                log.debug("{} not comparable", pairName);
-            }
-    }
+//
+//                }
+////                if(oldTree.toString().equals(newTree.toString())) {
+////                    Matcher m = Matchers.getInstance().getMatcher(oldTree, newTree);
+////                    m.match();
+////
+////
+////                    ActionGenerator ag = new ActionGenerator(oldTree, newTree, m.getMappings());
+////                    ag.generate();
+////                    List<Action> actions = ag.getActions();
+////
+////
+////                    String editDistance;
+////
+////                    editDistance = String.valueOf(actions.size());
+////                    String result = i + "," + j + "," + editDistance;
+////
+////
+////                    if (editDistance.equals("0")) {
+////
+////                        if (treeType.equals("action")) {
+////
+////                            HierarchicalActionSet oldProject = oldPair.getValue1();
+////                            HierarchicalActionSet newProject = newPair.getValue1();
+////
+////                            oldTree = EDiffHelper.getTargets(oldProject);
+////                            newTree = EDiffHelper.getTargets(newProject);
+////
+////                            if(oldTree.toString().equals(newTree.toString())) {
+////                                m = Matchers.getInstance().getMatcher(oldTree, newTree);
+////                                m.match();
+////
+////
+////                                ag = new ActionGenerator(oldTree, newTree, m.getMappings());
+////                                ag.generate();
+////                                actions = ag.getActions();
+////
+////                                editDistance = String.valueOf(actions.size());
+////
+////                                if (editDistance.equals("0")) {
+////                                    try (Jedis jedis = innerPool.getResource()) {
+////                                        jedis.del(matchKey);
+////                                        jedis.select(2);
+////                                        jedis.set(matchKey, result);
+////                                    }
+////                                }
+////                            }
+////
+////
+////                        } else {
+////                            try (Jedis jedis = innerPool.getResource()) {
+////                                jedis.del(matchKey);
+////                                jedis.select(2);
+////                                jedis.set(matchKey, result);
+////                            }
+//////                        jedis.select(2);
+//////                        jedis.set(matchKey, result);
+//////                        samePairs.add(matchKey);
+////                        }
+////
+////                    }
+////                }
+//
+//            } catch (Exception e) {
+//                errorPairs.add(matchKey);
+////                jedis.select(0);
+//////            jedis.srem("pairs",matchKey);
+////
+////                jedis.hset(matchKey, "0", "1");
+//
+//                log.debug("{} not comparable", pairName);
+//            }
+//    }
 
 
 }
diff --git a/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/DefaultKryoContext.java b/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/DefaultKryoContext.java
deleted file mode 100644
index 93d4783..0000000
--- a/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/DefaultKryoContext.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package edu.lu.uni.serval.fixminer.akka.ediff;
-
-import java.io.ByteArrayOutputStream;
-
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.io.*;
-import com.esotericsoftware.kryo.pool.KryoFactory;
-import com.esotericsoftware.kryo.pool.KryoPool;
-import org.objenesis.strategy.SerializingInstantiatorStrategy;
-
-
-public class DefaultKryoContext implements KryoContext{
-
-    private static final int DEFAULT_BUFFER = 1024 * 100;
-
-    private KryoPool pool;
-
-    public static KryoContext newKryoContextFactory()
-    {
-        return new DefaultKryoContext();
-    }
-
-    private DefaultKryoContext()
-    {
-        KryoFactory factory = new KryoFactoryImpl();
-
-        pool = new KryoPool.Builder(factory).softReferences().build();
-    }
-
-    private static class KryoFactoryImpl implements KryoFactory
-    {
-        @Override
-        public Kryo create() {
-            Kryo kryo = new Kryo();
-            kryo.setInstantiatorStrategy(new Kryo.DefaultInstantiatorStrategy(new SerializingInstantiatorStrategy()));
-            return kryo;
-        }
-    }
-
-
-    @Override
-    public byte[] serialze(Object obj)
-    {
-        return serialze(obj, DEFAULT_BUFFER);
-    }
-
-    @Override
-    public byte[] serialze(Object obj, int bufferSize)
-    {
-        ByteArrayOutputStream base = new ByteArrayOutputStream();
-        UnsafeMemoryOutput output = new UnsafeMemoryOutput(base, bufferSize);
-
-        Kryo kryo = pool.borrow();
-
-        kryo.writeObject(output, obj);
-
-        output.flush();
-        byte[] serialized = base.toByteArray();
-        output.close();
-
-//        byte[] serialized = output.toBytes();
-
-        pool.release(kryo);
-
-        return serialized;
-    }
-
-    @Override
-    public Object deserialze(Class clazz, byte[] serialized)
-    {
-        Object obj;
-
-        Kryo kryo = pool.borrow();
-
-        UnsafeMemoryInput input = new UnsafeMemoryInput(serialized);
-        obj = kryo.readObject(input, clazz);
-
-        pool.release(kryo);
-
-        return obj;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/HunkParserTest.java b/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/HunkParserTest.java
index 3e9f19b..a41f578 100644
--- a/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/HunkParserTest.java
+++ b/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/HunkParserTest.java
@@ -211,9 +211,9 @@ public class HunkParserTest {
 //        tc.validate();
 //        parent.getLength();
 
-        HierarchicalActionSet actionSet = (HierarchicalActionSet)  EDiffHelper.kryoDeseerialize(dump);
+//        HierarchicalActionSet actionSet = (HierarchicalActionSet)  EDiffHelper.kryoDeseerialize(dump);
 //        HierarchicalActionSet actionSet = (HierarchicalActionSet)  EDiffHelper.commonsDeserialize(dump);
-        actionSet.toString();
+//        actionSet.toString();
 
 
 // CODE HERE
@@ -248,8 +248,8 @@ public class HunkParserTest {
         String j = "21";
         HashMap<String, String> filenames = AkkaTreeParser.filenames(outerPool);
 
-        oldPair = EDiffHelper.getActions(keyName, i, outerPool, filenames);
-        newPair = EDiffHelper.getActions(keyName, j, outerPool, filenames);
+//        oldPair = EDiffHelper.getActions(keyName, i, outerPool, filenames);
+//        newPair = EDiffHelper.getActions(keyName, j, outerPool, filenames);
         ITree oldActionTree = oldPair.getValue0();
         ITree newActionTree = newPair.getValue0();
         HierarchicalActionSet oldProject = oldPair.getValue1();
diff --git a/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/TestIntroClass.java b/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/TestIntroClass.java
index 3a8dd1d..7ce7832 100644
--- a/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/TestIntroClass.java
+++ b/src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/TestIntroClass.java
@@ -19,8 +19,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static reactor.core.reactivestreams.PublisherFactory.forEach;
-
 public class TestIntroClass {
 
 
diff --git a/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java b/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java
index fdf928c..8ddabc9 100755
--- a/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java
+++ b/src/main/java/edu/lu/uni/serval/fixminer/jobs/EnhancedASTDiff.java
@@ -62,7 +62,7 @@ public class EnhancedASTDiff {
 				.filter(x -> !x.getName().startsWith("."))
 				.filter(x -> !x.getName().startsWith("cocci"))
 				.filter(x -> !x.getName().endsWith(".index"))
-				.filter(x -> x.getName().endsWith("codeflaws"))
+//				.filter(x -> x.getName().endsWith("codeflaws"))
 				.collect(Collectors.toList());
 
 
diff --git a/src/main/java/edu/lu/uni/serval/utils/EDiffHelper.java b/src/main/java/edu/lu/uni/serval/utils/EDiffHelper.java
index 2687b3f..40e8dc4 100755
--- a/src/main/java/edu/lu/uni/serval/utils/EDiffHelper.java
+++ b/src/main/java/edu/lu/uni/serval/utils/EDiffHelper.java
@@ -5,7 +5,6 @@ import com.github.gumtreediff.gen.srcml.NodeMap_new;
 import com.github.gumtreediff.tree.ITree;
 import com.github.gumtreediff.tree.TreeContext;
 import com.github.gumtreediff.tree.TreeUtils;
-import edu.lu.uni.serval.fixminer.akka.ediff.DefaultKryoContext;
 import edu.lu.uni.serval.fixminer.akka.ediff.HierarchicalActionSet;
 import edu.lu.uni.serval.fixminer.akka.ediff.KryoContext;
 import org.apache.commons.lang3.SerializationUtils;
@@ -74,16 +73,6 @@ public class EDiffHelper {
     }
 
 
-    public static byte[] kryoSerialize(Serializable o ){
-        KryoContext kryoContext = DefaultKryoContext.newKryoContextFactory();
-        return kryoContext.serialze(o);
-    }
-
-    public static Object kryoDeseerialize(byte[] data ){
-        KryoContext kryoContext = DefaultKryoContext.newKryoContextFactory();
-        return kryoContext.deserialze(HierarchicalActionSet.class,data);
-    }
-
     public static ITree getTokenTree(HierarchicalActionSet actionSet, ITree parent, ITree children,TreeContext tc){
 
         int newType = 0;
@@ -272,31 +261,31 @@ public class EDiffHelper {
     }
 
 
-    public static ITree getShapes(String prefix, String fn, JedisPool outerPool, HashMap<String, String> filenames) {
-
-        ITree tree = null;
-
-        try (Jedis outer = outerPool.getResource()) {
-            try {
-                while (!outer.ping().equals("PONG")) {
-                    log.info("wait");
-                }
-                String dist2load = filenames.get(prefix + "-" + fn);
-
-                String key = prefix.replace("-", "/") + "/" + dist2load;
-
-                byte[] s = outer.hget("dump".getBytes(), key.getBytes());
-                HierarchicalActionSet actionSet = (HierarchicalActionSet) EDiffHelper.kryoDeseerialize(s);
-
-                tree = getShapeTree(actionSet);
-
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return tree;
-
-    }
+//    public static ITree getShapes(String prefix, String fn, JedisPool outerPool, HashMap<String, String> filenames) {
+//
+//        ITree tree = null;
+//
+//        try (Jedis outer = outerPool.getResource()) {
+//            try {
+//                while (!outer.ping().equals("PONG")) {
+//                    log.info("wait");
+//                }
+//                String dist2load = filenames.get(prefix + "-" + fn);
+//
+//                String key = prefix.replace("-", "/") + "/" + dist2load;
+//
+//                byte[] s = outer.hget("dump".getBytes(), key.getBytes());
+//                HierarchicalActionSet actionSet = (HierarchicalActionSet) EDiffHelper.kryoDeseerialize(s);
+//
+//                tree = getShapeTree(actionSet);
+//
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//        return tree;
+//
+//    }
 
     public static ITree getShapeTree(HierarchicalActionSet actionSet) {
         ITree tree = null;
@@ -349,38 +338,38 @@ public class EDiffHelper {
         return null;
     }
 
-    public  static Pair<ITree,HierarchicalActionSet> getActions(String prefix, String fn, JedisPool outerPool, HashMap<String, String> filenames) {
-
-
-        ITree tree = null;
-        HierarchicalActionSet actionSet = null;
-
-        try (Jedis outer = outerPool.getResource()) {
-            try {
-                while (!outer.ping().equals("PONG")) {
-                    log.info("wait");
-                }
-
-
-                String dist2load = filenames.get(prefix + "-" + fn);
-
-                String[] split = prefix.split("-");
-                String key = split[0] + "/"+split[1]+"/" + dist2load;
-
-                byte[] s = outer.hget("dump".getBytes(), key.getBytes());
-                actionSet = (HierarchicalActionSet) EDiffHelper.kryoDeseerialize(s);
-
-
-                tree = getActionTrees(actionSet);
-            }catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        Pair<ITree, HierarchicalActionSet> pair = new Pair<>(tree,actionSet);
-        return pair;
-
-    }
+//    public  static Pair<ITree,HierarchicalActionSet> getActions(String prefix, String fn, JedisPool outerPool, HashMap<String, String> filenames) {
+//
+//
+//        ITree tree = null;
+//        HierarchicalActionSet actionSet = null;
+//
+//        try (Jedis outer = outerPool.getResource()) {
+//            try {
+//                while (!outer.ping().equals("PONG")) {
+//                    log.info("wait");
+//                }
+//
+//
+//                String dist2load = filenames.get(prefix + "-" + fn);
+//
+//                String[] split = prefix.split("-");
+//                String key = split[0] + "/"+split[1]+"/" + dist2load;
+//
+//                byte[] s = outer.hget("dump".getBytes(), key.getBytes());
+//                actionSet = (HierarchicalActionSet) EDiffHelper.kryoDeseerialize(s);
+//
+//
+//                tree = getActionTrees(actionSet);
+//            }catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//
+//        Pair<ITree, HierarchicalActionSet> pair = new Pair<>(tree,actionSet);
+//        return pair;
+//
+//    }
 
     public static ITree getActionTrees(HierarchicalActionSet actionSet) {
         ITree tree = null;
@@ -406,41 +395,41 @@ public class EDiffHelper {
         }
     }
 
-    public  static ITree getTokens(String prefix, String fn, JedisPool outerPool, HashMap<String, String> filenames) {
-
-
-        ITree tree = null;
-
-        HierarchicalActionSet actionSet = null;
-        try (Jedis outer = outerPool.getResource()) {
-            try {
-                while (!outer.ping().equals("PONG")) {
-                    log.info("wait");
-                }
-                String dist2load = filenames.get(prefix + "-" + fn);
-
-                String[] split = prefix.split("-");
-                String key = split[0] + "/"+split[1]+"/" + dist2load;
-
-                byte[] s = outer.hget("dump".getBytes(), key.getBytes());
-                actionSet = (HierarchicalActionSet) EDiffHelper.kryoDeseerialize(s);
-
-                ITree parent = null;
-                ITree children = null;
-                TreeContext tc = new TreeContext();
-                tree = EDiffHelper.getTokenTree(actionSet, parent, children, tc);
-                tree.setParent(null);
-                tc.validate();
-//            getLeaves(tree);
-
-
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        return tree;
-    }
+//    public  static ITree getTokens(String prefix, String fn, JedisPool outerPool, HashMap<String, String> filenames) {
+//
+//
+//        ITree tree = null;
+//
+//        HierarchicalActionSet actionSet = null;
+//        try (Jedis outer = outerPool.getResource()) {
+//            try {
+//                while (!outer.ping().equals("PONG")) {
+//                    log.info("wait");
+//                }
+//                String dist2load = filenames.get(prefix + "-" + fn);
+//
+//                String[] split = prefix.split("-");
+//                String key = split[0] + "/"+split[1]+"/" + dist2load;
+//
+//                byte[] s = outer.hget("dump".getBytes(), key.getBytes());
+//                actionSet = (HierarchicalActionSet) EDiffHelper.kryoDeseerialize(s);
+//
+//                ITree parent = null;
+//                ITree children = null;
+//                TreeContext tc = new TreeContext();
+//                tree = EDiffHelper.getTokenTree(actionSet, parent, children, tc);
+//                tree.setParent(null);
+//                tc.validate();
+////            getLeaves(tree);
+//
+//
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//
+//        return tree;
+//    }
 
 
 
diff --git a/src/main/resource/app.properties b/src/main/resource/app.properties
index 5a1e010..3970991 100755
--- a/src/main/resource/app.properties
+++ b/src/main/resource/app.properties
@@ -8,11 +8,11 @@ hostname = localhost
 hunkLimit = 10
 
 #inputPath = /Users/anilkoyuncu/projects/gumInputLinux
-inputPath = /Users/anilkoyuncu/projects/fixminer/fixminer-core/python/data/gumInputLinux
+inputPath = /Users/anil.koyuncu/projects/fixminer/fixminer-data/gumInputLinux
 #redisPath = /Users/anil.koyuncu/projects/fixminer/fixminer-core/python/data/redis
-redisPath = /Users/anilkoyuncu/projects/fixminer/fixminer-core/python/data/redis
-#srcMLPath=  /Users/anil.koyuncu/Downloads/srcML/src2srcml
-srcMLPath=  /usr/local/bin/srcml
+redisPath = /Users/anil.koyuncu/projects/fixminer/fixminer-core/python/data/redis
+srcMLPath=  /Users/anil.koyuncu/Downloads/srcML.0.9.5/bin/srcml
+#srcMLPath=  /usr/local/bin/srcml
 actionType = ALL
 eDiffTimeout = 900