diff --git a/build.gradle b/build.gradle
index d59062b69dcae4151a38823d52416f55f70b85de..5867a7d875ef11f204703e3a56bd393924205bbe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,6 +57,7 @@ project(":de.bmotionstudio.gef.editor") {
 		// hardcode a specific MXParser version here.
 		// It *should* be safe to update this when a new version is released.
 		implementation group: "io.github.x-stream", name: "mxparser", version: "1.2.2"
+		implementation group: "org.codehaus.groovy", name: "groovy", version: "2.0.5"
 	}
 }
 
diff --git a/de.bmotionstudio.gef.editor/.classpath b/de.bmotionstudio.gef.editor/.classpath
index b1726716b11c97724f9c7436f66766692a39c40f..03868966ee8588604176362f949607062374306e 100644
--- a/de.bmotionstudio.gef.editor/.classpath
+++ b/de.bmotionstudio.gef.editor/.classpath
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/ext/antlr-2.7.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ext/asm-4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ext/groovy-2.0.5.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/antlr-2.7.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/asm-4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/asm-analysis-4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/asm-commons-4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/asm-tree-4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/asm-util-4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/groovy-2.0.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/mxparser-1.2.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/xmlpull-1.1.3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/xstream-1.4.20.jar"/>
diff --git a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
index 34f3a964dc762c3186f8fd723373f127cfdd512f..b9c85784886020bef789890cf47a710261ebb84d 100644
--- a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
@@ -149,9 +149,13 @@ Export-Package: de.bmotionstudio.gef.editor;
    org.eclipse.swt.widgets,
    de.bmotionstudio.gef.editor"
 Bundle-ClassPath: .,
+ lib/dependencies/antlr-2.7.7.jar,
+ lib/dependencies/asm-4.0.jar,
+ lib/dependencies/asm-analysis-4.0.jar,
+ lib/dependencies/asm-commons-4.0.jar,
+ lib/dependencies/asm-tree-4.0.jar,
+ lib/dependencies/asm-util-4.0.jar,
+ lib/dependencies/groovy-2.0.5.jar,
  lib/dependencies/mxparser-1.2.2.jar,
  lib/dependencies/xmlpull-1.1.3.1.jar,
- lib/dependencies/xstream-1.4.20.jar,
- lib/ext/groovy-2.0.5.jar,
- lib/ext/asm-4.0.jar,
- lib/ext/antlr-2.7.7.jar
+ lib/dependencies/xstream-1.4.20.jar
diff --git a/de.bmotionstudio.gef.editor/lib/ext/antlr-2.7.7.jar b/de.bmotionstudio.gef.editor/lib/ext/antlr-2.7.7.jar
deleted file mode 100644
index 5e5f14b35584eac2a9f0f888769f0ab93ca6d849..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/lib/ext/antlr-2.7.7.jar and /dev/null differ
diff --git a/de.bmotionstudio.gef.editor/lib/ext/asm-4.0.jar b/de.bmotionstudio.gef.editor/lib/ext/asm-4.0.jar
deleted file mode 100644
index cca0d9cebf10f36c1f377a0f5534a8728f529a6b..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/lib/ext/asm-4.0.jar and /dev/null differ
diff --git a/de.bmotionstudio.gef.editor/lib/ext/groovy-2.0.5.jar b/de.bmotionstudio.gef.editor/lib/ext/groovy-2.0.5.jar
deleted file mode 100644
index f0ad9f47048ce6d2b04be8a879846d4aaf5ffcb7..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/lib/ext/groovy-2.0.5.jar and /dev/null differ