diff --git a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/CreateSnapshotSchema.scala b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/CreateSnapshotSchema.scala
index 6cae3a86a..65f570bc6 100644
--- a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/CreateSnapshotSchema.scala
+++ b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/CreateSnapshotSchema.scala
@@ -5,6 +5,7 @@ import cats.data.{NonEmptyList => Nel}
 import cats.effect.Concurrent
 import cats.syntax.all._
 import com.evolutiongaming.catshelper.LogOf
+import com.evolutiongaming.kafka.journal.cassandra.{CassandraSync, CreateKeyspace, CreateTables, MigrateSchema, SettingStatements}
 import com.evolutiongaming.kafka.journal.eventual.cassandra._
 import com.evolutiongaming.scassandra.TableName
 
diff --git a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SetupSnapshotSchema.scala b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SetupSnapshotSchema.scala
index 384ddc346..af97868ba 100644
--- a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SetupSnapshotSchema.scala
+++ b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SetupSnapshotSchema.scala
@@ -5,7 +5,8 @@ import cats.effect.kernel.Temporal
 import cats.syntax.all._
 import com.evolutiongaming.catshelper.LogOf
 import com.evolutiongaming.kafka.journal.Origin
-import com.evolutiongaming.kafka.journal.eventual.cassandra.{CassandraCluster, CassandraConsistencyConfig, CassandraSession, CassandraSync, SettingsCassandra}
+import com.evolutiongaming.kafka.journal.cassandra.{CassandraConsistencyConfig, CassandraSync, SettingsCassandra}
+import com.evolutiongaming.kafka.journal.eventual.cassandra.{CassandraCluster, CassandraSession}
 
 /** Creates a new schema */
 object SetupSnapshotSchema {
diff --git a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotCassandra.scala b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotCassandra.scala
index c9252b0d1..a39d91fdc 100644
--- a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotCassandra.scala
+++ b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotCassandra.scala
@@ -6,8 +6,9 @@ import cats.syntax.all._
 import cats.{Monad, MonadThrow, Parallel}
 import com.evolutiongaming.catshelper.LogOf
 import com.evolutiongaming.kafka.journal._
+import com.evolutiongaming.kafka.journal.cassandra.CassandraConsistencyConfig
 import com.evolutiongaming.kafka.journal.eventual.EventualPayloadAndType
-import com.evolutiongaming.kafka.journal.eventual.cassandra.{CassandraCluster, CassandraConsistencyConfig, CassandraSession}
+import com.evolutiongaming.kafka.journal.eventual.cassandra.{CassandraCluster, CassandraSession}
 import com.evolutiongaming.scassandra.CassandraClusterOf
 
 import java.time.Instant
diff --git a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotCassandraConfig.scala b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotCassandraConfig.scala
index 19ef1568a..94b186587 100644
--- a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotCassandraConfig.scala
+++ b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotCassandraConfig.scala
@@ -1,7 +1,7 @@
 package com.evolutiongaming.kafka.journal.snapshot.cassandra
 
 import com.datastax.driver.core.ConsistencyLevel
-import com.evolutiongaming.kafka.journal.eventual.cassandra.CassandraConsistencyConfig
+import com.evolutiongaming.kafka.journal.cassandra.CassandraConsistencyConfig
 import com.evolutiongaming.scassandra.{CassandraConfig, QueryConfig}
 import pureconfig.ConfigReader
 import pureconfig.generic.semiauto.deriveReader
diff --git a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotSchemaConfig.scala b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotSchemaConfig.scala
index fa8d33110..779f469ed 100644
--- a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotSchemaConfig.scala
+++ b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotSchemaConfig.scala
@@ -1,6 +1,6 @@
 package com.evolutiongaming.kafka.journal.snapshot.cassandra
 
-import com.evolutiongaming.kafka.journal.eventual.cassandra.KeyspaceConfig
+import com.evolutiongaming.kafka.journal.cassandra.KeyspaceConfig
 import pureconfig.ConfigReader
 import pureconfig.generic.semiauto.deriveReader
 
diff --git a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotStatements.scala b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotStatements.scala
index 6d7e330ee..cef3ff44c 100644
--- a/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotStatements.scala
+++ b/snapshot-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/SnapshotStatements.scala
@@ -4,9 +4,10 @@ import cats.Monad
 import cats.syntax.all._
 import com.datastax.driver.core.Row
 import com.evolutiongaming.kafka.journal._
+import com.evolutiongaming.kafka.journal.cassandra.CassandraConsistencyConfig
 import com.evolutiongaming.kafka.journal.eventual.EventualPayloadAndType
 import com.evolutiongaming.kafka.journal.eventual.cassandra.CassandraHelper._
-import com.evolutiongaming.kafka.journal.eventual.cassandra.{CassandraConsistencyConfig, CassandraSession}
+import com.evolutiongaming.kafka.journal.eventual.cassandra.CassandraSession
 import com.evolutiongaming.scassandra.syntax._
 import com.evolutiongaming.scassandra.{DecodeByName, EncodeByName, TableName}
 import scodec.bits.ByteVector
diff --git a/snapshot-cassandra/src/test/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/CreateSnapshotSchemaSpec.scala b/snapshot-cassandra/src/test/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/CreateSnapshotSchemaSpec.scala
index f2ebaa539..202e1b4ed 100644
--- a/snapshot-cassandra/src/test/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/CreateSnapshotSchemaSpec.scala
+++ b/snapshot-cassandra/src/test/scala/com/evolutiongaming/kafka/journal/snapshot/cassandra/CreateSnapshotSchemaSpec.scala
@@ -2,7 +2,7 @@ package com.evolutiongaming.kafka.journal.snapshot.cassandra
 
 import cats.data.{NonEmptyList => Nel, State}
 import cats.syntax.all._
-import com.evolutiongaming.kafka.journal.eventual.cassandra.{CreateKeyspace, CreateTables, KeyspaceConfig}
+import com.evolutiongaming.kafka.journal.cassandra.{CreateKeyspace, CreateTables, KeyspaceConfig}
 import com.evolutiongaming.scassandra.TableName
 import org.scalatest.funsuite.AnyFunSuite