diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
index 73a0c83443e..e10488176ac 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
@@ -1,8 +1,6 @@
 package org.testcontainers.cassandra;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import org.testcontainers.cassandra.delegate.CassandraDatabaseDelegate;
-import org.testcontainers.cassandra.wait.CassandraQueryWaitStrategy;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.ext.ScriptUtils;
 import org.testcontainers.ext.ScriptUtils.ScriptLoadException;
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
similarity index 96%
rename from modules/cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java
rename to modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
index 47b92958ea5..6965b3a1df8 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
@@ -1,10 +1,9 @@
-package org.testcontainers.cassandra.delegate;
+package org.testcontainers.cassandra;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.testcontainers.cassandra.CassandraContainer;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.ExecConfig;
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/wait/CassandraQueryWaitStrategy.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraQueryWaitStrategy.java
similarity index 93%
rename from modules/cassandra/src/main/java/org/testcontainers/cassandra/wait/CassandraQueryWaitStrategy.java
rename to modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraQueryWaitStrategy.java
index 1d1004eb3df..d42f9f7c324 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/wait/CassandraQueryWaitStrategy.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraQueryWaitStrategy.java
@@ -1,7 +1,6 @@
-package org.testcontainers.cassandra.wait;
+package org.testcontainers.cassandra;
 
 import org.rnorth.ducttape.TimeoutException;
-import org.testcontainers.cassandra.delegate.CassandraDatabaseDelegate;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
 import org.testcontainers.delegate.DatabaseDelegate;
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java b/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
index 33372ca6c78..7b7739490ea 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
@@ -14,7 +14,7 @@
 /**
  * Cassandra database delegate
  *
- * @deprecated use {@link org.testcontainers.cassandra.delegate.CassandraDatabaseDelegate} instead.
+ * @deprecated use {@link org.testcontainers.cassandra.CassandraDatabaseDelegate} instead.
  */
 @Slf4j
 @RequiredArgsConstructor
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java b/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
index 362e33e3543..9694711de6e 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
@@ -13,7 +13,7 @@
 /**
  * Waits until Cassandra returns its version
  *
- * @deprecated use {@link org.testcontainers.cassandra.wait.CassandraQueryWaitStrategy} instead.
+ * @deprecated use {@link org.testcontainers.cassandra.CassandraQueryWaitStrategy} instead.
  */
 @Deprecated
 public class CassandraQueryWaitStrategy extends AbstractWaitStrategy {