diff --git a/README.md b/README.md
index 686b1a9..ea9da6b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![Galleon Pack Template Java CI](https://github.com/wildfly/wildfly-feature-pack-template/workflows/Galleon%20Pack%20Template%20Java%20CI/badge.svg)
 
-# Wildfly Galleon Feature Pack Template
+# Wildfly Camunda Feature Pack
 A template Galleon feature pack to provision a new subsystem into WildFly using Galleon. 
 It is runnable as-is, and provides a very basic subsystem which supplies a CDI `@Produces` method. 
 Instances from this `@Produces` method are available to your deployments when your subsystem is 
@@ -27,31 +27,6 @@ and it will build everything, and run the testsuite. An example patched server
 will be created in the `build/target/` directory. We will explore how to use
 Galleon CLI to provision a server from the command line later on.
 
-## Running the example application
-
-The example application lives in the 
-[`example/`](example)
-directory. It is a trivial application exposing a 
-[REST endpoint](example/src/main/java/org/wildfly/extension/feature/pack/template/example/JaxRsResource.java) 
-which is injected with an instance of the bean we have a `@Produces` for in the subsystem's dependency 
-[`dependency/`](dependency)
-folder. 
-The `@ExampleQualifier` Qualifier is also defined in the `dependency/` folder. 
-
-Start the server by running
-```
-./build/target/wildfly-<WildFly Version>-template-<Template Version>/bin/standalone.sh
-```
- 
-In another terminal window run:
-```
-mvn package wildfly:deploy -pl example
-```
-and see the application gets deployed.
-
-Then go to http://localhost:8080/example/greeting and see the hello message. It just says 'Welcome' in a different
-language each time you refresh the page.
-
 ## Project structure
 
 The [root POM](pom.xml) contains the
@@ -59,7 +34,7 @@ WildFly versions we wrote this template Galleon feature pack for at the top of t
 However, newer versions of WildFly are generally backwards compatible (unless you really dug into some server
 internals) so you can install it into a later version of WildFly. 
 
-It adds an additional layer called `template-layer`, which contains a new
+It adds an additional layer called `camunda-layer`, which contains a new
 subsystem called `template-subsystem`. This subsystem is implemented in the 
 `org.wildfly.extension.template-subsystem` module which in turn has a dependency
 on the `org.wildfly.template-dependency` module. The latter module basically
@@ -245,9 +220,9 @@ WildFly feature pack. We will add it in the next step.
 #### Install our layer
 Next we want to install our layer. We do this by running:
 ```
-~/Downloads/galleon-4.2.5.Final/bin/galleon.sh install org.wildfly.extras.wildfly-feature-pack-template:template-feature-pack:1.0.0.Alpha-SNAPSHOT --layers=template-layer --dir=wildfly
+~/Downloads/galleon-4.2.5.Final/bin/galleon.sh install de.ybroeker.wildfly-camunda-feature-pack:template-feature-pack:1.0.0.Alpha-SNAPSHOT --layers=template-layer --dir=wildfly
 ``` 
-`org.wildfly.extras.wildfly-feature-pack-template:template-feature-pack:1.0.0.Alpha-SNAPSHOT`
+`de.ybroeker.wildfly-camunda-feature-pack:template-feature-pack:1.0.0.Alpha-SNAPSHOT`
 is the Maven GAV of the Galleon feature pack (i.e. what we have in 
 [`feature-pack/pom.xml`](feature-pack/pom.xml)).
 
@@ -309,5 +284,5 @@ To debug failures in the provisioning of the server of the creation of the Galle
 good to run `mvn install -X` which will provide more logging.
 
 If the above doesn't shed any light on your problems, it can also be good to look at the 
-`feature-pack/target/layout/org.wildfly.extras.wildfly-feature-pack-template/template-feature-pack/<version>/`
-directory to see if everything you expected there.
\ No newline at end of file
+`feature-pack/target/layout/de.ybroeker.wildfly-camunda-feature-pack/template-feature-pack/<version>/`
+directory to see if everything you expected there.
diff --git a/build/pom.xml b/build/pom.xml
index d40f377..debcecd 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -19,27 +19,27 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>template-parent</artifactId>
-        <groupId>org.wildfly.extras.wildfly-feature-pack-template</groupId>
+        <artifactId>wildfly-camunda-bpm-pack-parent</artifactId>
+        <groupId>de.ybroeker.wildfly-camunda-feature-pack</groupId>
         <version>1.0.0.Alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>template-build</artifactId>
-    <name>WildFly Galleon FP Template - Build</name>
+    <artifactId>wildfly-camunda-feature-pack-build</artifactId>
+    <name>Wildfly Camunda FP - Build</name>
 
     <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>template-feature-pack</artifactId>
+            <artifactId>wildfly-camunda-feature-pack</artifactId>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>template-feature-pack</artifactId>
+            <artifactId>wildfly-camunda-feature-pack</artifactId>
             <type>zip</type>
             <exclusions>
                 <exclusion>
@@ -78,7 +78,7 @@
                                 </feature-pack>
                                 <feature-pack>
                                     <groupId>${project.groupId}</groupId>
-                                    <artifactId>template-feature-pack</artifactId>
+                                    <artifactId>wildfly-camunda-feature-pack</artifactId>
                                     <version>${project.version}</version>
                                     <inherit-packages>false</inherit-packages>
                                     <inherit-configs>false</inherit-configs>
@@ -97,7 +97,7 @@
                                         <layer>management</layer>
                                         <!-- Layers from this FP  -->
                                         <!-- TODO - rename to what you have called your layer -->
-                                        <layer>template-layer</layer>
+                                        <layer>camunda-layer</layer>
                                     </layers>
                                 </config>
                             </configurations>
@@ -137,4 +137,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/dependency/pom.xml b/dependency/pom.xml
deleted file mode 100644
index 723a976..0000000
--- a/dependency/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2019 Red Hat, Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>template-parent</artifactId>
-        <groupId>org.wildfly.extras.wildfly-feature-pack-template</groupId>
-        <version>1.0.0.Alpha-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>template-dependency</artifactId>
-    <name>WildFly Galleon FP Template - Subsystem Dependency</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-            <!--
-                This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                projects that depend on this project.
-            -->
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/dependency/src/main/java/org/wildfly/feature/pack/template/dependency/ExampleProducer.java b/dependency/src/main/java/org/wildfly/feature/pack/template/dependency/ExampleProducer.java
deleted file mode 100644
index e92866b..0000000
--- a/dependency/src/main/java/org/wildfly/feature/pack/template/dependency/ExampleProducer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.wildfly.feature.pack.template.dependency;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Produces;
-
-/**
- * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
- */
-public class ExampleProducer {
-    private static final AtomicInteger COUNTER = new AtomicInteger();
-
-    private static final List<String> MESSAGES = Collections.unmodifiableList(Arrays.asList(
-            "Welcome! (English)",
-            "Willkommen! (German)",
-            "Velkommen! (Norwegian)",
-            "Bienvenidos! (Spanish)"));
-
-    @Produces
-    @RequestScoped
-    @ExampleQualifier
-    public Message getWelcomeMessage() {
-        int counter = COUNTER.getAndIncrement();
-        int index = counter % 4;
-        String msg = MESSAGES.get(index);
-        return new Message(msg);
-    }
-}
diff --git a/dependency/src/main/java/org/wildfly/feature/pack/template/dependency/ExampleQualifier.java b/dependency/src/main/java/org/wildfly/feature/pack/template/dependency/ExampleQualifier.java
deleted file mode 100644
index 47246b7..0000000
--- a/dependency/src/main/java/org/wildfly/feature/pack/template/dependency/ExampleQualifier.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.wildfly.feature.pack.template.dependency;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
- */
-@Qualifier
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
-public @interface ExampleQualifier {
-}
diff --git a/dependency/src/main/java/org/wildfly/feature/pack/template/dependency/Message.java b/dependency/src/main/java/org/wildfly/feature/pack/template/dependency/Message.java
deleted file mode 100644
index cb5fc12..0000000
--- a/dependency/src/main/java/org/wildfly/feature/pack/template/dependency/Message.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.wildfly.feature.pack.template.dependency;
-
-/**
- * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
- */
-public class Message {
-    private final String message;
-
-    public Message() {
-        this.message = null;
-    }
-
-    public Message(String message) {
-        this.message = message;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}
diff --git a/dependency/src/main/resources/META-INF/beans.xml b/dependency/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/example/pom.xml b/example/pom.xml
deleted file mode 100644
index bc7d35e..0000000
--- a/example/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2019 Red Hat, Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>template-parent</artifactId>
-        <groupId>org.wildfly.extras.wildfly-feature-pack-template</groupId>
-        <version>1.0.0.Alpha-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>template-example</artifactId>
-    <packaging>war</packaging>
-    <name>WildFly Galleon FP Template - Example</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-            <!--
-                This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                projects that depend on this project.
-            -->
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>template-dependency</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>example</finalName>
-    </build>
-</project>
\ No newline at end of file
diff --git a/example/src/main/java/org/wildfly/extension/feature/pack/template/example/JaxRsResource.java b/example/src/main/java/org/wildfly/extension/feature/pack/template/example/JaxRsResource.java
deleted file mode 100644
index c1a5923..0000000
--- a/example/src/main/java/org/wildfly/extension/feature/pack/template/example/JaxRsResource.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.wildfly.extension.feature.pack.template.example;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-
-import org.wildfly.feature.pack.template.dependency.ExampleQualifier;
-import org.wildfly.feature.pack.template.dependency.Message;
-
-/**
- * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
- */
-@RequestScoped
-@Path("/")
-public class JaxRsResource {
-
-    @Inject
-    @ExampleQualifier
-    Message greeting;
-
-
-    @GET
-    @Path("/greeting")
-    public String getGreeting() {
-        return greeting.getMessage() + "!";
-    }
-}
diff --git a/example/src/main/webapp/WEB-INF/web.xml b/example/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f210729..0000000
--- a/example/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="3.0"
-         xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-         metadata-complete="false">
-
-    <servlet-mapping>
-        <servlet-name>javax.ws.rs.core.Application</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-</web-app>
diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
index 94c12fb..ecc3a03 100644
--- a/feature-pack/pom.xml
+++ b/feature-pack/pom.xml
@@ -19,16 +19,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>template-parent</artifactId>
-        <groupId>org.wildfly.extras.wildfly-feature-pack-template</groupId>
+        <artifactId>wildfly-camunda-bpm-pack-parent</artifactId>
+        <groupId>de.ybroeker.wildfly-camunda-feature-pack</groupId>
         <version>1.0.0.Alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>template-feature-pack</artifactId>
+    <artifactId>wildfly-camunda-feature-pack</artifactId>
     <packaging>pom</packaging>
 
-    <name>WildFly Galleon FP Template - Galleon Pack</name>
+    <name>Wildfly Camunda Feature Pack - Galleon Pack</name>
 
     <properties>
         <license.output.directory>${project.build.directory}/resources/content/docs/licenses</license.output.directory>
@@ -65,7 +65,7 @@
                 <version>${version.org.wildfly.galleon-plugins}</version>
                 <executions>
                     <execution>
-                        <id>wildfly-template-feature-pack-build</id>
+                        <id>wildfly-camunda-feature-pack-build</id>
                         <goals>
                             <goal>build-feature-pack</goal>
                         </goals>
@@ -89,9 +89,8 @@
                         <phase>process-resources</phase>
                         <configuration>
                             <sortByGroupIdAndArtifactId>true</sortByGroupIdAndArtifactId>
-                            <!-- TODO Give these the same name as you changed the xml to -->
-                            <licensesConfigFile>src/license/template-feature-pack-licenses.xml</licensesConfigFile>
-                            <licensesOutputFile>${license.output.directory}/template-feature-pack-licenses.xml</licensesOutputFile>
+                            <licensesConfigFile>src/license/wildfly-camunda-feature-pack-licenses.xml</licensesConfigFile>
+                            <licensesOutputFile>${license.output.directory}/wildfly-camunda-feature-pack-licenses.xml</licensesOutputFile>
                         </configuration>
                     </execution>
                 </executions>
@@ -108,23 +107,42 @@
         </dependency>
 
 
-
-        <!-- Project modules -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>template-dependency</artifactId>
-            <scope>provided</scope>
+            <groupId>org.camunda.bpm.wildfly</groupId>
+            <artifactId>camunda-wildfly-modules</artifactId>
+            <version>${version.org.camunda.bpm}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>template-subsystem</artifactId>
-            <scope>provided</scope>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.11</version>
         </dependency>
 
-
-
-        <!-- Normal dependencies -->
-
+        <!-- Fixed Versions to avoid conflicts with versions bundled by wildfly-->
+<!--        <dependency>-->
+<!--            <groupId>org.codehaus.groovy</groupId>-->
+<!--            <artifactId>groovy-all</artifactId>-->
+<!--            <version>2.4.13</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.httpcomponents</groupId>-->
+<!--            <artifactId>httpclient</artifactId>-->
+<!--            <version>4.5.9</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.httpcomponents</groupId>-->
+<!--            <artifactId>httpcore</artifactId>-->
+<!--            <version>4.4.11</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
 
     </dependencies>
-</project>
\ No newline at end of file
+
+</project>
diff --git a/feature-pack/src/license/template-feature-pack-licenses.xml b/feature-pack/src/license/wildfly-camunda-galleon-pack-licenses.xml
similarity index 68%
rename from feature-pack/src/license/template-feature-pack-licenses.xml
rename to feature-pack/src/license/wildfly-camunda-galleon-pack-licenses.xml
index e3277a6..261adf6 100644
--- a/feature-pack/src/license/template-feature-pack-licenses.xml
+++ b/feature-pack/src/license/wildfly-camunda-galleon-pack-licenses.xml
@@ -22,8 +22,8 @@ TODO: Rename this file to something which matches our Galleon feature pack name
     <dependencies>
         <!-- Project dependencies -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>template-dependency</artifactId>
+            <groupId>org.camunda.bpm.wildfly</groupId>
+            <artifactId>camunda-wildfly-subsystem</artifactId>
             <licenses>
                 <license>
                     <name>Apache License 2.0</name>
@@ -32,21 +32,8 @@ TODO: Rename this file to something which matches our Galleon feature pack name
                 </license>
             </licenses>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>template-subsystem</artifactId>
-            <licenses>
-                <license>
-                    <name>Apache License 2.0</name>
-                    <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-                    <distribution>repo</distribution>
-                </license>
-            </licenses>
-        </dependency>
-
-
 
         <!-- External dependencies -->
 
     </dependencies>
-</licenseSummary>
\ No newline at end of file
+</licenseSummary>
diff --git a/feature-pack/src/main/resources/feature_groups/camunda-subsystem.xml b/feature-pack/src/main/resources/feature_groups/camunda-subsystem.xml
new file mode 100644
index 0000000..9121b13
--- /dev/null
+++ b/feature-pack/src/main/resources/feature_groups/camunda-subsystem.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2019 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<feature-group-spec name="camunda-subsystem" xmlns="urn:jboss:galleon:feature-group:1.0">
+  <feature spec="subsystem.camunda-bpm-platform">
+
+    <feature spec="subsystem.camunda-bpm-platform.process-engines">
+      <param name="process-engines" value="default"/>
+      <param name="name" value="default"/>
+      <param name="default" value="true"/>
+      <param name="datasource" value="java:jboss/datasources/ProcessEngine"/>
+      <param name="history-level" value="full"/>
+      <param name="properties" value="{jobExecutorAcquisitionName=default, isAutoSchemaUpdate=true, authorizationEnabled=true, jobExecutorDeploymentAware=true, historyCleanupBatchWindowStartTime=00:01}"/>
+
+      <feature spec="subsystem.camunda-bpm-platform.process-engines.plugins">
+        <param name="class" value="org.camunda.bpm.application.impl.event.ProcessApplicationEventListenerPlugin"/>
+      </feature>
+      <feature spec="subsystem.camunda-bpm-platform.process-engines.plugins">
+        <param name="class" value="org.camunda.spin.plugin.impl.SpinProcessEnginePlugin"/>
+      </feature>
+      <feature spec="subsystem.camunda-bpm-platform.process-engines.plugins">
+        <param name="class" value="org.camunda.connect.plugin.impl.ConnectProcessEnginePlugin"/>
+      </feature>
+    </feature>
+
+    <feature spec="subsystem.camunda-bpm-platform.job-executor">
+      <param name="job-executor" value="default"/>
+      <param name="core-threads" value="3"/>
+      <param name="max-threads"  value="5"/>
+      <param name="queue-length" value="10"/>
+
+      <feature spec="subsystem.camunda-bpm-platform.job-executor.job-acquisitions">
+        <param name="job-acquisitions" value="default"/>
+        <param name="name" value="default"/>
+        <param name="properties" value="{lockTimeInMillis=300000, waitTimeInMillis=5000, maxJobsPerAcquisition=3}"/>
+      </feature>
+    </feature>
+  </feature>
+
+  <feature spec="subsystem.datasources">
+    <feature spec="subsystem.datasources.data-source">
+      <param name="data-source" value="ProcessEngine"/>
+      <param name="enabled" value="true"/>
+      <param name="use-java-context" value="true"/>
+      <param name="jndi-name" value="java:jboss/datasources/ProcessEngine"/>
+      <param name="connection-url" value="&quot;jdbc:h2:./camunda-h2-dbs/process-engine;DB_CLOSE_DELAY=-1;MVCC=TRUE;DB_CLOSE_ON_EXIT=FALSE&quot;"/>
+      <param name="driver-name" value="h2"/>
+      <param name="user-name" value="sa"/>
+      <param name="password" value="sa"/>
+      <param name="jta" value="true"/>
+      <param name="transaction-isolation" value="TRANSACTION_READ_COMMITTED" />
+    </feature>
+  </feature>
+
+</feature-group-spec>
diff --git a/feature-pack/src/main/resources/feature_groups/template-subsystem.xml b/feature-pack/src/main/resources/feature_groups/template-subsystem.xml
deleted file mode 100644
index bf1ffe2..0000000
--- a/feature-pack/src/main/resources/feature_groups/template-subsystem.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2019 Red Hat, Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<!-- TODO Rename this file and the occurrences of 'template-subsystem' to what you set in TemplateExtension.SUBSYSTEM_NAME -->
-<feature-group-spec name="template-subsystem" xmlns="urn:jboss:galleon:feature-group:1.0">
-    <feature spec="subsystem.template-subsystem"/>
-</feature-group-spec>
\ No newline at end of file
diff --git a/feature-pack/src/main/resources/layers/standalone/template-layer/layer-spec.xml b/feature-pack/src/main/resources/layers/standalone/camunda-layer/layer-spec.xml
similarity index 70%
rename from feature-pack/src/main/resources/layers/standalone/template-layer/layer-spec.xml
rename to feature-pack/src/main/resources/layers/standalone/camunda-layer/layer-spec.xml
index ee31a2b..a950b83 100644
--- a/feature-pack/src/main/resources/layers/standalone/template-layer/layer-spec.xml
+++ b/feature-pack/src/main/resources/layers/standalone/camunda-layer/layer-spec.xml
@@ -14,24 +14,24 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<!--
-    TODO Replace 'template-layer' in both 'name' and the name of the directory
-    with the name of your layer
--->
-<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="template-layer">
+<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="camunda-layer">
     <dependencies>
+        <!-- TODO figure out which Wildfly layers are actually required -->
         <layer name="cdi"/>
+        <layer name="transactions"/>
+        <layer name="resource-adapters"/>
+        <layer name="h2-driver"/>
     </dependencies>
 
-    <feature-group name="template-subsystem"/>
+    <feature-group name="camunda-subsystem"/>
 
     <!--
-    We already bring in our extension/subsystem module in /feature-pack/wildfly-feature-pack-build.xml since we are adding
+    We already bring in our extension/subsystem module in /galleon-pack/wildfly-feature-pack-build.xml since we are adding
     a configurable feature. If the feature needs additional modules we should add those in
     TemplateSubsystemDefinition.registerAdditionalRuntimePackages(). In some cases, e.g. if this layer brings in a
     set of other layers, and the interaction of those needs some additional modules, we can add them here.
 
-    If we are not using a feature so that we don't have a /feature-pack/wildfly-feature-pack-build.xml and thus
+    If we are not using a feature so that we don't have a /galleon-pack/wildfly-feature-pack-build.xml and thus
     no TemplateSubsystemDefinition class, we would add modules here.
 
     In all cases, if we need to add some content other than modules, we would add those as packages here.
@@ -39,4 +39,4 @@
         <package name="my.additional.module"/>
     </packages>
     -->
-</layer-spec>
\ No newline at end of file
+</layer-spec>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/2.10.0/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/2.10.0/module.xml
new file mode 100644
index 0000000..dfdba89
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/2.10.0/module.xml
@@ -0,0 +1,12 @@
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.jackson.core.jackson-annotations" slot="2.10.0" >
+  <resources>
+    <artifact name="${com.fasterxml.jackson.core:jackson-annotations}" />
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+    <module name="com.fasterxml.jackson.core.jackson-core" slot="2.10.0" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/2.10.0/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/2.10.0/module.xml
new file mode 100644
index 0000000..775da09
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/2.10.0/module.xml
@@ -0,0 +1,11 @@
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.jackson.core.jackson-core" slot="2.10.0" >
+  <resources>
+    <artifact name="${com.fasterxml.jackson.core:jackson-core}" />
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/2.10.0/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/2.10.0/module.xml
new file mode 100644
index 0000000..116e1fd
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/2.10.0/module.xml
@@ -0,0 +1,13 @@
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.jackson.core.jackson-databind" slot="2.10.0" >
+  <resources>
+    <artifact name="${com.fasterxml.jackson.core:jackson-databind}" />
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+    <module name="com.fasterxml.jackson.core.jackson-core" export="true" slot="2.10.0" />
+    <module name="com.fasterxml.jackson.core.jackson-annotations" export="true" slot="2.10.0" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/uuid/java-uuid-generator/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/uuid/java-uuid-generator/main/module.xml
new file mode 100644
index 0000000..d4feb2f
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/uuid/java-uuid-generator/main/module.xml
@@ -0,0 +1,11 @@
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.uuid.java-uuid-generator">
+    <resources>
+        <artifact name="${com.fasterxml.uuid:java-uuid-generator}"/>
+    </resources>
+
+    <dependencies>
+
+        <module name="javax.api" />
+
+    </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/jayway/jsonpath/json-path/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/jayway/jsonpath/json-path/main/module.xml
new file mode 100644
index 0000000..562eda1
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/jayway/jsonpath/json-path/main/module.xml
@@ -0,0 +1,14 @@
+<module xmlns="urn:jboss:module:1.5" name="com.jayway.jsonpath.json-path">
+  <resources>
+    <artifact name="${com.jayway.jsonpath:json-path}" />
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+    <module name="com.fasterxml.jackson.core.jackson-databind" slot="2.10.0"/>
+    <module name="org.slf4j" />
+    <module name="net.minidev.json-smart" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/commons-codec/commons-codec/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/commons-codec/commons-codec/main/module.xml
new file mode 100644
index 0000000..66107e0
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/commons-codec/commons-codec/main/module.xml
@@ -0,0 +1,11 @@
+<module xmlns="urn:jboss:module:1.5" name="commons-codec.commons-codec">
+  <resources>
+    <artifact name="${commons-codec:commons-codec}" />
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/commons-logging/commons-logging/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/commons-logging/commons-logging/main/module.xml
new file mode 100644
index 0000000..1e35217
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/commons-logging/commons-logging/main/module.xml
@@ -0,0 +1,11 @@
+<module xmlns="urn:jboss:module:1.5" name="commons-logging.commons-logging">
+  <resources>
+    <artifact name="${commons-logging:commons-logging}" />
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/net/minidev/accessors-smart/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/net/minidev/accessors-smart/main/module.xml
new file mode 100644
index 0000000..33ae3bb
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/net/minidev/accessors-smart/main/module.xml
@@ -0,0 +1,5 @@
+<module xmlns="urn:jboss:module:1.5" name="net.minidev.accessors-smart">
+  <resources>
+    <artifact name="${net.minidev:accessors-smart}" />
+  </resources>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/net/minidev/json-smart/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/net/minidev/json-smart/main/module.xml
new file mode 100644
index 0000000..e259d8e
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/net/minidev/json-smart/main/module.xml
@@ -0,0 +1,9 @@
+<module xmlns="urn:jboss:module:1.5" name="net.minidev.json-smart">
+  <resources>
+    <artifact name="${net.minidev:json-smart}" />
+  </resources>
+
+  <dependencies>
+    <module name="net.minidev.accessors-smart" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/httpclient/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/httpclient/main/module.xml
new file mode 100644
index 0000000..cc9593f
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/httpclient/main/module.xml
@@ -0,0 +1,16 @@
+<module xmlns="urn:jboss:module:1.5" name="org.apache.httpcomponents.httpclient">
+  <resources>
+    <artifact name="${org.apache.httpcomponents:httpclient}" />
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+
+    <module name="commons-logging.commons-logging" />
+    <module name="commons-codec.commons-codec" />
+
+    <module name="org.apache.httpcomponents.httpcore" export="true" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/httpcore/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/httpcore/main/module.xml
new file mode 100644
index 0000000..a66fe34
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/httpcore/main/module.xml
@@ -0,0 +1,14 @@
+<module xmlns="urn:jboss:module:1.5" name="org.apache.httpcomponents.httpcore">
+  <resources>
+    <artifact name="${org.apache.httpcomponents:httpcore}" />
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+
+    <module name="commons-logging.commons-logging" />
+    <module name="commons-codec.commons-codec" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine-plugin-connect/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine-plugin-connect/main/module.xml
new file mode 100644
index 0000000..0b57fcb
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine-plugin-connect/main/module.xml
@@ -0,0 +1,17 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.camunda-engine-plugin-connect">
+  <resources>
+    <artifact name="${org.camunda.bpm:camunda-engine-plugin-connect}"/>
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+
+    <module name="org.camunda.bpm.camunda-engine" />
+
+    <module name="org.camunda.connect.camunda-connect-core" />
+    <module name="org.camunda.connect.camunda-connect-http-client" services="import" />
+    <module name="org.camunda.connect.camunda-connect-soap-http-client" services="import" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine-plugin-spin/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine-plugin-spin/main/module.xml
new file mode 100644
index 0000000..880beff
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine-plugin-spin/main/module.xml
@@ -0,0 +1,21 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.camunda-engine-plugin-spin">
+    <resources>
+        <artifact name="${org.camunda.bpm:camunda-engine-plugin-spin}"/>
+    </resources>
+
+    <dependencies>
+
+        <module name="javax.api"/>
+        <module name="org.joda.time" slot="2.1"/>
+
+        <module name="org.camunda.commons.camunda-commons-typed-values"/>
+        <module name="org.camunda.commons.camunda-commons-logging"/>
+        <module name="org.camunda.bpm.camunda-engine"/>
+
+        <module name="org.camunda.spin.camunda-spin-core"/>
+        <module name="org.camunda.spin.camunda-spin-dataformat-json-jackson" services="import"/>
+        <module name="org.camunda.spin.camunda-spin-dataformat-xml-dom" services="import"/>
+
+        <module name="org.camunda.bpm.dmn.camunda-engine-feel-scala"/>
+    </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine-plugins/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine-plugins/main/module.xml
new file mode 100644
index 0000000..a5d9d7a
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine-plugins/main/module.xml
@@ -0,0 +1,7 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.camunda-engine-plugins">
+
+  <dependencies>
+    <!-- Add custom engine plugins here -->
+    <!-- <module name="org.camunda.bpm.camunda-custom-engine-plugin" export="true" /> -->
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine/main/module.xml
new file mode 100644
index 0000000..3f1937e
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/camunda-engine/main/module.xml
@@ -0,0 +1,40 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.camunda-engine">
+  <resources>
+    <artifact name="${org.camunda.bpm:camunda-engine}"/>
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+    <module name="javax.transaction.api"/>
+    <module name="javax.enterprise.api" />
+    <module name="javax.inject.api" />
+    <module name="javax.ejb.api" />
+    <module name="javax.xml.bind.api" />
+    <module name="javax.servlet.api" />
+
+    <module name="org.jboss.vfs" />
+
+    <module name="org.mybatis.mybatis" />
+    <module name="com.fasterxml.uuid.java-uuid-generator"/>
+    <module name="org.joda.time" slot="2.1" />
+    <module name="org.codehaus.groovy.groovy-all" services="import"/>
+
+    <module name="sun.jdk" services="import"/>
+
+    <module name="org.camunda.bpm.model.camunda-xml-model" />
+    <module name="org.camunda.bpm.model.camunda-bpmn-model" />
+    <module name="org.camunda.bpm.model.camunda-cmmn-model" />
+    <module name="org.camunda.bpm.model.camunda-dmn-model" />
+
+    <module name="org.camunda.commons.camunda-commons-logging" />
+    <module name="org.camunda.commons.camunda-commons-utils" />
+    <module name="org.camunda.commons.camunda-commons-typed-values" export="true" />
+    <module name="org.camunda.connect.camunda-connect-core" />
+    <module name="org.camunda.template-engines.camunda-template-engines-freemarker" services="import" />
+    <module name="org.camunda.spin.camunda-spin-core" services="import" />
+
+    <module name="org.camunda.bpm.dmn.camunda-engine-dmn" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-dmn/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-dmn/main/module.xml
new file mode 100644
index 0000000..4e2a21a
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-dmn/main/module.xml
@@ -0,0 +1,18 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.dmn.camunda-engine-dmn">
+  <resources>
+    <artifact name="${org.camunda.bpm.dmn:camunda-engine-dmn}"/>
+  </resources>
+
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="org.joda.time" slot="2.1" />
+    
+    <module name="org.camunda.commons.camunda-commons-utils" />
+    <module name="org.camunda.commons.camunda-commons-logging" />
+    <module name="org.camunda.commons.camunda-commons-typed-values" export="true" />
+    <module name="org.camunda.bpm.model.camunda-dmn-model" />
+    <module name="org.camunda.bpm.dmn.camunda-engine-feel-api" />
+    <module name="org.camunda.bpm.dmn.camunda-engine-feel-juel" />
+    <module name="org.camunda.bpm.dmn.camunda-engine-feel-scala" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-feel-api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-feel-api/main/module.xml
new file mode 100644
index 0000000..86126aa
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-feel-api/main/module.xml
@@ -0,0 +1,5 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.dmn.camunda-engine-feel-api">
+  <resources>
+    <artifact name="${org.camunda.bpm.dmn:camunda-engine-feel-api}"/>
+  </resources>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-feel-juel/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-feel-juel/main/module.xml
new file mode 100644
index 0000000..d819b65
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-feel-juel/main/module.xml
@@ -0,0 +1,12 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.dmn.camunda-engine-feel-juel">
+  <resources>
+    <artifact name="${org.camunda.bpm.dmn:camunda-engine-feel-juel}"></artifact>
+  </resources>
+
+  <dependencies>
+    <module name="org.camunda.bpm.dmn.camunda-engine-feel-api" />
+    <module name="org.camunda.commons.camunda-commons-logging" />
+    <module name="org.camunda.commons.camunda-commons-typed-values" />
+    <module name="org.camunda.commons.camunda-commons-utils" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-feel-scala/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-feel-scala/main/module.xml
new file mode 100644
index 0000000..f2a4dc5
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/dmn/camunda-engine-feel-scala/main/module.xml
@@ -0,0 +1,15 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.dmn.camunda-engine-feel-scala">
+  <resources>
+    <artifact name="${org.camunda.bpm.dmn:camunda-engine-feel-scala}" />
+  </resources>
+
+  <dependencies>
+    <module name="org.slf4j" />
+    <module name="sun.jdk" />
+    <module name="org.camunda.bpm.dmn.camunda-engine-feel-api" />
+    <module name="org.camunda.commons.camunda-commons-typed-values" />
+    <module name="org.camunda.commons.camunda-commons-logging" />
+
+    <module name="org.camunda.bpm.camunda-engine-plugin-spin" optional="true" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/identity/camunda-identity-ldap/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/identity/camunda-identity-ldap/main/module.xml
new file mode 100644
index 0000000..10835b3
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/identity/camunda-identity-ldap/main/module.xml
@@ -0,0 +1,15 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.identity.camunda-identity-ldap">
+  <resources>
+    <artifact name="${org.camunda.bpm.identity:camunda-identity-ldap}"/>
+  </resources>
+
+  <dependencies>
+
+    <module name="sun.jdk" />
+
+    <module name="javax.api" />
+    <module name="org.camunda.bpm.camunda-engine" />
+    <module name="org.camunda.commons.camunda-commons-logging" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-bpmn-model/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-bpmn-model/main/module.xml
new file mode 100644
index 0000000..9a471c6
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-bpmn-model/main/module.xml
@@ -0,0 +1,12 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.model.camunda-bpmn-model">
+  <resources>
+    <artifact name="${org.camunda.bpm.model:camunda-bpmn-model}"/>
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api"/>
+    <module name="org.camunda.bpm.model.camunda-xml-model"/>
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-cmmn-model/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-cmmn-model/main/module.xml
new file mode 100644
index 0000000..3dfecaf
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-cmmn-model/main/module.xml
@@ -0,0 +1,12 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.model.camunda-cmmn-model">
+  <resources>
+    <artifact name="${org.camunda.bpm.model:camunda-cmmn-model}" />
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+    <module name="org.camunda.bpm.model.camunda-xml-model" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-dmn-model/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-dmn-model/main/module.xml
new file mode 100644
index 0000000..20be74e
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-dmn-model/main/module.xml
@@ -0,0 +1,12 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.model.camunda-dmn-model">
+  <resources>
+    <artifact name="${org.camunda.bpm.model:camunda-dmn-model}"/>
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+    <module name="org.camunda.bpm.model.camunda-xml-model" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-xml-model/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-xml-model/main/module.xml
new file mode 100644
index 0000000..d55beda
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/model/camunda-xml-model/main/module.xml
@@ -0,0 +1,11 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.model.camunda-xml-model">
+  <resources>
+    <artifact name="${org.camunda.bpm.model:camunda-xml-model}"/>
+  </resources>
+
+  <dependencies>
+
+    <module name="javax.api" />
+
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/wildfly/camunda-wildfly-subsystem/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/wildfly/camunda-wildfly-subsystem/main/module.xml
new file mode 100644
index 0000000..6b368b7
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/bpm/wildfly/camunda-wildfly-subsystem/main/module.xml
@@ -0,0 +1,50 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.bpm.wildfly.camunda-wildfly-subsystem">
+  <resources>
+    <artifact name="${org.camunda.bpm.wildfly:camunda-wildfly-subsystem}"/>
+  </resources>
+
+  <dependencies>
+    <module name="javax.api" />
+    <module name="javax.transaction.api" />
+    <module name="javax.enterprise.api" />
+    <module name="javax.inject.api" />
+
+    <module name="org.jboss.staxmapper" />
+    <module name="org.jboss.as.controller" />
+    <module name="org.jboss.as.threads" />
+    <module name="org.jboss.threads" />
+    <module name="org.jboss.as.server" />
+    <module name="org.jboss.modules" />
+    <module name="org.jboss.msc" />
+    <module name="org.jboss.logging" />
+    <module name="org.jboss.vfs" />
+    <module name="org.jboss.jandex" />
+    <module name="org.jboss.weld.spi" />
+    <module name="org.jboss.weld.api" />
+    <module name="org.jboss.weld.core" />
+    <module name="org.jboss.as.weld" />
+    <module name="org.jboss.as.naming" />
+    <module name="org.jboss.as.connector" />
+    <module name="org.jboss.as.ee" />
+    <module name="org.jboss.as.ejb3" />
+    <module name="org.jboss.metadata.common" />
+    <module name="org.jboss.metadata.web" />
+    <module name="org.jboss.as.web" />
+    <module name="org.jboss.as.web-common" />
+    <module name="org.jboss.invocation" />
+
+    <module name="org.camunda.bpm.camunda-engine" />
+    <module name="org.camunda.bpm.identity.camunda-identity-ldap" />
+    <module name="org.camunda.bpm.camunda-engine-plugin-spin" services="import" />
+    <module name="org.camunda.bpm.camunda-engine-plugin-connect" />
+
+    <module name="org.camunda.bpm.camunda-engine-plugins" optional="true" />
+
+    <module name="org.camunda.connect.camunda-connect-core" />
+    <module name="org.camunda.connect.camunda-connect-http-client" services="import" />
+    <module name="org.camunda.connect.camunda-connect-soap-http-client" services="import" />
+
+    <!-- for LDAP plugin only -->
+    <module name="sun.jdk" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/commons/camunda-commons-logging/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/commons/camunda-commons-logging/main/module.xml
new file mode 100644
index 0000000..29c458c
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/commons/camunda-commons-logging/main/module.xml
@@ -0,0 +1,10 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.commons.camunda-commons-logging">
+  <resources>
+    <artifact name="${org.camunda.commons:camunda-commons-logging}"/>
+  </resources>
+
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="org.slf4j" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/commons/camunda-commons-typed-values/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/commons/camunda-commons-typed-values/main/module.xml
new file mode 100644
index 0000000..b6dfe6b
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/commons/camunda-commons-typed-values/main/module.xml
@@ -0,0 +1,12 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.commons.camunda-commons-typed-values">
+  <resources>
+    <artifact name="${org.camunda.commons:camunda-commons-typed-values}"/>
+  </resources>
+
+  <dependencies>
+    <module name="javax.api"/>
+    
+    <module name="org.camunda.commons.camunda-commons-utils" />
+    
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/commons/camunda-commons-utils/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/commons/camunda-commons-utils/main/module.xml
new file mode 100644
index 0000000..2d9443a
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/commons/camunda-commons-utils/main/module.xml
@@ -0,0 +1,10 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.commons.camunda-commons-utils">
+  <resources>
+    <artifact name="${org.camunda.commons:camunda-commons-utils}" />
+  </resources>
+
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="org.camunda.commons.camunda-commons-logging" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/connect/camunda-connect-core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/connect/camunda-connect-core/main/module.xml
new file mode 100644
index 0000000..3b300a8
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/connect/camunda-connect-core/main/module.xml
@@ -0,0 +1,11 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.connect.camunda-connect-core">
+  <resources>
+    <artifact name="${org.camunda.connect:camunda-connect-core}" />
+  </resources>
+
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="org.camunda.commons.camunda-commons-logging" />
+    <module name="org.camunda.commons.camunda-commons-utils" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/connect/camunda-connect-http-client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/connect/camunda-connect-http-client/main/module.xml
new file mode 100644
index 0000000..8f7912b
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/connect/camunda-connect-http-client/main/module.xml
@@ -0,0 +1,15 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.connect.camunda-connect-http-client">
+  <resources>
+    <artifact name="${org.camunda.connect:camunda-connect-http-client}"/>
+  </resources>
+
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="org.camunda.commons.camunda-commons-logging" />
+    <module name="org.camunda.commons.camunda-commons-utils" />
+
+    <module name="org.camunda.connect.camunda-connect-core" />
+
+    <module name="org.apache.httpcomponents.httpclient" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/connect/camunda-connect-soap-http-client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/connect/camunda-connect-soap-http-client/main/module.xml
new file mode 100644
index 0000000..2a793a2
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/connect/camunda-connect-soap-http-client/main/module.xml
@@ -0,0 +1,16 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.connect.camunda-connect-soap-http-client">
+  <resources>
+    <artifact name="${org.camunda.connect:camunda-connect-soap-http-client}" />
+  </resources>
+
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="org.camunda.commons.camunda-commons-logging" />
+    <module name="org.camunda.commons.camunda-commons-utils" />
+
+    <module name="org.camunda.connect.camunda-connect-core" />
+    <module name="org.camunda.connect.camunda-connect-http-client" />
+
+    <module name="org.apache.httpcomponents.httpclient" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/spin/camunda-spin-core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/spin/camunda-spin-core/main/module.xml
new file mode 100644
index 0000000..1b99ba1
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/spin/camunda-spin-core/main/module.xml
@@ -0,0 +1,12 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.spin.camunda-spin-core">
+  <resources>
+    <artifact name="${org.camunda.spin:camunda-spin-core}" />
+  </resources>
+
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="org.camunda.commons.camunda-commons-logging" />
+    <module name="org.camunda.commons.camunda-commons-utils" />
+    <module name="org.camunda.commons.camunda-commons-typed-values" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/spin/camunda-spin-dataformat-json-jackson/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/spin/camunda-spin-dataformat-json-jackson/main/module.xml
new file mode 100644
index 0000000..3a4f0d5
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/spin/camunda-spin-dataformat-json-jackson/main/module.xml
@@ -0,0 +1,18 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.spin.camunda-spin-dataformat-json-jackson">
+  <resources>
+    <artifact name="${org.camunda.spin:camunda-spin-dataformat-json-jackson}" />
+  </resources>
+
+  <dependencies>
+    <module name="javax.api"/>
+
+    <module name="org.camunda.spin.camunda-spin-core" />
+    <module name="org.camunda.commons.camunda-commons-logging" />
+    <module name="org.camunda.commons.camunda-commons-utils" />
+    <module name="org.camunda.commons.camunda-commons-typed-values" />
+
+    <module name="com.fasterxml.jackson.core.jackson-databind" slot="2.10.0" />
+    <module name="com.jayway.jsonpath.json-path" />
+  </dependencies>
+
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/spin/camunda-spin-dataformat-xml-dom/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/spin/camunda-spin-dataformat-xml-dom/main/module.xml
new file mode 100644
index 0000000..a0fa9ed
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/spin/camunda-spin-dataformat-xml-dom/main/module.xml
@@ -0,0 +1,15 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.spin.camunda-spin-dataformat-xml-dom">
+  <resources>
+    <artifact name="${org.camunda.spin:camunda-spin-dataformat-xml-dom}" />
+  </resources>
+
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="javax.xml.bind.api"/>
+    <module name="org.camunda.spin.camunda-spin-core" />
+    <module name="org.camunda.commons.camunda-commons-logging" />
+    <module name="org.camunda.commons.camunda-commons-utils" />
+    <module name="org.camunda.commons.camunda-commons-typed-values" />
+  </dependencies>
+
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/template-engines/camunda-template-engines-freemarker/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/template-engines/camunda-template-engines-freemarker/main/module.xml
new file mode 100644
index 0000000..2bc4045
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/camunda/template-engines/camunda-template-engines-freemarker/main/module.xml
@@ -0,0 +1,10 @@
+<module xmlns="urn:jboss:module:1.5" name="org.camunda.template-engines.camunda-template-engines-freemarker">
+  <resources>
+    <artifact name="${org.camunda.template-engines:camunda-template-engines-freemarker}" />
+  </resources>
+
+  <dependencies>
+    <module name="javax.api" />
+    <module name="org.freemarker.freemarker" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/groovy/groovy-all/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/groovy/groovy-all/main/module.xml
new file mode 100644
index 0000000..7f2f7b1
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/groovy/groovy-all/main/module.xml
@@ -0,0 +1,11 @@
+<module xmlns="urn:jboss:module:1.5" name="org.codehaus.groovy.groovy-all">
+  <resources>
+<!--    <artifact name="${org.codehaus.groovy:groovy-all}" />-->
+    <artifact name="org.codehaus.groovy:groovy-all:2.4.13" />
+  </resources>
+
+  <dependencies>
+    <module name="javax.api" />
+    <module name="org.camunda.spin.camunda-spin-core" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/freemarker/freemarker/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/freemarker/freemarker/main/module.xml
new file mode 100644
index 0000000..931411f
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/freemarker/freemarker/main/module.xml
@@ -0,0 +1,10 @@
+<module xmlns="urn:jboss:module:1.5" name="org.freemarker.freemarker">
+    <resources>
+        <artifact name="${org.freemarker:freemarker}"/>
+    </resources>
+
+    <dependencies>
+        <module name="javax.api"/>
+        <module name="org.apache.log4j" optional="true"/>
+    </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/joda/time/2.1/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/joda/time/2.1/module.xml
new file mode 100644
index 0000000..a7885d6
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/joda/time/2.1/module.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.5" name="org.joda.time" slot="2.1">
+
+    <resources>
+        <artifact name="${joda-time:joda-time}"/>
+    </resources>
+
+    <dependencies>
+        <module name="javax.api" />
+    </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/mybatis/mybatis/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/mybatis/mybatis/main/module.xml
new file mode 100644
index 0000000..0cca71a
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/mybatis/mybatis/main/module.xml
@@ -0,0 +1,10 @@
+<module xmlns="urn:jboss:module:1.5" name="org.mybatis.mybatis">
+  <resources>
+    <artifact name="${org.mybatis:mybatis}" />
+  </resources>
+
+  <dependencies>    
+    <module name="javax.api" />
+    <module name="javax.transaction.api" />
+  </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/slf4j-api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/slf4j-api/main/module.xml
new file mode 100644
index 0000000..e30dfaa
--- /dev/null
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/slf4j-api/main/module.xml
@@ -0,0 +1,5 @@
+<module xmlns="urn:jboss:module:1.5" name="slf4j.slf4j-api">
+  <resources>
+    <artifact name="${org.slf4j:slf4j-api}" />
+  </resources>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/template-subsystem/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/template-subsystem/main/module.xml
deleted file mode 100644
index 01295d1..0000000
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/template-subsystem/main/module.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-  ~ Copyright 2019 Red Hat, Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<!-- TODO Rename this module to something matching your chosen subsystem name -->
-<module xmlns="urn:jboss:module:1.9" name="org.wildfly.extension.template-subsystem">
-    <properties>
-        <property name="jboss.api" value="private"/>
-    </properties>
-
-    <resources>
-        <!-- TODO Use the actual name of the subsystem artifact here -->
-        <artifact name="${org.wildfly.extras.wildfly-feature-pack-template:template-subsystem}"/>
-    </resources>
-
-    <dependencies>
-        <!-- Typical module dependencies for a subsystem -->
-        <module name="org.jboss.as.controller"/>
-        <module name="org.jboss.as.server"/>
-        <module name="org.jboss.logging"/>
-        <module name="org.jboss.modules"/>
-        <module name="org.jboss.staxmapper"/>
-        <module name="org.wildfly.security.manager"/>
-
-        <!--
-            Additional module dependencies. If they contain any classes that should be exposed to the user's code,
-            (e.g. in a deployment) make sure you add them in the subsystem's DependencyProcessor too
-        -->
-        <module name="org.wildfly.template-dependency"/>
-    </dependencies>
-</module>
\ No newline at end of file
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/template-dependency/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/template-dependency/main/module.xml
deleted file mode 100644
index 9dbfa7f..0000000
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/template-dependency/main/module.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-  ~ Copyright 2019 Red Hat, Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<!-- TODO Rename this module to something matching your chosen subsystem name -->
-<module xmlns="urn:jboss:module:1.9" name="org.wildfly.template-dependency">
-    <properties>
-        <property name="jboss.api" value="private"/>
-    </properties>
-
-    <resources>
-        <!-- TODO Use the actual name of the subsystem artifact here -->
-        <artifact name="${org.wildfly.extras.wildfly-feature-pack-template:template-dependency}"/>
-    </resources>
-
-    <dependencies>
-        <!-- We need these dependencies to trigger weld/CDI -->
-        <module name="javax.enterprise.api"/>
-        <module name="org.jboss.weld.api"/>
-        <module name="org.jboss.weld.core"/>
-        <module name="org.jboss.weld.spi"/>
-    </dependencies>
-</module>
diff --git a/feature-pack/wildfly-feature-pack-build.xml b/feature-pack/wildfly-feature-pack-build.xml
index 324da48..36f983c 100644
--- a/feature-pack/wildfly-feature-pack-build.xml
+++ b/feature-pack/wildfly-feature-pack-build.xml
@@ -17,7 +17,7 @@
 TODO adjust the value of the 'producer' attribute to match the Maven groupId:artifactId of the maven project in ./pom.xml
 If you want to use a Galleon 'universe' (see the Galleon documentation) you could express that there instead.
 -->
-<build xmlns="urn:wildfly:feature-pack-build:3.1" producer="org.wildfly.extras.wildfly-feature-pack-template:template-feature-pack">
+<build xmlns="urn:wildfly:feature-pack-build:3.1" producer="de.ybroeker.wildfly-camunda-feature-pack:template-feature-pack">
     <transitive>
         <dependency group-id="org.wildfly.core" artifact-id="wildfly-core-galleon-pack">
             <name>org.wildfly.core:wildfly-core-galleon-pack</name>
@@ -42,9 +42,13 @@ If you want to use a Galleon 'universe' (see the Galleon documentation) you coul
         </dependency>
     </transitive>
     <dependencies>
+
+
+
+
         <dependency group-id="org.wildfly" artifact-id="wildfly-galleon-pack">
             <name>org.wildfly:wildfly-galleon-pack</name>
-            <packages inherit="false">
+            <packages inherit="true">
                 <include name="docs.examples"/>
             </packages>
             <default-configs inherit="false"/>
@@ -58,9 +62,11 @@ If you want to use a Galleon 'universe' (see the Galleon documentation) you coul
     <generate-feature-specs>
         <extensions>
             <standalone>
-                <!-- TODO Use the name of the module implementing your subsystem -->
-                <extension>org.wildfly.extension.template-subsystem</extension>
+                <extension>org.camunda.bpm.wildfly.camunda-wildfly-subsystem</extension>
             </standalone>
+            <domain>
+                <extension>org.camunda.bpm.wildfly.camunda-wildfly-subsystem</extension>
+            </domain>
         </extensions>
     </generate-feature-specs>
-</build>
\ No newline at end of file
+</build>
diff --git a/pom.xml b/pom.xml
index 1612e5c..7783fe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,13 @@
         <artifactId>jboss-parent</artifactId>
         <version>35</version>
     </parent>
-    <groupId>org.wildfly.extras.wildfly-feature-pack-template</groupId>
-    <artifactId>template-parent</artifactId>
+    <groupId>de.ybroeker.wildfly-camunda-feature-pack</groupId>
+    <artifactId>wildfly-camunda-bpm-pack-parent</artifactId>
     <version>1.0.0.Alpha-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>WildFly Galleon FP Template - Parent</name>
+    <name>WildFly Camunda Galleon Pack - Parent</name>
   
-    <description>WildFly Galleon Pack Template</description>
+    <description>WildFly Camunda Galleon Pack</description>
 
     <licenses>
         <license>
@@ -52,7 +52,7 @@
         -->
         <version.org.wildfly.common>1.5.4.Final</version.org.wildfly.common>
 
-
+        <version.org.camunda.bpm>7.14.0</version.org.camunda.bpm>
 
 
         <!-- Other dependency versions -->
@@ -79,11 +79,11 @@
         <maven.redhat.repository.url>${maven.repository.protocol}://maven.repository.redhat.com/ga/</maven.redhat.repository.url>
 
         <!-- Name of the built server -->
-        <server.name>wildfly-${version.org.wildfly}-template-${project.version}</server.name>
+        <server.name>wildfly-${version.org.wildfly}-camunda-feature-pack-${project.version}</server.name>
         <wildfly.build.output.dir>build/target/${server.name}</wildfly.build.output.dir>
 
         <!-- Galleon -->
-        <galleon.fork.embedded>true</galleon.fork.embedded>
+        <galleon.fork.embedded>false</galleon.fork.embedded>
         <galleon.log.time>true</galleon.log.time>
         <!-- Builds need to override this -->
         <galleon.wildfly.home>/tmp</galleon.wildfly.home>
@@ -123,6 +123,20 @@
             <url>${maven.redhat.repository.url}</url>
             <layout>default</layout>
         </repository>
+        <repository>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </snapshots>
+            <id>camunda-bpm</id>
+            <name>camunda-bpm</name>
+            <url>https://app.camunda.com/nexus/content/repositories/camunda-bpm/</url>
+            <layout>default</layout>
+        </repository>
     </repositories>
     <dependencyManagement>
         <dependencies>
@@ -143,33 +157,49 @@
             </dependency>
 
 
-
-            <!-- Project -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>template-dependency</artifactId>
-                <version>${project.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
+            <!-- Camunda BOM-->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>template-subsystem</artifactId>
-                <version>${project.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.camunda.bpm</groupId>
+                <artifactId>camunda-bom</artifactId>
+                <version>${version.org.camunda.bpm}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.camunda.commons</groupId>-->
+<!--                <artifactId>camunda-commons-bom</artifactId>-->
+<!--                <version>1.9.0</version>-->
+<!--                <scope>import</scope>-->
+<!--                <type>pom</type>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.camunda.connect</groupId>-->
+<!--                <artifactId>camunda-connect-bom</artifactId>-->
+<!--                <version>${version.camunda.connect}</version>-->
+<!--                <scope>import</scope>-->
+<!--                <type>pom</type>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.camunda.spin</groupId>-->
+<!--                <artifactId>camunda-spin-bom</artifactId>-->
+<!--                <version>${version.camunda.spin}</version>-->
+<!--                <scope>import</scope>-->
+<!--                <type>pom</type>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.camunda.template-engines</groupId>-->
+<!--                <artifactId>camunda-template-engines-bom</artifactId>-->
+<!--                <version>${version.camunda.template-engines}</version>-->
+<!--                <scope>import</scope>-->
+<!--                <type>pom</type>-->
+<!--            </dependency>-->
+
+
+
+            <!-- Project -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>template-feature-pack</artifactId>
+                <artifactId>wildfly-camunda-feature-pack</artifactId>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <exclusions>
@@ -181,7 +211,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>template-feature-pack</artifactId>
+                <artifactId>wildfly-camunda-feature-pack</artifactId>
                 <version>${project.version}</version>
                 <type>zip</type>
                 <exclusions>
@@ -297,10 +327,7 @@
     </scm>
     <modules>
         <module>build</module>
-        <module>dependency</module>
-        <module>example</module>
         <module>feature-pack</module>
-        <module>subsystem</module>
         <module>testsuite</module>
     </modules>
 
diff --git a/provision.xml b/provision.xml
index fcc067b..27d0278 100644
--- a/provision.xml
+++ b/provision.xml
@@ -22,27 +22,30 @@
     (note that `-dir` should have double hyphens, which don't work in XML comments!)
 -->
 <installation xmlns="urn:jboss:galleon:provisioning:3.0">
-    <feature-pack location="wildfly@maven(org.jboss.universe:community-universe):current">
+
+    <feature-pack location="wildfly@maven(org.jboss.universe:community-universe):current#21.0.1.Final">
         <default-configs inherit="false"/>
         <packages inherit="false">
             <!-- If docs/licenses is desired, uncomment this line -->
             <include name="docs.licenses"/>
         </packages>
     </feature-pack>
-    <feature-pack location="org.wildfly.extras.wildfly-feature-pack-template:template-feature-pack:1.0.0.Alpha-SNAPSHOT">
+    <feature-pack
+            location="de.ybroeker.wildfly-camunda-feature-pack:wildfly-camunda-feature-pack:1.0.0.Alpha-SNAPSHOT">
         <default-configs inherit="false"/>
         <packages inherit="false">
             <!-- If docs/licenses is desired, uncomment this line -->
-            <include name="docs.licenses.merge"/>
+            <!--        <include name="docs.licenses.merge"/>-->
         </packages>
     </feature-pack>
+
     <config model="standalone" name="standalone.xml">
         <layers>
             <!-- The base server -->
             <include name="cloud-profile"/>
 
-            <!-- Our layer(s) -->
-            <include name="template-layer"/>
+            <!-- Camunda layer -->
+            <include name="camunda-layer"/>
         </layers>
     </config>
     <options>
diff --git a/subsystem/pom.xml b/subsystem/pom.xml
deleted file mode 100644
index e527c1e..0000000
--- a/subsystem/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2019 Red Hat, Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>template-parent</artifactId>
-        <groupId>org.wildfly.extras.wildfly-feature-pack-template</groupId>
-        <version>1.0.0.Alpha-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>template-subsystem</artifactId>
-    <name>WildFly Galleon FP Template - Subsystem</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-            <!--
-                This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                projects that depend on this project.
-            -->
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-controller</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-server</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-subsystem-test</artifactId>
-            <type>pom</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/SubsystemParser_1_0.java b/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/SubsystemParser_1_0.java
deleted file mode 100644
index d81d1b7..0000000
--- a/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/SubsystemParser_1_0.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wildfly.extension.feature.pack.template.subsystem;
-
-import static org.jboss.as.controller.PersistentResourceXMLDescription.builder;
-
-import org.jboss.as.controller.PersistentResourceXMLDescription;
-import org.jboss.as.controller.PersistentResourceXMLParser;
-
-/**
- * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
- */
-public class SubsystemParser_1_0 extends PersistentResourceXMLParser {
-
-    // TODO Rename to something that makes sense and update the template-subsytem.xsd namespaces to match
-    public static final String NAMESPACE = "urn:wildfly:template-subsystem:1.0";
-
-    private static final PersistentResourceXMLDescription xmlDescription = builder(TemplateExtension.SUBSYSTEM_PATH, NAMESPACE)
-            .build();
-
-    @Override
-    public PersistentResourceXMLDescription getParserDescription() {
-        return xmlDescription;
-    }
-
-}
diff --git a/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/TemplateExtension.java b/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/TemplateExtension.java
deleted file mode 100644
index 3513817..0000000
--- a/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/TemplateExtension.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wildfly.extension.feature.pack.template.subsystem;
-
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
-
-import org.jboss.as.controller.Extension;
-import org.jboss.as.controller.ExtensionContext;
-import org.jboss.as.controller.ModelVersion;
-import org.jboss.as.controller.PathElement;
-import org.jboss.as.controller.SubsystemRegistration;
-import org.jboss.as.controller.descriptions.ResourceDescriptionResolver;
-import org.jboss.as.controller.descriptions.StandardResourceDescriptionResolver;
-import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler;
-import org.jboss.as.controller.parsing.ExtensionParsingContext;
-import org.jboss.as.controller.registry.ManagementResourceRegistration;
-
-/**
- * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
- *
- * TODO Rename this class AND its package (and sub-packages) to something which makes sense
- */
-public class TemplateExtension implements Extension {
-
-    /**
-     * The name of our subsystem within the model.
-     * TODO Rename it to your subsystem name
-     */
-    public static final String SUBSYSTEM_NAME = "template-subsystem";
-
-    protected static final PathElement SUBSYSTEM_PATH = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME);
-
-    static final String WELD_CAPABILITY_NAME = "org.wildfly.weld";
-
-    private static final String RESOURCE_NAME = TemplateExtension.class.getPackage().getName() + ".LocalDescriptions";
-
-    protected static final ModelVersion VERSION_1_0_0 = ModelVersion.create(1, 0, 0);
-    private static final ModelVersion CURRENT_MODEL_VERSION = VERSION_1_0_0;
-
-    private static final SubsystemParser_1_0 CURRENT_PARSER = new SubsystemParser_1_0();
-
-    static ResourceDescriptionResolver getResourceDescriptionResolver(final String... keyPrefix) {
-        return getResourceDescriptionResolver(true, keyPrefix);
-
-    }
-
-    static ResourceDescriptionResolver getResourceDescriptionResolver(final boolean useUnprefixedChildTypes, final String... keyPrefix) {
-        StringBuilder prefix = new StringBuilder();
-        for (String kp : keyPrefix) {
-            if (prefix.length() > 0){
-                prefix.append('.');
-            }
-            prefix.append(kp);
-        }
-        return new StandardResourceDescriptionResolver(prefix.toString(), RESOURCE_NAME, TemplateExtension.class.getClassLoader(), true, useUnprefixedChildTypes);
-    }
-
-
-    @Override
-    public void initialize(ExtensionContext extensionContext) {
-        final SubsystemRegistration sr =  extensionContext.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
-        sr.registerXMLElementWriter(CURRENT_PARSER);
-        final ManagementResourceRegistration root = sr.registerSubsystemModel(new TemplateSubsystemDefinition());
-        root.registerOperationHandler(GenericSubsystemDescribeHandler.DEFINITION, GenericSubsystemDescribeHandler.INSTANCE, false);
-    }
-
-    @Override
-    public void initializeParsers(ExtensionParsingContext extensionParsingContext) {
-        extensionParsingContext.setSubsystemXmlMapping(SUBSYSTEM_NAME, SubsystemParser_1_0.NAMESPACE, CURRENT_PARSER);
-    }
-
-}
diff --git a/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/TemplateSubsystemDefinition.java b/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/TemplateSubsystemDefinition.java
deleted file mode 100644
index c19d553..0000000
--- a/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/TemplateSubsystemDefinition.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wildfly.extension.feature.pack.template.subsystem;
-
-import static org.jboss.as.controller.OperationContext.Stage.RUNTIME;
-import static org.jboss.as.server.deployment.Phase.DEPENDENCIES;
-import static org.wildfly.extension.feature.pack.template.subsystem.TemplateExtension.WELD_CAPABILITY_NAME;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.jboss.as.controller.AbstractBoottimeAddStepHandler;
-import org.jboss.as.controller.AttributeDefinition;
-import org.jboss.as.controller.ModelOnlyRemoveStepHandler;
-import org.jboss.as.controller.OperationContext;
-import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PersistentResourceDefinition;
-import org.jboss.as.controller.SimpleResourceDefinition;
-import org.jboss.as.controller.capability.RuntimeCapability;
-import org.jboss.as.controller.registry.ManagementResourceRegistration;
-import org.jboss.as.server.AbstractDeploymentChainStep;
-import org.jboss.as.server.DeploymentProcessorTarget;
-import org.jboss.dmr.ModelNode;
-import org.wildfly.extension.feature.pack.template.subsystem._private.TemplateLogger;
-import org.wildfly.extension.feature.pack.template.subsystem.deployment.DependencyProcessor;
-
-/**
- * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
- */
-public class TemplateSubsystemDefinition extends PersistentResourceDefinition {
-
-    // TODO Change this to something that makes sense for your subsystem
-    private static final String TEMPLATE_SUBSYSTEM_CAPABILITY_NAME = "org.wildfly.extras.template";
-
-    private static final RuntimeCapability<Void> CONTEXT_PROPAGATION_CAPABILITY = RuntimeCapability.Builder
-            .of(TEMPLATE_SUBSYSTEM_CAPABILITY_NAME)
-            .addRequirements(WELD_CAPABILITY_NAME)
-            .build();
-
-    public TemplateSubsystemDefinition() {
-        super(
-                new SimpleResourceDefinition.Parameters(
-                        TemplateExtension.SUBSYSTEM_PATH,
-                        TemplateExtension.getResourceDescriptionResolver(TemplateExtension.SUBSYSTEM_NAME))
-                .setAddHandler(AddHandler.INSTANCE)
-                .setRemoveHandler(new ModelOnlyRemoveStepHandler())
-                .setCapabilities(CONTEXT_PROPAGATION_CAPABILITY)
-        );
-    }
-
-    @Override
-    public Collection<AttributeDefinition> getAttributes() {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public void registerAdditionalRuntimePackages(ManagementResourceRegistration resourceRegistration) {
-        super.registerAdditionalRuntimePackages(resourceRegistration);
-        //TODO - If your feature-pack needs any other modules, you should add those here, and remove the line above
-        /*
-        resourceRegistration.registerAdditionalRuntimePackages(
-                // Required dependencies are always added
-                RuntimePackageDependency.required("my.required.module"),
-                // Optional and passive modules depend on the 'optional-packages' mode. See the Galleon
-                // documentation for more details as this is an advanced feature
-                RuntimePackageDependency.optional("my.optional.module"),
-                RuntimePackageDependency.passive("my.passive.module")
-        );*/
-    }
-
-    static class AddHandler extends AbstractBoottimeAddStepHandler {
-
-        static AddHandler INSTANCE = new AddHandler();
-
-        private AddHandler() {
-            super(Collections.emptyList());
-        }
-
-        @Override
-        protected void performBoottime(OperationContext context, ModelNode operation, ModelNode model) throws OperationFailedException {
-            super.performBoottime(context, operation, model);
-
-            context.addStep(new AbstractDeploymentChainStep() {
-                public void execute(DeploymentProcessorTarget processorTarget) {
-                    final int DEPENDENCIES_TEMPLATE = 6304;
-                    processorTarget.addDeploymentProcessor(TemplateExtension.SUBSYSTEM_NAME, DEPENDENCIES, DEPENDENCIES_TEMPLATE, new DependencyProcessor());
-                }
-            }, RUNTIME);
-
-            TemplateLogger.LOGGER.activatingSubsystem();
-        }
-    }
-}
diff --git a/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/_private/TemplateLogger.java b/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/_private/TemplateLogger.java
deleted file mode 100644
index 1e00410..0000000
--- a/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/_private/TemplateLogger.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wildfly.extension.feature.pack.template.subsystem._private;
-
-import static org.jboss.logging.Logger.Level.INFO;
-
-import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
-
-/**
- * Log messages for our template subsystem.
- *
- * @author <a href="kkhan@redhat.com">Kabir Khan</a> (c) 2019 Red Hat inc.
- */
-// TODO Make the projectCode in the @MessageLogger annotation some abbreviation to identify your subsystem
-@MessageLogger(projectCode = "WFLYGPTMPL", length = 4)
-// TODO Rename to something that makes sense for your subsystem.
-public interface TemplateLogger extends BasicLogger {
-
-    TemplateLogger LOGGER = Logger.getMessageLogger(TemplateLogger.class, "org.wildfly.extension.galleon.pack.template.subsystem");
-
-    /**
-     * Logs an informational message indicating the subsystem is being activated.
-     */
-    @LogMessage(level = INFO)
-    @Message(id = 1, value = "Activating Template Subsystem")
-    void activatingSubsystem();
-
-
-    @Message(id = 2, value = "Deployment %s requires use of the '%s' capability but it is not currently registered")
-    DeploymentUnitProcessingException deploymentRequiresCapability(String deploymentName, String capabilityName);
-}
diff --git a/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/deployment/DependencyProcessor.java b/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/deployment/DependencyProcessor.java
deleted file mode 100644
index df67abb..0000000
--- a/subsystem/src/main/java/org/wildfly/extension/feature/pack/template/subsystem/deployment/DependencyProcessor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wildfly.extension.feature.pack.template.subsystem.deployment;
-
-import org.jboss.as.server.deployment.Attachments;
-import org.jboss.as.server.deployment.DeploymentPhaseContext;
-import org.jboss.as.server.deployment.DeploymentUnit;
-import org.jboss.as.server.deployment.DeploymentUnitProcessor;
-import org.jboss.as.server.deployment.module.ModuleDependency;
-import org.jboss.as.server.deployment.module.ModuleSpecification;
-import org.jboss.modules.Module;
-import org.jboss.modules.ModuleLoader;
-
-/**
- * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
- */
-// TODO Rename this class to something which makes sense for your subsystem
-public class DependencyProcessor implements DeploymentUnitProcessor {
-
-    @Override
-    public void deploy(DeploymentPhaseContext phaseContext) {
-        DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();
-
-        addModuleDependencies(deploymentUnit);
-    }
-
-    @Override
-    public void undeploy(DeploymentUnit context) {
-    }
-
-    private void addModuleDependencies(DeploymentUnit deploymentUnit) {
-        final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION);
-        final ModuleLoader moduleLoader = Module.getBootModuleLoader();
-
-        // Pull in dependencies needed by deployments in the subsystem
-
-        // This is needed if running with a security manager, and seems to be needed by arquillian in all cases
-        moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, "org.wildfly.security.manager", false, false, true, false));
-        // TODO use the name of the modules after renaming, and add any other dependencies
-        // In this case we don't need any classes from the subsystem module itseld so we don't need to add it to the
-        // deployment's module dependencies
-        // moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, "org.wildfly.extension.template-subsystem", false, false, true, false));
-        moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, "org.wildfly.template-dependency", false, false, true, false));
-    }
-}
diff --git a/subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension b/subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension
deleted file mode 100644
index b84bee4..0000000
--- a/subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright 2019 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# TODO This should match the fully qualified name of the renamed TemplateExtension class
-org.wildfly.extension.feature.pack.template.subsystem.TemplateExtension
diff --git a/subsystem/src/main/resources/org/wildfly/extension/feature/pack/template/subsystem/LocalDescriptions.properties b/subsystem/src/main/resources/org/wildfly/extension/feature/pack/template/subsystem/LocalDescriptions.properties
deleted file mode 100644
index 2d3e72d..0000000
--- a/subsystem/src/main/resources/org/wildfly/extension/feature/pack/template/subsystem/LocalDescriptions.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright 2019 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# TODO rename these to the name you gave the subsystem in TemplateExtension
-template-subsystem=The Galleon Pack template subsystem
-template-subsystem.add=Adds the Galleon Pack template subsystem
-template-subsystem.remove=Removes the Galleon Pack template subsystem
\ No newline at end of file
diff --git a/subsystem/src/main/resources/schema/template-subsystem_1_0.xsd b/subsystem/src/main/resources/schema/template-subsystem_1_0.xsd
deleted file mode 100644
index 6013764..0000000
--- a/subsystem/src/main/resources/schema/template-subsystem_1_0.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  ~ Copyright 2019 Red Hat, Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<!--
-    TODO Rename this file and the namespaces something that makes sense.
-    The namespaces should match those in SubsystemParser_1_0.NAMESPACE
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="urn:wildfly:template-subsystem:1.0"
-           xmlns="urn:wildfly:template-subsystem:1.0"
-           elementFormDefault="qualified"
-           attributeFormDefault="unqualified"
-           version="1.0">
-
-    <!-- The subsystem root element -->
-    <xs:element name="subsystem">
-    </xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/subsystem/src/test/java/org/wildfly/extension/feature/pack/template/subsystem/SubsystemTestCase.java b/subsystem/src/test/java/org/wildfly/extension/feature/pack/template/subsystem/SubsystemTestCase.java
deleted file mode 100644
index dcb55d4..0000000
--- a/subsystem/src/test/java/org/wildfly/extension/feature/pack/template/subsystem/SubsystemTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wildfly.extension.feature.pack.template.subsystem;
-
-import java.io.IOException;
-
-import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest;
-import org.jboss.as.subsystem.test.AdditionalInitialization;
-
-/**
- * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
- */
-public class SubsystemTestCase extends AbstractSubsystemBaseTest {
-
-    public SubsystemTestCase() {
-        super(TemplateExtension.SUBSYSTEM_NAME, new TemplateExtension());
-    }
-
-    @Override
-    protected String getSubsystemXml() throws IOException {
-        //test configuration put in standalone.xml
-        return readResource("template-subsystem-test.xml");
-    }
-
-    @Override
-    protected String getSubsystemXsdPath() throws Exception {
-        return "schema/template-subsystem_1_0.xsd";
-    }
-
-    protected AdditionalInitialization createAdditionalInitialization() {
-        return AdditionalInitialization.withCapabilities(TemplateExtension.WELD_CAPABILITY_NAME);
-    }
-
-}
diff --git a/subsystem/src/test/resources/org/wildfly/extension/feature/pack/template/subsystem/template-subsystem-test.xml b/subsystem/src/test/resources/org/wildfly/extension/feature/pack/template/subsystem/template-subsystem-test.xml
deleted file mode 100644
index 8594352..0000000
--- a/subsystem/src/test/resources/org/wildfly/extension/feature/pack/template/subsystem/template-subsystem-test.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-  ~ Copyright 2019 Red Hat, Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<!-- TODO The namespace should match what you used in SubsystemParser_1_0 and the template-subsystem_1_0.xsd -->
-<subsystem xmlns="urn:wildfly:template-subsystem:1.0"/>
\ No newline at end of file
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index fb0fa08..37b019b 100644
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -19,13 +19,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>template-testsuite</artifactId>
-        <groupId>org.wildfly.extras.wildfly-feature-pack-template</groupId>
+        <artifactId>wildfly-camunda-feature-pack-testsuite</artifactId>
+        <groupId>de.ybroeker.wildfly-camunda-feature-pack</groupId>
         <version>1.0.0.Alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>template-testsuite-integration</artifactId>
+    <artifactId>wildfly-camunda-feature-pack-integration</artifactId>
     <name>WildFly Galleon FP Template - Subsystem Integration Test Suite</name>
     <packaging>pom</packaging>
     <modules>
@@ -90,4 +90,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/testsuite/integration/subsystem/camunda-h2-dbs/process-engine.mv.db b/testsuite/integration/subsystem/camunda-h2-dbs/process-engine.mv.db
new file mode 100644
index 0000000..27e4f1a
Binary files /dev/null and b/testsuite/integration/subsystem/camunda-h2-dbs/process-engine.mv.db differ
diff --git a/testsuite/integration/subsystem/camunda-h2-dbs/process-engine.trace.db b/testsuite/integration/subsystem/camunda-h2-dbs/process-engine.trace.db
new file mode 100644
index 0000000..586bf9a
--- /dev/null
+++ b/testsuite/integration/subsystem/camunda-h2-dbs/process-engine.trace.db
@@ -0,0 +1,2 @@
+2021-03-30 16:40:53 jdbc[4]: exception
+org.h2.jdbc.JdbcSQLException: The object is already closed [90007-197]
diff --git a/testsuite/integration/subsystem/pom.xml b/testsuite/integration/subsystem/pom.xml
index 9612638..6b8446c 100644
--- a/testsuite/integration/subsystem/pom.xml
+++ b/testsuite/integration/subsystem/pom.xml
@@ -19,25 +19,25 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>template-testsuite-integration</artifactId>
-        <groupId>org.wildfly.extras.wildfly-feature-pack-template</groupId>
+        <artifactId>wildfly-camunda-feature-pack-integration</artifactId>
+        <groupId>de.ybroeker.wildfly-camunda-feature-pack</groupId>
         <version>1.0.0.Alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>template-testsuite-integration-subsystem</artifactId>
+    <artifactId>wildfly-camunda-feature-pack-integration-subsystem</artifactId>
     <name>WildFly Galleon FP Template - Testsuite: Subsystem</name>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>template-feature-pack</artifactId>
+            <artifactId>wildfly-camunda-feature-pack</artifactId>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>template-feature-pack</artifactId>
+            <artifactId>wildfly-camunda-feature-pack</artifactId>
             <type>zip</type>
             <exclusions>
                 <exclusion>
@@ -47,10 +47,12 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>template-dependency</artifactId>
+            <groupId>org.camunda.bpm</groupId>
+            <artifactId>camunda-engine</artifactId>
+            <version>${version.org.camunda.bpm}</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -86,7 +88,7 @@
                                 </feature-pack>
                                 <feature-pack>
                                     <groupId>${project.groupId}</groupId>
-                                    <artifactId>template-feature-pack</artifactId>
+                                    <artifactId>wildfly-camunda-feature-pack</artifactId>
                                     <version>${project.version}</version>
                                     <inherit-packages>false</inherit-packages>
                                     <inherit-configs>false</inherit-configs>
@@ -105,7 +107,7 @@
                                         <layer>jmx-remoting</layer>
                                         <!-- Layers from this FP  -->
                                         <!-- TODO - rename to what you have called your layer -->
-                                        <layer>template-layer</layer>
+                                        <layer>camunda-layer</layer>
                                     </layers>
                                 </config>
                             </configurations>
@@ -125,4 +127,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/testsuite/integration/subsystem/src/test/java/org/wildfly/test/feature/pack/template/subsystem/sanity/SomeTest.java b/testsuite/integration/subsystem/src/test/java/org/wildfly/test/feature/pack/template/subsystem/sanity/SomeTest.java
new file mode 100644
index 0000000..9dafdbe
--- /dev/null
+++ b/testsuite/integration/subsystem/src/test/java/org/wildfly/test/feature/pack/template/subsystem/sanity/SomeTest.java
@@ -0,0 +1,18 @@
+package org.wildfly.test.feature.pack.template.subsystem.sanity;
+
+import org.camunda.bpm.BpmPlatform;
+import org.camunda.bpm.engine.ProcessEngine;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNull;
+
+
+public class SomeTest {
+
+    @Test
+    public void shouldNotFindProcessEngineOutOfWildfly() {
+        final ProcessEngine defaultProcessEngine = BpmPlatform.getDefaultProcessEngine();
+        assertNull(defaultProcessEngine);
+    }
+
+}
diff --git a/testsuite/integration/subsystem/src/test/java/org/wildfly/test/feature/pack/template/subsystem/sanity/SubsystemSanityTestCase.java b/testsuite/integration/subsystem/src/test/java/org/wildfly/test/feature/pack/template/subsystem/sanity/SubsystemSanityTestCase.java
index 87d92b2..25d105c 100644
--- a/testsuite/integration/subsystem/src/test/java/org/wildfly/test/feature/pack/template/subsystem/sanity/SubsystemSanityTestCase.java
+++ b/testsuite/integration/subsystem/src/test/java/org/wildfly/test/feature/pack/template/subsystem/sanity/SubsystemSanityTestCase.java
@@ -16,42 +16,50 @@
 
 package org.wildfly.test.feature.pack.template.subsystem.sanity;
 
-import javax.inject.Inject;
-
+import org.camunda.bpm.BpmPlatform;
+import org.camunda.bpm.engine.ProcessEngine;
+import org.camunda.bpm.engine.runtime.ProcessInstance;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wildfly.feature.pack.template.dependency.ExampleQualifier;
-import org.wildfly.feature.pack.template.dependency.Message;
 
-/**
- * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
- */
+import static org.junit.Assert.assertNotNull;
+
+
 @RunWith(Arquillian.class)
 public class SubsystemSanityTestCase {
 
-    @Inject
-    @ExampleQualifier
-    Message greeting;
-
     @Deployment
     public static WebArchive getDeployment() {
         final WebArchive webArchive = ShrinkWrap.create(WebArchive.class, "sanity-test.war")
                 .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
-                .addPackage(SubsystemSanityTestCase.class.getPackage());
+                .addAsWebInfResource(SubsystemSanityTestCase.class.getResource("/jboss-deployment-structure.xml"), "jboss-deployment-structure.xml")
+                .addPackage(SubsystemSanityTestCase.class.getPackage())
+                .addAsResource(SubsystemSanityTestCase.class.getResource("/HelloWorld.bpmn"),"HelloWorld.bpmn");
         return webArchive;
     }
 
     @Test
-    public void testAllOk() {
-        // Nothing much is happening here yet - we just check we can load the class
-        Assert.assertNotNull(greeting);
-        Assert.assertEquals("Welcome! (English)", greeting.getMessage());
+    public void shouldFindProcessEngine() {
+        final ProcessEngine defaultProcessEngine = BpmPlatform.getDefaultProcessEngine();
+        assertNotNull(defaultProcessEngine);
     }
-}
 
+    @Test
+    public void shouldDeployProcess() {
+        final ProcessEngine defaultProcessEngine = BpmPlatform.getDefaultProcessEngine();
+
+        final org.camunda.bpm.engine.repository.Deployment deployment = defaultProcessEngine.getRepositoryService().createDeployment()
+                .addInputStream("HelloWorld.bpmn", SubsystemSanityTestCase.class.getResourceAsStream("/HelloWorld.bpmn"))
+                .deploy();
+        assertNotNull("deployment", deployment);
+
+        final ProcessInstance processInstance = defaultProcessEngine.getRuntimeService().startProcessInstanceByKey("Hello_World");
+        assertNotNull("processInstance", processInstance);
+    }
+
+}
diff --git a/testsuite/integration/subsystem/src/test/resources/HelloWorld.bpmn b/testsuite/integration/subsystem/src/test/resources/HelloWorld.bpmn
new file mode 100644
index 0000000..3d1dd04
--- /dev/null
+++ b/testsuite/integration/subsystem/src/test/resources/HelloWorld.bpmn
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0q98o62" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.3">
+  <bpmn:process id="Hello_World" isExecutable="true">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>Flow_1qe663s</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:sequenceFlow id="Flow_1qe663s" sourceRef="StartEvent_1" targetRef="Activity_05of337" />
+    <bpmn:endEvent id="Event_1w0xlhv">
+      <bpmn:incoming>Flow_0ywvggo</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_0ywvggo" sourceRef="Activity_05of337" targetRef="Event_1w0xlhv" />
+    <bpmn:task id="Activity_05of337">
+      <bpmn:incoming>Flow_1qe663s</bpmn:incoming>
+      <bpmn:outgoing>Flow_0ywvggo</bpmn:outgoing>
+    </bpmn:task>
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Hello_World">
+      <bpmndi:BPMNEdge id="Flow_1qe663s_di" bpmnElement="Flow_1qe663s">
+        <di:waypoint x="215" y="117" />
+        <di:waypoint x="270" y="117" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0ywvggo_di" bpmnElement="Flow_0ywvggo">
+        <di:waypoint x="370" y="117" />
+        <di:waypoint x="432" y="117" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="179" y="99" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1w0xlhv_di" bpmnElement="Event_1w0xlhv">
+        <dc:Bounds x="432" y="99" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0rut23i_di" bpmnElement="Activity_05of337">
+        <dc:Bounds x="270" y="77" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/testsuite/integration/subsystem/src/test/resources/jboss-deployment-structure.xml b/testsuite/integration/subsystem/src/test/resources/jboss-deployment-structure.xml
new file mode 100644
index 0000000..55ed6c9
--- /dev/null
+++ b/testsuite/integration/subsystem/src/test/resources/jboss-deployment-structure.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-deployment-structure>
+  <deployment>
+    <dependencies>
+      <module name="org.camunda.bpm.camunda-engine"/>
+    </dependencies>
+  </deployment>
+</jboss-deployment-structure>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 496351f..0fe4df3 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -19,13 +19,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>template-parent</artifactId>
-        <groupId>org.wildfly.extras.wildfly-feature-pack-template</groupId>
+        <artifactId>wildfly-camunda-bpm-pack-parent</artifactId>
+        <groupId>de.ybroeker.wildfly-camunda-feature-pack</groupId>
         <version>1.0.0.Alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>template-testsuite</artifactId>
+    <artifactId>wildfly-camunda-feature-pack-testsuite</artifactId>
     <name>WildFly Galleon FP Template - Test Suite</name>
     <packaging>pom</packaging>
     <modules>
@@ -225,4 +225,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>