diff --git a/distro/build.xml b/distro/build.xml
index 2b5aa563bc5a2b04c21198c6ca1f7d01e2f75694..f79dd6335a610e26b801519a266afaca09e33da0 100644
--- a/distro/build.xml
+++ b/distro/build.xml
@@ -62,15 +62,27 @@
       </fileset>
 			<fileset dir="../modules/activiti-bpmn-converter/target">
         <include name="activiti-bpmn-converter-*.jar" />
+      </fileset>
+			<fileset dir="../modules/activiti-bpmn-layout/target">
+        <include name="activiti-bpmn-layout-*.jar" />
       </fileset>
 			<fileset dir="../modules/activiti-json-converter/target">
         <include name="activiti-json-converter-*.jar" />
+      </fileset>
+			<fileset dir="../modules/activiti-simple-workflow/target">
+        <include name="activiti-simple-workflow-*.jar" />
       </fileset>
 			<fileset dir="../modules/activiti-explorer/target">
         <include name="activiti-explorer-*.jar" />
+      </fileset>
+			<fileset dir="../modules/activiti-common-rest/target">
+        <include name="activiti-common-rest-*.jar" />
       </fileset>
 			<fileset dir="../modules/activiti-modeler/target">
         <include name="activiti-modeler-*.jar" />
+      </fileset>
+			<fileset dir="../modules/activiti-diagram-rest/target">
+        <include name="activiti-diagram-rest-*.jar" />
       </fileset>
 			<fileset dir="../modules/activiti-rest/target">
         <include name="activiti-rest-*.jar" />
@@ -130,7 +142,7 @@
 	<target name="copy.docs" depends="build.docs" unless="nodocs">
 		<!-- COPY XSD -->
 		<copy todir="${target.distro.root}/docs/xsd">
-			<fileset dir="../modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser">
+			<fileset dir="../modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser">
 				<include name="*.xsd" />
 			</fileset>
 		</copy>
diff --git a/modules/activiti-bpmn-converter/pom.xml b/modules/activiti-bpmn-converter/pom.xml
index fd7533c8aca86774c9795a2077c54074dc9e02c8..3794e81d2bfbeafa9e65c4a7ed7a3d12132fafc8 100644
--- a/modules/activiti-bpmn-converter/pom.xml
+++ b/modules/activiti-bpmn-converter/pom.xml
@@ -18,7 +18,7 @@
       org.activiti.bpmn.converter
     </activiti.artifact>
     <activiti.osgi.export.additional>
-      org.activiti.bpmn.constants
+      org.activiti.bpmn.constants,org.activiti.bpmn.util
     </activiti.osgi.export.additional>
   </properties>
 
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/BPMN20.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/BPMN20.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/BPMN20.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/BPMN20.xsd
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/BPMNDI.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/BPMNDI.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/BPMNDI.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/BPMNDI.xsd
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/DC.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/DC.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/DC.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/DC.xsd
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/DI.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/DI.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/DI.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/DI.xsd
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/Semantic.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/Semantic.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/Semantic.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/Semantic.xsd
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.0.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.0.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.0.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.0.xsd
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.10.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.10.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.10.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.10.xsd
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.11.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.11.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.11.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.11.xsd
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.2.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.2.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.2.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.2.xsd
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.3.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.3.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.3.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.3.xsd
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.4.xsd b/modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.4.xsd
similarity index 100%
rename from modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.4.xsd
rename to modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.4.xsd
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParser.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParser.java
index 0716b3bcbd436a357dd39a9d7e492570b8b6762a..a9b0df93b5fe67de2696d70d8a364f02c4b6fd2d 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParser.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParser.java
@@ -30,21 +30,6 @@ import org.activiti.engine.impl.el.ExpressionManager;
  */
 public class BpmnParser {
   
-  /**
-   * The BPMN 2.0 namespace
-   */
-  public static final String BPMN20_NS = "http://www.omg.org/spec/BPMN/20100524/MODEL";
-  
-  /**
-   * The location of the BPMN 2.0 XML schema.
-   */
-  public static final String BPMN_20_SCHEMA_LOCATION = "org/activiti/impl/bpmn/parser/BPMN20.xsd";
-
-  /**
-   * The namespace of the Activiti custom BPMN extensions.
-   */
-  public static final String ACTIVITI_BPMN_EXTENSIONS_NS = "http://activiti.org/bpmn";
-  
   /**
    * The namepace of the BPMN 2.0 diagram interchange elements.
    */
@@ -60,11 +45,6 @@ public class BpmnParser {
    */
   public static final String OMG_DI_NS = "http://www.omg.org/spec/DD/20100524/DI";
 
-  /**
-   * The Schema-Instance namespace.
-   */
-  public static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
-
   protected ExpressionManager expressionManager;
   protected ActivityBehaviorFactory activityBehaviorFactory;
   protected ListenerFactory listenerFactory;