diff --git a/de.bmotionstudio.gef.editor/.classpath b/de.bmotionstudio.gef.editor/.classpath
index 237e0ae37e8eb0d5c5f6329b7255dfb0828e036e..cb2a56821c95aacfefc3381f5c0fa697013c8516 100644
--- a/de.bmotionstudio.gef.editor/.classpath
+++ b/de.bmotionstudio.gef.editor/.classpath
@@ -3,11 +3,8 @@
 	<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 exported="true" kind="lib" path="lib/ext/xmlpull-1.1.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ext/xstream-1.4.3.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/ext/xpp3_min-1.1.4c.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
index a1f5b177ffbd9e8a8e6c693ade7c06e116d2ac26..aa0ba626bc21d6288325f0e04a1aab31e1b3a4fd 100644
--- a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
@@ -18,28 +18,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-BuddyPolicy: registered
 Bundle-Vendor: HHU Düsseldorf STUPS Group
-Export-Package: com.thoughtworks.xstream,
- com.thoughtworks.xstream.annotations,
- com.thoughtworks.xstream.converters,
- com.thoughtworks.xstream.converters.basic,
- com.thoughtworks.xstream.converters.collections,
- com.thoughtworks.xstream.converters.enums,
- com.thoughtworks.xstream.converters.extended,
- com.thoughtworks.xstream.converters.javabean,
- com.thoughtworks.xstream.converters.reflection,
- com.thoughtworks.xstream.core,
- com.thoughtworks.xstream.core.util,
- com.thoughtworks.xstream.io,
- com.thoughtworks.xstream.io.binary,
- com.thoughtworks.xstream.io.copy,
- com.thoughtworks.xstream.io.json,
- com.thoughtworks.xstream.io.naming,
- com.thoughtworks.xstream.io.path,
- com.thoughtworks.xstream.io.xml,
- com.thoughtworks.xstream.io.xml.xppdom,
- com.thoughtworks.xstream.mapper,
- com.thoughtworks.xstream.persistence,
- de.bmotionstudio.gef.editor;
+Export-Package: de.bmotionstudio.gef.editor;
   uses:="org.eclipse.jface.wizard,
    org.eclipse.core.runtime,
    de.prob.core,
@@ -166,10 +145,7 @@ Export-Package: com.thoughtworks.xstream,
    de.bmotionstudio.gef.editor.model,
    org.eclipse.swt.widgets,
    de.bmotionstudio.gef.editor"
-Bundle-ClassPath: lib/ext/xpp3_min-1.1.4c.jar,
- .,
- lib/ext/xstream-1.4.3.jar,
- lib/ext/xmlpull-1.1.3.1.jar,
+Bundle-ClassPath: .,
  lib/ext/groovy-2.0.5.jar,
  lib/ext/asm-4.0.jar,
  lib/ext/antlr-2.7.7.jar
diff --git a/de.bmotionstudio.gef.editor/build.properties b/de.bmotionstudio.gef.editor/build.properties
index 060f13bf792078f5816c4cb72ea98a6ce9d6f062..a433f56191f5a8f12e1f8259edcce7e36b0298d2 100644
--- a/de.bmotionstudio.gef.editor/build.properties
+++ b/de.bmotionstudio.gef.editor/build.properties
@@ -5,10 +5,5 @@ bin.includes = plugin.xml,\
                .,\
                icons/,\
                schema/,\
-               lib/,\
-               lib/ext/xstream-1.4.3.jar,\
-               lib/ext/xmlpull-1.1.3.1.jar,\
-               lib/ext/groovy-2.0.5.jar,\
-               lib/ext/asm-4.0.jar,\
-               lib/ext/antlr-2.7.7.jar
+               lib/ext/
 
diff --git a/de.bmotionstudio.gef.editor/lib/ext/ant-antlr-1.8.4.jar b/de.bmotionstudio.gef.editor/lib/ext/ant-antlr-1.8.4.jar
deleted file mode 100644
index d375add78542222feb416561e84de767f30d8fd2..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/lib/ext/ant-antlr-1.8.4.jar and /dev/null differ
diff --git a/de.bmotionstudio.gef.editor/lib/ext/xmlpull-1.1.3.1.jar b/de.bmotionstudio.gef.editor/lib/ext/xmlpull-1.1.3.1.jar
deleted file mode 100644
index cbc149d0d5559b10c8fc059a5a0efa44796a3662..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/lib/ext/xmlpull-1.1.3.1.jar and /dev/null differ
diff --git a/de.bmotionstudio.gef.editor/lib/ext/xpp3_min-1.1.4c.jar b/de.bmotionstudio.gef.editor/lib/ext/xpp3_min-1.1.4c.jar
deleted file mode 100644
index 813a9a830bd0c09bfb45084633ccbe88ba64498f..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/lib/ext/xpp3_min-1.1.4c.jar and /dev/null differ
diff --git a/de.bmotionstudio.gef.editor/lib/ext/xstream-1.4.3.jar b/de.bmotionstudio.gef.editor/lib/ext/xstream-1.4.3.jar
deleted file mode 100644
index 815ed039b3a1c5fffbdefaabc2c1e673fa67e58b..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/lib/ext/xstream-1.4.3.jar and /dev/null differ
diff --git a/de.prob.core/.classpath b/de.prob.core/.classpath
index 0e660843d5934907cbf4e16f5a231e34d19ff022..bb1ae0592818db067d6599e1a8f034a51349b613 100644
--- a/de.prob.core/.classpath
+++ b/de.prob.core/.classpath
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/xstream-1.2.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/commons-codec-1.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/xmlpull-1.1.3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/xpp3_min-1.1.4c.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/xstream-1.4.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/answerparser-2.4.8-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/bparser-2.4.8-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/cliparser-2.4.8-SNAPSHOT.jar"/>
diff --git a/de.prob.core/META-INF/MANIFEST.MF b/de.prob.core/META-INF/MANIFEST.MF
index 956daf6d6a510029b442335c3c98624693492895..2be2f97ea6d9fd8f5d6a85da0a431b035b665c33 100644
--- a/de.prob.core/META-INF/MANIFEST.MF
+++ b/de.prob.core/META-INF/MANIFEST.MF
@@ -11,7 +11,28 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
 Bundle-ActivationPolicy: lazy
 Eclipse-BundleShape: dir
 Bundle-Vendor: HHU Düsseldorf STUPS Group
-Export-Package: de.be4.classicalb.core.parser,
+Export-Package: com.thoughtworks.xstream,
+ com.thoughtworks.xstream.annotations,
+ com.thoughtworks.xstream.converters,
+ com.thoughtworks.xstream.converters.basic,
+ com.thoughtworks.xstream.converters.collections,
+ com.thoughtworks.xstream.converters.enums,
+ com.thoughtworks.xstream.converters.extended,
+ com.thoughtworks.xstream.converters.javabean,
+ com.thoughtworks.xstream.converters.reflection,
+ com.thoughtworks.xstream.core,
+ com.thoughtworks.xstream.core.util,
+ com.thoughtworks.xstream.io,
+ com.thoughtworks.xstream.io.binary,
+ com.thoughtworks.xstream.io.copy,
+ com.thoughtworks.xstream.io.json,
+ com.thoughtworks.xstream.io.naming,
+ com.thoughtworks.xstream.io.path,
+ com.thoughtworks.xstream.io.xml,
+ com.thoughtworks.xstream.io.xml.xppdom,
+ com.thoughtworks.xstream.mapper,
+ com.thoughtworks.xstream.persistence,
+ de.be4.classicalb.core.parser,
  de.be4.classicalb.core.parser.analysis,
  de.be4.classicalb.core.parser.analysis.checking,
  de.be4.classicalb.core.parser.analysis.pragma,
@@ -103,4 +124,7 @@ Bundle-ClassPath: .,
  lib/dependencies/parserbase-2.4.8-SNAPSHOT.jar,
  lib/dependencies/prologlib-2.4.8-SNAPSHOT.jar,
  lib/dependencies/unicode-2.4.8-SNAPSHOT.jar,
- lib/dependencies/xstream-1.2.2.jar
+ lib/dependencies/commons-codec-1.6.jar,
+ lib/dependencies/xmlpull-1.1.3.1.jar,
+ lib/dependencies/xpp3_min-1.1.4c.jar,
+ lib/dependencies/xstream-1.4.3.jar
diff --git a/de.prob.core/build.gradle b/de.prob.core/build.gradle
index 1501534797fca91bf3a2df7521687b7887cf877c..82ad7bd0a0355e26c646e7ab8a31e8f5fb3d5234 100644
--- a/de.prob.core/build.gradle
+++ b/de.prob.core/build.gradle
@@ -14,4 +14,5 @@ dependencies {
  compile 'jgrapht:jgrapht:0.8.3'
  compile 'commons-lang:commons-lang:2.6'
  compile 'commons-codec:commons-codec:1.6'
+ compile 'com.thoughtworks.xstream:xstream:1.4.3'
 }
\ No newline at end of file
diff --git a/de.prob.core/build.properties b/de.prob.core/build.properties
index 49631deba8862122aa150b97ef613580e64c4e54..1a6cddddba5661de2f965051163daed933d90407 100644
--- a/de.prob.core/build.properties
+++ b/de.prob.core/build.properties
@@ -5,6 +5,9 @@ bin.includes = META-INF/,\
                .,\
                prob/,\
                lib/,\
-               lib/dependencies/xstream-1.2.2.jar
+               lib/dependencies/commons-codec-1.6.jar,\
+               lib/dependencies/xmlpull-1.1.3.1.jar,\
+               lib/dependencies/xpp3_min-1.1.4c.jar,\
+               lib/dependencies/xstream-1.4.3.jar