diff --git a/.gitignore b/.gitignore
index 03ebdad..8ff347c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,12 +11,13 @@
 
 # Maven
 target/
+dependency-reduced-pom.xml
 
 # TestNG
 test-output/
 
-# JBoss AS
-transaction.log
+# Misc
+*.log
 
 # Floobits configuration
 .floo*
diff --git a/README.asciidoc b/README.asciidoc
index 00001b8..3636713 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -1,4 +1,6 @@
 image:https://travis-ci.org/arquillian/arquillian-extension-jacoco.svg?branch=master["Build Status", link="https://travis-ci.org/arquillian/arquillian-extension-jacoco"]
+image:https://img.shields.io/maven-central/v/org.jboss.arquillian.extension/arquillian-jacoco["Maven Central", link="https://maven-badges.herokuapp.com/maven-central/org.jboss.arquillian.extension/arquillian-jacoco"]
+
 
 == Arquillian Jacoco Extension
 
@@ -6,7 +8,7 @@ Automagic Remote InContainer Codecoverage
 
 === Usage
 
-==== Maven pom.xml
+==== Maven default setup
 
 Add the following to your pom.xml:
 
@@ -17,8 +19,8 @@ Set the versions to use:
 ----
 ...
 <properties>
-   <version.jacoco>0.8.2</version.jacoco>
-   <version.arquillian_jacoco>1.0.0.Final-SNAPSHOT</version.arquillian_jacoco>
+   <version.jacoco>0.8.3</version.jacoco>
+   <version.arquillian_jacoco>1.0.0</version.arquillian_jacoco>
 </properties>
 ...
 ----
@@ -77,6 +79,49 @@ Activate this profile on command line by using the -P flag:
 mvn test -Pjacoco
 ----
 
+Please note that `prepare-agent` will set a property that is picked up by `maven-surefire-plugin` by default
+(see https://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html[documentation]).
+
+==== Maven setup with shaded ASM and jacoco-core
+
+JaCoCo requires ASM to work properly. Since ASM is also used by many other libraries like Apache CXF, you might run into version conflicts. +
+E.g. JBoss EAP 6.4 ships CXF 2.7 which requires ASM 3 but JaCoCo requires ASM 7+.
+
+As a workaround, this extension provides an alternate `with-asm` flavour that includes "private" ASM and JaCoCo packages, shaded via `maven-shade-plugin`.
+
+You only need a single dependency for this setup:
+[source, xml]
+----
+...
+   <dependencies>
+      <dependency>
+         <groupId>org.jboss.arquillian.extension</groupId>
+         <artifactId>arquillian-jacoco-with-asm</artifactId>
+         <version>${version.arquillian_jacoco}</version>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+----
+
+Please note the absence of the `jacoco-core` dependency.
+
+==== (Optional) arquillian.xml
+
+This extension can by configured via `arquillian.xml`, e.g.:
+
+[source, xml]
+----
+...
+<extension qualifier="jacoco">
+   <property name="includes">org.foo.*; org.bar.*</property>
+   <property name="excludes">org.bar.baz.*</property>
+   <property name="appendAsmLibrary">true</property>
+</extension>
+----
+
+`appendAsmLibrary` will deploy the ASM library (which is used by JaCoCo) to the server. Defaults to `true`. +
+This can be set to `false` in case the container already provides a suitable version of ASM. +
+In case the `with-asm` flavour is used this property _must_ be set to `true`.
 
 ==== Sonar
 
diff --git a/arquillian-jacoco-with-asm/pom.xml b/arquillian-jacoco-with-asm/pom.xml
new file mode 100644
index 0000000..798035d
--- /dev/null
+++ b/arquillian-jacoco-with-asm/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+
+  <!-- Parent -->
+  <parent>
+    <groupId>org.jboss.arquillian.extension</groupId>
+    <artifactId>arquillian-jacoco-parent</artifactId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>arquillian-jacoco-with-asm</artifactId>
+  <name>Arquillian Extension Jacoco with ASM</name>
+  <description>Jacoco integration to add code coverage to Arquillian, with relocated ASM and JaCoCo</description>
+
+  <!-- Dependencies -->
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.arquillian.extension</groupId>
+      <artifactId>arquillian-jacoco</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- Need to re-define JaCoCo with compile scope instead of provided due to limitations of maven-shade-plugin,
+         see also: https://issues.apache.org/jira/browse/MSHADE-181 -->
+    <dependency>
+      <groupId>org.jacoco</groupId>
+      <artifactId>org.jacoco.core</artifactId>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>${version.maven-shade-plugin}</version>
+        <executions>
+          <execution>
+            <id>shade</id>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <relocations>
+                <relocation>
+                  <pattern>org.objectweb.asm</pattern>
+                  <shadedPattern>org.jboss.arquillian.extension.jacoco.org.objectweb.asm</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.jacoco</pattern>
+                  <shadedPattern>org.jboss.arquillian.extension.jacoco.org.jacoco</shadedPattern>
+                </relocation>
+              </relocations>
+              <artifactSet>
+                <includes>
+                  <include>org.ow2.asm:*</include>
+                  <include>org.jacoco:*</include>
+                  <include>org.jboss.arquillian.extension:*</include>
+                </includes>
+              </artifactSet>
+              <filters>
+                <!-- drop module-info.class and MANIFEST.MF files which would clash anyway -->
+                <!-- drop signatures -->
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>module-info.class</exclude>
+                    <exclude>META-INF/MANIFEST.MF</exclude>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+              <transformers>
+                <!-- generate a MANIFEST.MF -->
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/arquillian-jacoco/pom.xml b/arquillian-jacoco/pom.xml
new file mode 100644
index 0000000..2d5f2a5
--- /dev/null
+++ b/arquillian-jacoco/pom.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+
+  <!-- Parent -->
+  <parent>
+    <groupId>org.jboss.arquillian.extension</groupId>
+    <artifactId>arquillian-jacoco-parent</artifactId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>arquillian-jacoco</artifactId>
+  <name>Arquillian Extension Jacoco</name>
+  <description>Jacoco integration to add code coverage to Arquillian</description>
+
+  <!-- Dependencies -->
+  <dependencies>
+
+    <!-- Non-test dependencies are defined in parent -->
+
+    <!-- Test -->
+    <dependency>
+      <groupId>org.jboss.arquillian.junit</groupId>
+      <artifactId>arquillian-junit-container</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.arquillian.protocol</groupId>
+      <artifactId>arquillian-protocol-servlet</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.shrinkwrap.resolver</groupId>
+      <artifactId>shrinkwrap-resolver-depchain</artifactId>
+      <type>pom</type>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
+      <version>${version.cdi-api}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.spec.javax.ejb</groupId>
+      <artifactId>jboss-ejb-api_3.2_spec</artifactId>
+      <version>${version.ejb3}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>${version.mockito}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>${version.assertj}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <version>${version.asm-util}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>unit</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>org/jboss/arquillian/extension/jacoco/test/unit/*</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>managed</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.wildfly.arquillian</groupId>
+          <artifactId>wildfly-arquillian-container-managed</artifactId>
+          <version>${version.wildfly.arquillian}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack</id>
+                <phase>process-test-classes</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <skip>${maven.test.skip}</skip>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.wildfly</groupId>
+                      <artifactId>wildfly-dist</artifactId>
+                      <version>${version.wildfly}</version>
+                      <type>zip</type>
+                      <overWrite>false</overWrite>
+                      <outputDirectory>${project.build.directory}</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>remote</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.wildfly.arquillian</groupId>
+          <artifactId>wildfly-arquillian-container-remote</artifactId>
+          <version>${version.wildfly.arquillian}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>integration</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>${version.jacoco}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>report</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>report</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+            <executions>
+              <execution>
+                <id>integration-tests</id>
+                <phase>test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <environmentVariables>
+                    <test_container>${wildfly_home}</test_container>
+                  </environmentVariables>
+                  <skip>false</skip>
+                  <includes>
+                    <include>org/jboss/arquillian/extension/jacoco/test/unit/*</include>
+                    <include>org/jboss/arquillian/extension/jacoco/test/integration/*</include>
+                  </includes>
+                </configuration>
+              </execution>
+              <execution>
+                <!--
+                    We need to verify the content of jacoco.exec after the 'test' JVM has
+                    shutdown and flushed the data to disk.
+                 -->
+                <id>verify-output-tests</id>
+                <phase>test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <skip>false</skip>
+                  <includes>
+                    <include>org/jboss/arquillian/extension/jacoco/test/verify/*</include>
+                  </includes>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/CoverageDataCommand.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/CoverageDataCommand.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/CoverageDataCommand.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/CoverageDataCommand.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/CoverageDataReceiver.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/CoverageDataReceiver.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/CoverageDataReceiver.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/CoverageDataReceiver.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoApplicationArchiveProcessor.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoApplicationArchiveProcessor.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoApplicationArchiveProcessor.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoApplicationArchiveProcessor.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoArchiveAppender.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoArchiveAppender.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoArchiveAppender.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoArchiveAppender.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoExtension.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoExtension.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoExtension.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/JaCoCoExtension.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/configuration/JaCoCoConfiguration.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/configuration/JaCoCoConfiguration.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/configuration/JaCoCoConfiguration.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/configuration/JaCoCoConfiguration.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/configuration/JaCoCoConfigurator.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/configuration/JaCoCoConfigurator.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/configuration/JaCoCoConfigurator.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/configuration/JaCoCoConfigurator.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/AndFilter.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/AndFilter.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/AndFilter.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/AndFilter.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/FilterComposer.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/FilterComposer.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/FilterComposer.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/FilterComposer.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/OrFilter.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/OrFilter.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/OrFilter.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/filter/OrFilter.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/ArchiveInstrumenter.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/ArchiveInstrumenter.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/ArchiveInstrumenter.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/ArchiveInstrumenter.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/InstrumentedAsset.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/InstrumentedAsset.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/InstrumentedAsset.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/InstrumentedAsset.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/ManifestAsset.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/ManifestAsset.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/ManifestAsset.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/ManifestAsset.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/SignatureRemover.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/SignatureRemover.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/SignatureRemover.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/client/instrumentation/SignatureRemover.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/container/ArquillianRuntime.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/container/ArquillianRuntime.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/container/ArquillianRuntime.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/container/ArquillianRuntime.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/container/JacocoRemoteExtension.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/container/JacocoRemoteExtension.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/container/JacocoRemoteExtension.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/container/JacocoRemoteExtension.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/container/ShutdownCoverageData.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/container/ShutdownCoverageData.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/container/ShutdownCoverageData.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/container/ShutdownCoverageData.java
diff --git a/src/main/java/org/jboss/arquillian/extension/jacoco/container/StartCoverageData.java b/arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/container/StartCoverageData.java
similarity index 100%
rename from src/main/java/org/jboss/arquillian/extension/jacoco/container/StartCoverageData.java
rename to arquillian-jacoco/src/main/java/org/jboss/arquillian/extension/jacoco/container/StartCoverageData.java
diff --git a/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/arquillian-jacoco/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to arquillian-jacoco/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/ImplicitNoCoverageBean.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/ImplicitNoCoverageBean.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/ImplicitNoCoverageBean.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/ImplicitNoCoverageBean.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/excluded/ExplicitNoCoverageBean.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/excluded/ExplicitNoCoverageBean.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/excluded/ExplicitNoCoverageBean.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/excluded/ExplicitNoCoverageBean.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/included/CoverageBean.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/included/CoverageBean.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/included/CoverageBean.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/included/CoverageBean.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/included/ImportedSubArchive.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/included/ImportedSubArchive.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/included/ImportedSubArchive.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/included/ImportedSubArchive.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/included/SubCoverageBean.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/included/SubCoverageBean.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/included/SubCoverageBean.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/included/SubCoverageBean.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/ImportedSubArchiveTestCase.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/ImportedSubArchiveTestCase.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/ImportedSubArchiveTestCase.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/ImportedSubArchiveTestCase.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/IncludeExcludeTestCase.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/IncludeExcludeTestCase.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/IncludeExcludeTestCase.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/IncludeExcludeTestCase.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/JaCoCoIntegrationTestCase.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/JaCoCoIntegrationTestCase.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/JaCoCoIntegrationTestCase.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/JaCoCoIntegrationTestCase.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/SubArchiveTestCase.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/SubArchiveTestCase.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/SubArchiveTestCase.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/integration/SubArchiveTestCase.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/ArchiveComposedFilterTest.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/ArchiveComposedFilterTest.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/ArchiveComposedFilterTest.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/ArchiveComposedFilterTest.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/ArchiveInstrumenterTest.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/ArchiveInstrumenterTest.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/ArchiveInstrumenterTest.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/ArchiveInstrumenterTest.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/AuxiliaryArchiveAppenderTestCase.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/AuxiliaryArchiveAppenderTestCase.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/AuxiliaryArchiveAppenderTestCase.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/AuxiliaryArchiveAppenderTestCase.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/CoverageDataTestCase.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/CoverageDataTestCase.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/CoverageDataTestCase.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/CoverageDataTestCase.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/FilterComposerTestCase.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/FilterComposerTestCase.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/FilterComposerTestCase.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/FilterComposerTestCase.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/FilterTestUtils.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/FilterTestUtils.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/FilterTestUtils.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/FilterTestUtils.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/InstrumentTestCase.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/InstrumentTestCase.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/InstrumentTestCase.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/unit/InstrumentTestCase.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/verify/CoverageChecker.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/verify/CoverageChecker.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/verify/CoverageChecker.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/verify/CoverageChecker.java
diff --git a/src/test/java/org/jboss/arquillian/extension/jacoco/test/verify/VerifyIntegrationCoverageTestCase.java b/arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/verify/VerifyIntegrationCoverageTestCase.java
similarity index 100%
rename from src/test/java/org/jboss/arquillian/extension/jacoco/test/verify/VerifyIntegrationCoverageTestCase.java
rename to arquillian-jacoco/src/test/java/org/jboss/arquillian/extension/jacoco/test/verify/VerifyIntegrationCoverageTestCase.java
diff --git a/src/test/resources/arquillian.xml b/arquillian-jacoco/src/test/resources/arquillian.xml
similarity index 100%
rename from src/test/resources/arquillian.xml
rename to arquillian-jacoco/src/test/resources/arquillian.xml
diff --git a/src/test/resources/signed.jar b/arquillian-jacoco/src/test/resources/signed.jar
similarity index 100%
rename from src/test/resources/signed.jar
rename to arquillian-jacoco/src/test/resources/signed.jar
diff --git a/pom.xml b/pom.xml
index 2f7a0d2..8c065c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,9 +12,10 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.jboss.arquillian.extension</groupId>
-  <artifactId>arquillian-jacoco</artifactId>
+  <artifactId>arquillian-jacoco-parent</artifactId>
   <version>1.0.1-SNAPSHOT</version>
-  <name>Arquillian Extension Jacoco</name>
+  <packaging>pom</packaging>
+  <name>Arquillian Extension Jacoco Parent</name>
   <description>Jacoco integration to add code coverage to Arquillian</description>
 
   <properties>
@@ -31,6 +32,8 @@
     <version.mockito>1.10.19</version.mockito>
     <version.assertj>2.6.0</version.assertj>
 
+    <version.maven-shade-plugin>3.2.2</version.maven-shade-plugin>
+
     <!-- Overridden from parent -->
     <jdk.min.version>1.5</jdk.min.version>
 
@@ -67,10 +70,17 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.jacoco</groupId>
+        <artifactId>org.jacoco.core</artifactId>
+        <version>${version.jacoco}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
   <!-- Dependencies -->
+  <!-- Defined here to avoid repetition in arquillian-jacoco-with-asm module due to limitations of maven-shade-plugin.
+       Scopes must be as required by arquillian-jacoco, arquillian-jacoco-with-asm will adjust as needed. -->
   <dependencies>
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
@@ -91,210 +101,14 @@
     <dependency>
       <groupId>org.jacoco</groupId>
       <artifactId>org.jacoco.core</artifactId>
-      <version>${version.jacoco}</version>
       <scope>provided</scope>
     </dependency>
-
-    <!-- Test -->
-    <dependency>
-      <groupId>org.jboss.arquillian.junit</groupId>
-      <artifactId>arquillian-junit-container</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.protocol</groupId>
-      <artifactId>arquillian-protocol-servlet</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-depchain</artifactId>
-      <type>pom</type>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.enterprise</groupId>
-      <artifactId>cdi-api</artifactId>
-      <version>${version.cdi-api}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.spec.javax.ejb</groupId>
-      <artifactId>jboss-ejb-api_3.2_spec</artifactId>
-      <version>${version.ejb3}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>${version.mockito}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>${version.assertj}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-util</artifactId>
-      <version>${version.asm-util}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>unit</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <includes>
-                <include>org/jboss/arquillian/extension/jacoco/test/unit/*</include>
-              </includes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>managed</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.wildfly.arquillian</groupId>
-          <artifactId>wildfly-arquillian-container-managed</artifactId>
-          <version>${version.wildfly.arquillian}</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack</id>
-                <phase>process-test-classes</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.wildfly</groupId>
-                      <artifactId>wildfly-dist</artifactId>
-                      <version>${version.wildfly}</version>
-                      <type>zip</type>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.build.directory}</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>remote</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.wildfly.arquillian</groupId>
-          <artifactId>wildfly-arquillian-container-remote</artifactId>
-          <version>${version.wildfly.arquillian}</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>integration</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>${version.jacoco}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>prepare-agent</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>report</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>report</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-            <executions>
-              <execution>
-                <id>integration-tests</id>
-                <phase>test</phase>
-                <goals>
-                  <goal>test</goal>
-                </goals>
-                <configuration>
-                  <environmentVariables>
-                    <test_container>${wildfly_home}</test_container>
-                  </environmentVariables>
-                  <skip>false</skip>
-                  <includes>
-                    <include>org/jboss/arquillian/extension/jacoco/test/unit/*</include>
-                    <include>org/jboss/arquillian/extension/jacoco/test/integration/*</include>
-                  </includes>
-                </configuration>
-              </execution>
-              <execution>
-                <!--
-                    We need to verify the content of jacoco.exec after the 'test' JVM has
-                    shutdown and flushed the data to disk.
-                 -->
-                <id>verify-output-tests</id>
-                <phase>test</phase>
-                <goals>
-                  <goal>test</goal>
-                </goals>
-                <configuration>
-                  <skip>false</skip>
-                  <includes>
-                    <include>org/jboss/arquillian/extension/jacoco/test/verify/*</include>
-                  </includes>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+  <modules>
+    <module>arquillian-jacoco</module>
+    <module>arquillian-jacoco-with-asm</module>
+  </modules>
 
   <build>
     <defaultGoal>clean verify</defaultGoal>