diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/build.gradle b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3/build.gradle
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3/gradle.lockfile
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/ContactPointsUtil.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/ContactPointsUtil.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/ContactPointsUtil.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/ContactPointsUtil.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/test/groovy/CassandraClientTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/test/groovy/CassandraClientTest.groovy
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.8/build.gradle b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/build.gradle
similarity index 97%
rename from dd-java-agent/instrumentation/datastax-cassandra-3.8/build.gradle
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/build.gradle
index 0e2e9efba6c..15a3a1dba0d 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra-3.8/build.gradle
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     exclude group: 'com.datastax.cassandra', module: 'cassandra-driver-core'
   }
 
-  testImplementation project(':dd-java-agent:instrumentation:datastax-cassandra-3')
+  testImplementation project(':dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-3.0')
   testImplementation project(':dd-java-agent:instrumentation:guava-10')
 
   latestDepTestImplementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.8+'
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.8/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3.8/gradle.lockfile
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/ContactPointsUtil.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/ContactPointsUtil.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/ContactPointsUtil.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/ContactPointsUtil.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/build.gradle b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-4/build.gradle
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/build.gradle
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-4/gradle.lockfile
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientAdvice.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientAdvice.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientAdvice.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/ContactPointsUtil.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/ContactPointsUtil.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/ContactPointsUtil.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/ContactPointsUtil.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-4/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/test/groovy/CassandraClientTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-4/src/test/groovy/CassandraClientTest.groovy
rename to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/test/groovy/CassandraClientTest.groovy
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cfd3bc5f748..90d792a6c9f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -292,9 +292,9 @@ include(
   ":dd-java-agent:instrumentation:cucumber",
   ":dd-java-agent:instrumentation:cxf-2.1",
   ":dd-java-agent:instrumentation:datanucleus-4",
-  ":dd-java-agent:instrumentation:datastax-cassandra-3",
-  ":dd-java-agent:instrumentation:datastax-cassandra-3.8",
-  ":dd-java-agent:instrumentation:datastax-cassandra-4",
+  ":dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-3.0",
+  ":dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-3.8",
+  ":dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-4.0",
   ":dd-java-agent:instrumentation:dropwizard",
   ":dd-java-agent:instrumentation:dropwizard:dropwizard-views",
   ":dd-java-agent:instrumentation:elasticsearch",