diff --git a/org.eventb.texteditor.parsers/.classpath b/org.eventb.texteditor.parsers/.classpath
index d26fb1bcafe415fbed02fa81558bee1ab23397a8..082674f0cbd74fbd5cdd83544e87b6a524699aff 100644
--- a/org.eventb.texteditor.parsers/.classpath
+++ b/org.eventb.texteditor.parsers/.classpath
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/prologlib-2.4.22-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-14.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/bparser-2.4.28-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/bparser-2.4.22-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/eventbstruct-2.4.28-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/guava-14.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jsr305-1.3.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/parserbase-2.4.22-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/prologlib-2.4.22-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/bparser-2.4.28-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/parserbase-2.4.28-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/prologlib-2.4.28-SNAPSHOT.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
diff --git a/org.eventb.texteditor.parsers/META-INF/MANIFEST.MF b/org.eventb.texteditor.parsers/META-INF/MANIFEST.MF
index f490b4c75c97bb502ce815ec94ca84df77af29e8..3b624b148255c16ab00043b8b2be90c74eb2bbbc 100644
--- a/org.eventb.texteditor.parsers/META-INF/MANIFEST.MF
+++ b/org.eventb.texteditor.parsers/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: lib/bparser-2.4.22-SNAPSHOT.jar,
  lib/eventbstruct-2.4.28-SNAPSHOT.jar,
+ lib/guava-14.0.1.jar,
  lib/jsr305-1.3.9.jar,
  lib/parserbase-2.4.22-SNAPSHOT.jar,
- lib/guava-14.0.1.jar,
  lib/prologlib-2.4.22-SNAPSHOT.jar
 Export-Package: com.google.common.annotations,
  com.google.common.base,
@@ -26,12 +26,31 @@ Export-Package: com.google.common.annotations,
  com.google.common.primitives,
  com.google.common.reflect,
  com.google.common.util.concurrent,
+ 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,
+ de.be4.classicalb.core.parser.analysis.pragma.internal,
+ de.be4.classicalb.core.parser.analysis.prolog,
+ de.be4.classicalb.core.parser.analysis.transforming,
+ de.be4.classicalb.core.parser.exceptions,
+ de.be4.classicalb.core.parser.lexer,
+ de.be4.classicalb.core.parser.node,
+ de.be4.classicalb.core.parser.parser,
+ de.be4.classicalb.core.pragma.analysis,
+ de.be4.classicalb.core.pragma.lexer,
+ de.be4.classicalb.core.pragma.node,
+ de.be4.classicalb.core.preparser.analysis,
+ de.be4.classicalb.core.preparser.lexer,
+ de.be4.classicalb.core.preparser.node,
+ de.be4.classicalb.core.preparser.parser,
  de.be4.eventb.core.parser,
  de.be4.eventb.core.parser.analysis,
  de.be4.eventb.core.parser.lexer,
  de.be4.eventb.core.parser.node,
  de.be4.eventb.core.parser.parser,
  de.hhu.stups.sablecc.patch,
+ de.prob.parserbase,
  de.prob.prolog.match,
  de.prob.prolog.output,
  de.prob.prolog.term,
diff --git a/org.eventb.texteditor.parsers/build.properties b/org.eventb.texteditor.parsers/build.properties
index cef44f80845b9badca4b7f77f0a98999bd03f6f5..c81cfac407283fceda6836d5f99a57327b833955 100644
--- a/org.eventb.texteditor.parsers/build.properties
+++ b/org.eventb.texteditor.parsers/build.properties
@@ -1,5 +1,3 @@
 output.. = bin/
 bin.includes = META-INF/,\
-               lib/,\
-               lib/guava-14.0.1.jar,\
-               lib/prologlib-2.4.22-SNAPSHOT.jar
+               lib/
diff --git a/org.eventb.texttools/META-INF/MANIFEST.MF b/org.eventb.texttools/META-INF/MANIFEST.MF
index 7576876cf1cc49f6a33146b9162a2b7b0d941a80..a27ba55f2ab8d87537ee978d184290d74e1a4991 100644
--- a/org.eventb.texttools/META-INF/MANIFEST.MF
+++ b/org.eventb.texttools/META-INF/MANIFEST.MF
@@ -16,8 +16,7 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)",
  org.eventb.texteditor.parsers;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: de.be4.eventb.core.parser.node,
- org.eventb.texttools,
+Export-Package: org.eventb.texttools,
  org.eventb.texttools.formulas,
  org.eventb.texttools.merge,
  org.eventb.texttools.model.texttools,