diff --git a/extensions/java16/pom.xml b/integrationtest/java16/pom.xml
similarity index 88%
rename from extensions/java16/pom.xml
rename to integrationtest/java16/pom.xml
index 814be0bb..0e86bce7 100644
--- a/extensions/java16/pom.xml
+++ b/integrationtest/java16/pom.xml
@@ -7,7 +7,7 @@
 
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
-        <artifactId>extension-parent</artifactId>
+        <artifactId>integrationtest-parent</artifactId>
         <version>0.24.1-148_records-SNAPSHOT</version>
     </parent>
 
@@ -16,12 +16,6 @@
 
     <dependencies>
 
-        <!-- Should transitively bind all extensions for lesser java versions -->
-        <dependency>
-            <groupId>io.toolisticon.aptk</groupId>
-            <artifactId>aptk-tools-java9</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.toolisticon.aptk</groupId>
             <artifactId>aptk-tools</artifactId>
@@ -57,7 +51,6 @@
                                     </excludes>
                                     <includes>
                                         <include>io.toolisticon.aptk:aptk-tools:*</include>
-                                        <include>io.toolisticon.aptk:aptk-tools-java9:*</include>
                                         <include>*:*:*:*:test:*</include>
                                         <include>*:*:*:*:provided:*</include>
                                     </includes>
@@ -84,6 +77,14 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
 
         </plugins>
 
diff --git a/extensions/java16/src/test/java/io/toolisticon/aptk/tools/wrapper/Java16Tests.java b/integrationtest/java16/src/test/java/io/toolisticon/aptk/tools/wrapper/Java16Tests.java
similarity index 100%
rename from extensions/java16/src/test/java/io/toolisticon/aptk/tools/wrapper/Java16Tests.java
rename to integrationtest/java16/src/test/java/io/toolisticon/aptk/tools/wrapper/Java16Tests.java
diff --git a/extensions/java9/pom.xml b/integrationtest/java9/pom.xml
similarity index 89%
rename from extensions/java9/pom.xml
rename to integrationtest/java9/pom.xml
index 17b2be14..761d794e 100644
--- a/extensions/java9/pom.xml
+++ b/integrationtest/java9/pom.xml
@@ -7,7 +7,7 @@
 
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
-        <artifactId>extension-parent</artifactId>
+        <artifactId>integrationtest-parent</artifactId>
         <version>0.24.1-148_records-SNAPSHOT</version>
     </parent>
 
@@ -77,6 +77,13 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
 
         </plugins>
 
diff --git a/extensions/java9/src/test/java/io/toolisticon/aptk/wrapper/ModuleElementWrapperTest.java b/integrationtest/java9/src/test/java/io/toolisticon/aptk/wrapper/ModuleElementWrapperTest.java
similarity index 100%
rename from extensions/java9/src/test/java/io/toolisticon/aptk/wrapper/ModuleElementWrapperTest.java
rename to integrationtest/java9/src/test/java/io/toolisticon/aptk/wrapper/ModuleElementWrapperTest.java
diff --git a/extensions/pom.xml b/integrationtest/pom.xml
similarity index 91%
rename from extensions/pom.xml
rename to integrationtest/pom.xml
index 9bafa412..2a587340 100644
--- a/extensions/pom.xml
+++ b/integrationtest/pom.xml
@@ -1,7 +1,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>extension-parent</artifactId>
+    <artifactId>integrationtest-parent</artifactId>
     <packaging>pom</packaging>
 
     <parent>
@@ -10,7 +10,7 @@
         <version>0.24.1-148_records-SNAPSHOT</version>
     </parent>
 
-    <name>extension-parent</name>
+    <name>integrationtest-parent</name>
 
 
     <!-- activate module support for Java 9 -->
diff --git a/pom.xml b/pom.xml
index 5d5f6272..01f9b5d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
         <module>tools</module>
         <module>example</module>
         <module>templating</module>
-        <module>extensions</module>
+        <module>integrationtest</module>
 
         <!-- wrapper processor -->
         <module>annotationwrapper</module>
diff --git a/tools/src/main/java/io/toolisticon/aptk/tools/wrapper/RecordComponentElementWrapper.java b/tools/src/main/java/io/toolisticon/aptk/tools/wrapper/RecordComponentElementWrapper.java
index a08bd743..c41db307 100644
--- a/tools/src/main/java/io/toolisticon/aptk/tools/wrapper/RecordComponentElementWrapper.java
+++ b/tools/src/main/java/io/toolisticon/aptk/tools/wrapper/RecordComponentElementWrapper.java
@@ -31,6 +31,11 @@ public ExecutableElementWrapper getAccessor() {
         return ExecutableElementWrapper.wrap(this.<ExecutableElement>invokeParameterlessMethodOfElement("getAccessor", null));
     }
 
+    /**
+     * Re-wraps an ElementWrapper to a RecordComponentElementWrapper.
+     * @param element the wrapper to re-wrap
+     * @return The RecordComponentElementWrapper or null if the passed ElementWrapper doesn't wrap a RecordComponentElement
+     */
     public static RecordComponentElementWrapper toRecordComponentElement(ElementWrapper<?> element) {
         if (element == null) {
             return null;
@@ -38,6 +43,12 @@ public static RecordComponentElementWrapper toRecordComponentElement(ElementWrap
         return RecordComponentElementWrapper.wrap(element.unwrap());
     }
 
+    /**
+     * Wraps an element with the RecordComponentElementWrapper.
+     *
+     * @param element the element to wrap
+     * @return the wrapped element, or null if passed element isn't an RecordComponentElement
+     */
     public static RecordComponentElementWrapper wrap(Element element) {
         if (element == null || !"RECORD_COMPONENT".equals(element.getKind().name())) {
             return null;