diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/jaxrs-client-2.0-common.gradle
similarity index 100%
rename from instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0.gradle
rename to instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/jaxrs-client-2.0-common.gradle
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ClientTracingFeature.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ClientTracingFeature.java
similarity index 100%
rename from instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ClientTracingFeature.java
rename to instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ClientTracingFeature.java
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ClientTracingFilter.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ClientTracingFilter.java
similarity index 100%
rename from instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ClientTracingFilter.java
rename to instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ClientTracingFilter.java
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/InjectAdapter.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/InjectAdapter.java
similarity index 100%
rename from instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/InjectAdapter.java
rename to instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/InjectAdapter.java
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientInstrumentationModule.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientInstrumentationModule.java
similarity index 100%
rename from instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientInstrumentationModule.java
rename to instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientInstrumentationModule.java
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientTracer.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientTracer.java
similarity index 100%
rename from instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientTracer.java
rename to instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientTracer.java
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/test/groovy/JaxMultithreadedClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/test/groovy/JaxMultithreadedClientTest.groovy
similarity index 100%
rename from instrumentation/jaxrs-client/jaxrs-client-2.0/src/test/groovy/JaxMultithreadedClientTest.groovy
rename to instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/test/groovy/JaxMultithreadedClientTest.groovy
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/test/groovy/JaxRsClientAsyncTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/test/groovy/JaxRsClientAsyncTest.groovy
similarity index 100%
rename from instrumentation/jaxrs-client/jaxrs-client-2.0/src/test/groovy/JaxRsClientAsyncTest.groovy
rename to instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/test/groovy/JaxRsClientAsyncTest.groovy
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/test/groovy/JaxRsClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/test/groovy/JaxRsClientTest.groovy
similarity index 100%
rename from instrumentation/jaxrs-client/jaxrs-client-2.0/src/test/groovy/JaxRsClientTest.groovy
rename to instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/test/groovy/JaxRsClientTest.groovy
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/test/groovy/ResteasyProxyClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/test/groovy/ResteasyProxyClientTest.groovy
similarity index 100%
rename from instrumentation/jaxrs-client/jaxrs-client-2.0/src/test/groovy/ResteasyProxyClientTest.groovy
rename to instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/test/groovy/ResteasyProxyClientTest.groovy
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/jaxrs-client-2.0-jersey-2.0.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/jaxrs-client-2.0-jersey-2.0.gradle
index 75a3ad353b..643f5d4680 100644
--- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/jaxrs-client-2.0-jersey-2.0.gradle
+++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/jaxrs-client-2.0-jersey-2.0.gradle
@@ -11,5 +11,5 @@ muzzle {
 dependencies {
   compileOnly group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0'
 
-  implementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0')
+  implementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-common')
 }
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/jaxrs-client-2.0-resteasy-2.0.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/jaxrs-client-2.0-resteasy-2.0.gradle
index 6d9b19cd20..24bc78799e 100644
--- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/jaxrs-client-2.0-resteasy-2.0.gradle
+++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/jaxrs-client-2.0-resteasy-2.0.gradle
@@ -11,5 +11,5 @@ muzzle {
 dependencies {
   compileOnly group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.0.Final'
 
-  implementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0')
+  implementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-common')
 }
diff --git a/settings.gradle b/settings.gradle
index b408e42e02..719dc3ddd9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -113,7 +113,7 @@ include ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.0'
 include ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1'
 include ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing'
 include ':instrumentation:jaxrs-client:jaxrs-client-1.1'
-include ':instrumentation:jaxrs-client:jaxrs-client-2.0'
+include ':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-common'
 include ':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-jersey-2.0'
 include ':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-resteasy-2.0'
 include ':instrumentation:jdbc'