diff --git a/EkekoFeature/:Users:cderoove:Documents:Docs:VUB:research:implementations:authored:Ekeko:workspaceJunoEkeko:EkekoSnippets.md b/EkekoFeature/:Users:cderoove:Documents:Docs:VUB:research:implementations:authored:Ekeko:workspaceJunoEkeko:EkekoSnippets.md
new file mode 100644
index 0000000..8ebb249
--- /dev/null
+++ b/EkekoFeature/:Users:cderoove:Documents:Docs:VUB:research:implementations:authored:Ekeko:workspaceJunoEkeko:EkekoSnippets.md
@@ -0,0 +1,3 @@
+# damp.ekeko.EkekoSnippets
+
+[Ekeko](https://github.com/cderoove/damp.ekeko/tree/master/EkekoPlugin)-based Eclipse plugin for transforming code snippets into code templates that can be used to query Java projects. 
diff --git a/EkekoPlugin/.classpath b/EkekoPlugin/.classpath
index 20dda7c..f23e9cd 100644
--- a/EkekoPlugin/.classpath
+++ b/EkekoPlugin/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="libs/core.logic-0.8.0-beta3-20121108.000151-13.jar"/>
+	<classpathentry kind="lib" path="libs/core.logic-0.8.0-rc2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
@@ -11,10 +11,6 @@
 	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="classes" sourcepath="classes"/>
 	<classpathentry exported="true" kind="lib" path="libs/guava-11.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/jasminclasses.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/java_cup.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/polyglot.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/sootclasses.jar" sourcepath="/Users/cderoove/Downloads/sootsrc-2.5.0.jar"/>
-	<classpathentry kind="lib" path="libs/qwal-1.0.2-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="libs/soot.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/EkekoPlugin/META-INF/MANIFEST.MF b/EkekoPlugin/META-INF/MANIFEST.MF
index e9205d4..ce2041c 100644
--- a/EkekoPlugin/META-INF/MANIFEST.MF
+++ b/EkekoPlugin/META-INF/MANIFEST.MF
@@ -27,15 +27,22 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
  classes/,
  libs/guava-11.0.2.jar,
- libs/jasminclasses.jar,
- libs/java_cup.jar,
- libs/polyglot.jar,
- libs/sootclasses.jar,
- libs/qwal-1.0.2-SNAPSHOT.jar,
- libs/core.logic-0.8.0-beta3-20121108.000151-13.jar
-Export-Package: baristaui.util,
- baristaui.views.queryResult,
- clojure.core,
+ libs/soot.jar,
+ libs/core.logic-0.8.0-rc2.jar
+Export-Package: baristaui.util;
+  uses:="org.eclipse.jface.action,
+   org.eclipse.jdt.core.dom,
+   org.eclipse.swt.events,
+   org.eclipse.core.resources,
+   org.eclipse.jface.viewers,
+   org.eclipse.jface.text.rules,
+   org.eclipse.swt.widgets",
+ baristaui.views.queryResult;
+  uses:="org.eclipse.ui,
+   org.eclipse.jface.viewers,
+   org.eclipse.swt.graphics,
+   org.eclipse.ui.part,
+   org.eclipse.swt.widgets",
  clojure.core.logic,
  damp,
  damp.ekeko;
@@ -44,7 +51,6 @@ Export-Package: baristaui.util,
    org.eclipse.ui,
    org.eclipse.ui.plugin,
    org.eclipse.core.commands,
-   soot,
    org.eclipse.jface.action,
    org.eclipse.jdt.core.dom,
    dk.itu.smartemf.ofbiz.analysis,
@@ -55,18 +61,21 @@ Export-Package: baristaui.util,
    org.osgi.framework,
    org.eclipse.ui.dialogs,
    org.eclipse.swt.widgets,
-   org.eclipse.jdt.core.dom.rewrite,
-   org.eclipse.jface.dialogs,
-   damp.util,
-   damp.ekeko.jdt,
-   damp.ekeko.util,
-   damp.ekeko.workspace,
-   damp.util",
+   org.eclipse.jdt.core.dom.rewrite",
  damp.ekeko.jdt,
- damp.ekeko.soot,
+ damp.ekeko.soot;
+  uses:="soot,
+   org.eclipse.jface.action,
+   org.eclipse.core.runtime,
+   org.eclipse.jdt.core,
+   org.eclipse.ui,
+   org.eclipse.core.resources,
+   org.eclipse.jface.viewers,
+   damp.ekeko,
+   org.eclipse.swt.widgets",
  damp.ekeko.util,
  damp.ekeko.workspace,
- damp.util,
+ damp.util;uses:="org.eclipse.core.runtime,org.eclipse.core.resources",
  test.damp,
  test.damp.ekeko
 Eclipse-BuddyPolicy: registered
diff --git a/EkekoPlugin/build.properties b/EkekoPlugin/build.properties
index 524522b..98048ce 100644
--- a/EkekoPlugin/build.properties
+++ b/EkekoPlugin/build.properties
@@ -5,13 +5,9 @@ bin.includes = plugin.xml,\
                .,\
                libs/guava-11.0.2.jar,\
                icons/,\
-               libs/jasminclasses.jar,\
-               libs/java_cup.jar,\
-               libs/polyglot.jar,\
-               libs/sootclasses.jar,\
                build.properties,\
                classes/,\
                src/,\
-               libs/qwal-1.0.2-SNAPSHOT.jar,\
-               libs/core.logic-0.8.0-beta3-20121108.000151-13.jar
+               libs/soot.jar,\
+               libs/core.logic-0.8.0-rc2.jar
                
\ No newline at end of file
diff --git a/EkekoPlugin/libs/core.logic-0.8.0-beta3-20121108.000151-13.jar b/EkekoPlugin/libs/core.logic-0.8.0-beta3-20121108.000151-13.jar
deleted file mode 100644
index b23f86c..0000000
Binary files a/EkekoPlugin/libs/core.logic-0.8.0-beta3-20121108.000151-13.jar and /dev/null differ
diff --git a/EkekoPlugin/libs/core.logic-0.8.0-beta5.jar b/EkekoPlugin/libs/core.logic-0.8.0-beta5.jar
new file mode 100644
index 0000000..ff0291c
Binary files /dev/null and b/EkekoPlugin/libs/core.logic-0.8.0-beta5.jar differ
diff --git a/EkekoPlugin/libs/core.logic-0.8.0-rc2.jar b/EkekoPlugin/libs/core.logic-0.8.0-rc2.jar
new file mode 100644
index 0000000..3e3f720
Binary files /dev/null and b/EkekoPlugin/libs/core.logic-0.8.0-rc2.jar differ
diff --git a/EkekoPlugin/libs/jasminclasses.jar b/EkekoPlugin/libs/jasminclasses.jar
deleted file mode 100644
index 34cd302..0000000
Binary files a/EkekoPlugin/libs/jasminclasses.jar and /dev/null differ
diff --git a/EkekoPlugin/libs/java_cup.jar b/EkekoPlugin/libs/java_cup.jar
deleted file mode 100644
index 091615f..0000000
Binary files a/EkekoPlugin/libs/java_cup.jar and /dev/null differ
diff --git a/EkekoPlugin/libs/polyglot.jar b/EkekoPlugin/libs/polyglot.jar
deleted file mode 100644
index 1b9a05d..0000000
Binary files a/EkekoPlugin/libs/polyglot.jar and /dev/null differ
diff --git a/EkekoPlugin/libs/sootclasses.jar b/EkekoPlugin/libs/soot.jar
similarity index 68%
rename from EkekoPlugin/libs/sootclasses.jar
rename to EkekoPlugin/libs/soot.jar
index e3c1469..e8b12cf 100644
Binary files a/EkekoPlugin/libs/sootclasses.jar and b/EkekoPlugin/libs/soot.jar differ