diff --git a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/Effect.kt b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/Effect.kt
index 7a1b4aed334..798141bbe30 100644
--- a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/Effect.kt
+++ b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/Effect.kt
@@ -1,11 +1,14 @@
 package arrow.continuations
 
 import arrow.continuations.generic.DelimitedScope
+import arrow.continuations.generic.deprecateArrowContinuation
 
+@Deprecated(deprecateArrowContinuation)
 public fun interface Effect<F> {
   public fun control(): DelimitedScope<F>
 
   public companion object {
+    @Deprecated("$deprecateArrowContinuation Here one can use effect { } directly")
     public suspend inline fun <Eff : Effect<*>, F, A> suspended(
       crossinline eff: (DelimitedScope<F>) -> Eff,
       crossinline just: (A) -> F,
@@ -13,6 +16,7 @@ public fun interface Effect<F> {
     ): F =
       Reset.suspended { just(f(eff(this))) }
 
+    @Deprecated("$deprecateArrowContinuation Here one can use eagerEffect { } directly")
     public inline fun <Eff : Effect<*>, F, A> restricted(
       crossinline eff: (DelimitedScope<F>) -> Eff,
       crossinline just: (A) -> F,
diff --git a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/Reset.kt b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/Reset.kt
index 4f9f8717029..cd620c38fa7 100644
--- a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/Reset.kt
+++ b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/Reset.kt
@@ -6,9 +6,11 @@ import arrow.continuations.generic.DelimContScope
 import arrow.continuations.generic.RestrictedScope
 import arrow.continuations.generic.SuspendMonadContinuation
 import arrow.continuations.generic.SuspendedScope
+import arrow.continuations.generic.deprecateArrowContinuation
 import kotlin.coroutines.intrinsics.suspendCoroutineUninterceptedOrReturn
 
 @PublishedApi
+@Deprecated(deprecateArrowContinuation)
 internal object Reset {
   /**
    * Allows for building suspending single-shot computation blocks.
@@ -21,6 +23,7 @@ internal object Reset {
    * use `Either.catch`, `Validated.catch` etc or `e.nonFatalOrThrow()`
    * to ensure you're not catching `ShortCircuit`.
    */
+  @Deprecated(deprecateArrowContinuation)
   public suspend fun <A> suspended(block: suspend SuspendedScope<A>.() -> A): A =
     suspendCoroutineUninterceptedOrReturn { cont ->
       SuspendMonadContinuation(cont, block)
@@ -32,6 +35,7 @@ internal object Reset {
    * For short-circuiting, or shifting, `@RestrictSuspension` state machine is used.
    * This doesn't allow nesting of computation blocks, or foreign suspension.
    */
+  @Deprecated(deprecateArrowContinuation)
   // TODO This should be @RestrictSuspension but that breaks because a superclass is not considered to be correct scope
   fun <A> restricted(block: suspend RestrictedScope<A>.() -> A): A =
     DelimContScope(block).invoke()
diff --git a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/AtomicRef.kt b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/AtomicRef.kt
index 30231b11daf..8b4c0433661 100644
--- a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/AtomicRef.kt
+++ b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/AtomicRef.kt
@@ -1,5 +1,6 @@
 package arrow.continuations.generic
 
+@Deprecated("$deprecateArrowContinuation The AtomicRef APIs have been moved to arrow.core.generic", ReplaceWith("AtomicRef<V>", "arrow.core.generic.AtomicRef"))
 public expect class AtomicRef<V>(initialValue: V) {
   public fun get(): V
   public fun set(value: V)
@@ -15,12 +16,14 @@ public expect class AtomicRef<V>(initialValue: V) {
 /**
  * Infinite loop that reads this atomic variable and performs the specified [action] on its value.
  */
+@Deprecated("$deprecateArrowContinuation The AtomicRef APIs have been moved to arrow.core.generic", ReplaceWith("loop(action)", "arrow.core.generic.loop"))
 public inline fun <V> AtomicRef<V>.loop(action: (V) -> Unit): Nothing {
   while (true) {
     action(get())
   }
 }
 
+@Deprecated("$deprecateArrowContinuation The AtomicRef APIs have been moved to arrow.core.generic", ReplaceWith("update(function)", "arrow.core.generic.update"))
 public inline fun <V> AtomicRef<V>.update(function: (V) -> V) {
   while (true) {
     val cur = get()
@@ -32,6 +35,7 @@ public inline fun <V> AtomicRef<V>.update(function: (V) -> V) {
 /**
  * Updates variable atomically using the specified [function] of its value and returns its old value.
  */
+@Deprecated("$deprecateArrowContinuation The AtomicRef APIs have been moved to arrow.core.generic", ReplaceWith("getAndUpdate(function)", "arrow.core.generic.getAndUpdate"))
 public inline fun <V> AtomicRef<V>.getAndUpdate(function: (V) -> V): V {
   while (true) {
     val cur = get()
@@ -43,6 +47,7 @@ public inline fun <V> AtomicRef<V>.getAndUpdate(function: (V) -> V): V {
 /**
  * Updates variable atomically using the specified [function] of its value and returns its new value.
  */
+@Deprecated("$deprecateArrowContinuation The AtomicRef APIs have been moved to arrow.core.generic", ReplaceWith("updateAndGet", "arrow.core.generic.updateAndGet"))
 public inline fun <V> AtomicRef<V>.updateAndGet(function: (V) -> V): V {
   while (true) {
     val cur = get()
diff --git a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/ControlThrowable.kt b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/ControlThrowable.kt
index e6336bb4388..4ddbfe07b65 100644
--- a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/ControlThrowable.kt
+++ b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/ControlThrowable.kt
@@ -6,4 +6,8 @@ package arrow.continuations.generic
  * and `arrow.core.NonFatal` does not catch this [Throwable].
  * Thus by extension `Either.catch` and `Validated.catch` also don't catch [ControlThrowable].
  */
+@Deprecated(deprecateArrowContinuation)
 public expect open class ControlThrowable() : Throwable
+
+internal const val deprecateArrowContinuation: String =
+  "arrow.continuation is being discontinued and will be removed in the next version in favor of the Effect/ EagerEffect Runtime. If you depend on low-level APIs as in arrow.continuation, feel free to write us in the Kotlin Slack channel for guidance."
diff --git a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/DelimitedCont.kt b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/DelimitedCont.kt
index 5b8c99b1ea9..a84f969fcd9 100644
--- a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/DelimitedCont.kt
+++ b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/DelimitedCont.kt
@@ -3,6 +3,7 @@ package arrow.continuations.generic
 /**
  * Base interface for a continuation
  */
+@Deprecated(deprecateArrowContinuation)
 public interface DelimitedContinuation<A, R> {
   public suspend operator fun invoke(a: A): R
 }
@@ -10,6 +11,7 @@ public interface DelimitedContinuation<A, R> {
 /**
  * Base interface for our scope.
  */
+@Deprecated(deprecateArrowContinuation)
 public interface DelimitedScope<R> {
 
   /**
@@ -18,6 +20,7 @@ public interface DelimitedScope<R> {
   public suspend fun <A> shift(r: R): A
 }
 
+@Deprecated(deprecateArrowContinuation)
 public interface RestrictedScope<R> : DelimitedScope<R> {
   /**
    * Capture the continuation and pass it to [f].
@@ -27,4 +30,5 @@ public interface RestrictedScope<R> : DelimitedScope<R> {
   public override suspend fun <A> shift(r: R): A = shift { r }
 }
 
+@Deprecated(deprecateArrowContinuation)
 public interface SuspendedScope<R> : DelimitedScope<R>
diff --git a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/ShortCircuit.kt b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/ShortCircuit.kt
index 5abae04440a..66b2c445979 100644
--- a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/ShortCircuit.kt
+++ b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/ShortCircuit.kt
@@ -1,3 +1,4 @@
 package arrow.continuations.generic
 
+@Deprecated(deprecateArrowContinuation)
 public class ShortCircuit internal constructor(internal val token: Token, public val raiseValue: Any?) : ControlThrowable()
diff --git a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/Token.kt b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/Token.kt
index 998b6b404e1..511f90b1fef 100644
--- a/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/Token.kt
+++ b/arrow-libs/core/arrow-continuations/src/commonMain/kotlin/arrow/continuations/generic/Token.kt
@@ -1,6 +1,7 @@
 package arrow.continuations.generic
 
 /** Represents a unique identifier using object equality. */
+@Deprecated(deprecateArrowContinuation)
 internal class Token {
   override fun toString(): String = "Token(${hashCode().toString(16)})"
 }
diff --git a/arrow-libs/core/arrow-continuations/src/jsMain/kotlin/arrow/continuations/generic/AtomicRef.kt b/arrow-libs/core/arrow-continuations/src/jsMain/kotlin/arrow/continuations/generic/AtomicRef.kt
index d50158968cc..9b845acb0a9 100644
--- a/arrow-libs/core/arrow-continuations/src/jsMain/kotlin/arrow/continuations/generic/AtomicRef.kt
+++ b/arrow-libs/core/arrow-continuations/src/jsMain/kotlin/arrow/continuations/generic/AtomicRef.kt
@@ -1,5 +1,6 @@
 package arrow.continuations.generic
 
+@Deprecated(deprecateArrowContinuation)
 public actual class AtomicRef<V> actual constructor(initialValue: V) {
   private var internalValue: V = initialValue
 
diff --git a/arrow-libs/core/arrow-continuations/src/jsMain/kotlin/arrow/continuations/generic/ControlThrowable.kt b/arrow-libs/core/arrow-continuations/src/jsMain/kotlin/arrow/continuations/generic/ControlThrowable.kt
index 360899b8f3e..83e3ef54c08 100644
--- a/arrow-libs/core/arrow-continuations/src/jsMain/kotlin/arrow/continuations/generic/ControlThrowable.kt
+++ b/arrow-libs/core/arrow-continuations/src/jsMain/kotlin/arrow/continuations/generic/ControlThrowable.kt
@@ -6,4 +6,5 @@ package arrow.continuations.generic
  * and `arrow.core.NonFatal` does not catch this [Throwable].
  * Thus by extension `Either.catch` and `Validated.catch` also don't catch [ControlThrowable.kt].
  */
+@Deprecated(deprecateArrowContinuation)
 public actual open class ControlThrowable : Throwable()
diff --git a/arrow-libs/core/arrow-continuations/src/jvmMain/kotlin/arrow/continuations/generic/AtomicRef.kt b/arrow-libs/core/arrow-continuations/src/jvmMain/kotlin/arrow/continuations/generic/AtomicRef.kt
index cebd3dea38d..2a6268230d7 100644
--- a/arrow-libs/core/arrow-continuations/src/jvmMain/kotlin/arrow/continuations/generic/AtomicRef.kt
+++ b/arrow-libs/core/arrow-continuations/src/jvmMain/kotlin/arrow/continuations/generic/AtomicRef.kt
@@ -4,4 +4,5 @@ package arrow.continuations.generic
 
 import java.util.concurrent.atomic.AtomicReference
 
+@Deprecated(deprecateArrowContinuation)
 public actual typealias AtomicRef<V> = AtomicReference<V>
diff --git a/arrow-libs/core/arrow-continuations/src/jvmMain/kotlin/arrow/continuations/generic/ControlThrowable.kt b/arrow-libs/core/arrow-continuations/src/jvmMain/kotlin/arrow/continuations/generic/ControlThrowable.kt
index e7692193576..5b773b30a7d 100644
--- a/arrow-libs/core/arrow-continuations/src/jvmMain/kotlin/arrow/continuations/generic/ControlThrowable.kt
+++ b/arrow-libs/core/arrow-continuations/src/jvmMain/kotlin/arrow/continuations/generic/ControlThrowable.kt
@@ -7,6 +7,7 @@ package arrow.continuations.generic
  * and `arrow.core.NonFatal` does not catch this [Throwable].
  * Thus by extension `Either.catch` and `Validated.catch` also don't catch [ControlThrowable.kt].
  */
+@Deprecated(deprecateArrowContinuation)
 public actual open class ControlThrowable : Throwable() {
   override fun fillInStackTrace(): Throwable = this
 }
diff --git a/arrow-libs/core/arrow-continuations/src/nativeMain/kotlin/arrow.continuations/generic/AtomicRef.kt b/arrow-libs/core/arrow-continuations/src/nativeMain/kotlin/arrow.continuations/generic/AtomicRef.kt
index 5525ef697f9..36d201b6cbc 100644
--- a/arrow-libs/core/arrow-continuations/src/nativeMain/kotlin/arrow.continuations/generic/AtomicRef.kt
+++ b/arrow-libs/core/arrow-continuations/src/nativeMain/kotlin/arrow.continuations/generic/AtomicRef.kt
@@ -4,6 +4,7 @@ import kotlin.native.concurrent.AtomicReference
 import kotlin.native.concurrent.freeze
 import kotlin.native.concurrent.isFrozen
 
+@Deprecated(deprecateArrowContinuation)
 public actual class AtomicRef<V> actual constructor(initialValue: V) {
   private val atom = AtomicReference(initialValue.freeze())
   public actual fun get(): V = atom.value
diff --git a/arrow-libs/core/arrow-continuations/src/nativeMain/kotlin/arrow.continuations/generic/ControlThrowable.kt b/arrow-libs/core/arrow-continuations/src/nativeMain/kotlin/arrow.continuations/generic/ControlThrowable.kt
index 86cc4968250..dedc2b8463c 100644
--- a/arrow-libs/core/arrow-continuations/src/nativeMain/kotlin/arrow.continuations/generic/ControlThrowable.kt
+++ b/arrow-libs/core/arrow-continuations/src/nativeMain/kotlin/arrow.continuations/generic/ControlThrowable.kt
@@ -6,4 +6,5 @@ package arrow.continuations.generic
  * and `arrow.core.NonFatal` does not catch this [Throwable].
  * Thus by extension `Either.catch` and `Validated.catch` also don't catch [ControlThrowable].
  */
+@Deprecated(deprecateArrowContinuation)
 public actual open class ControlThrowable : Throwable()
diff --git a/arrow-libs/core/arrow-core/api/arrow-core.api b/arrow-libs/core/arrow-core/api/arrow-core.api
index 9c5e5087893..7c7e08aa15e 100644
--- a/arrow-libs/core/arrow-core/api/arrow-core.api
+++ b/arrow-libs/core/arrow-core/api/arrow-core.api
@@ -2511,6 +2511,13 @@ public final class arrow/core/computations/result {
 	public final fun invoke-IoAF18A (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
+public final class arrow/core/continuations/AtomicRefKt {
+	public static final fun getAndUpdate (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public static final fun loop (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;)Ljava/lang/Void;
+	public static final fun update (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;)V
+	public static final fun updateAndGet (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+}
+
 public final class arrow/core/continuations/Eager : arrow/core/continuations/ShiftCancellationException {
 	public fun <init> (Larrow/core/continuations/Token;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
 	public final fun getRecover ()Lkotlin/jvm/functions/Function1;
diff --git a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/AtomicRef.kt b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/AtomicRef.kt
new file mode 100644
index 00000000000..fb7e6d61e6c
--- /dev/null
+++ b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/AtomicRef.kt
@@ -0,0 +1,52 @@
+package arrow.core.continuations
+
+public expect class AtomicRef<V>(initialValue: V) {
+  public fun get(): V
+  public fun set(value: V)
+  public fun getAndSet(value: V): V
+
+  /**
+   * Compare current value with expected and set to new if they're the same. Note, 'compare' is checking
+   * the actual object id, not 'equals'.
+   */
+  public fun compareAndSet(expected: V, new: V): Boolean
+}
+
+/**
+ * Infinite loop that reads this atomic variable and performs the specified [action] on its value.
+ */
+public inline fun <V> AtomicRef<V>.loop(action: (V) -> Unit): Nothing {
+  while (true) {
+    action(get())
+  }
+}
+
+public inline fun <V> AtomicRef<V>.update(function: (V) -> V) {
+  while (true) {
+    val cur = get()
+    val upd = function(cur)
+    if (compareAndSet(cur, upd)) return
+  }
+}
+
+/**
+ * Updates variable atomically using the specified [function] of its value and returns its old value.
+ */
+public inline fun <V> AtomicRef<V>.getAndUpdate(function: (V) -> V): V {
+  while (true) {
+    val cur = get()
+    val upd = function(cur)
+    if (compareAndSet(cur, upd)) return cur
+  }
+}
+
+/**
+ * Updates variable atomically using the specified [function] of its value and returns its new value.
+ */
+public inline fun <V> AtomicRef<V>.updateAndGet(function: (V) -> V): V {
+  while (true) {
+    val cur = get()
+    val upd = function(cur)
+    if (compareAndSet(cur, upd)) return upd
+  }
+}
diff --git a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/ior.kt b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/ior.kt
index 543827176a9..99ff373005a 100644
--- a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/ior.kt
+++ b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/ior.kt
@@ -1,7 +1,5 @@
 package arrow.core.continuations
 
-import arrow.continuations.generic.AtomicRef
-import arrow.continuations.generic.updateAndGet
 import arrow.core.EmptyValue
 import arrow.core.Ior
 import arrow.core.identity
diff --git a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/memoization.kt b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/memoization.kt
index 311fdd6f7da..52d0e8d1101 100644
--- a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/memoization.kt
+++ b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/memoization.kt
@@ -2,8 +2,8 @@
 
 package arrow.core
 
-import arrow.continuations.generic.AtomicRef
-import arrow.continuations.generic.loop
+import arrow.core.continuations.AtomicRef
+import arrow.core.continuations.loop
 import kotlin.jvm.JvmName
 
 /**
diff --git a/arrow-libs/core/arrow-core/src/jsMain/kotlin/arrow/core/continuations/AtomicRef.kt b/arrow-libs/core/arrow-core/src/jsMain/kotlin/arrow/core/continuations/AtomicRef.kt
new file mode 100644
index 00000000000..d839476478d
--- /dev/null
+++ b/arrow-libs/core/arrow-core/src/jsMain/kotlin/arrow/core/continuations/AtomicRef.kt
@@ -0,0 +1,30 @@
+package arrow.core.continuations
+
+public actual class AtomicRef<V> actual constructor(initialValue: V) {
+  private var internalValue: V = initialValue
+
+  /**
+   * Compare current value with expected and set to new if they're the same. Note, 'compare' is checking
+   * the actual object id, not 'equals'.
+   */
+  public actual fun compareAndSet(expected: V, new: V): Boolean {
+    return if (expected === internalValue) {
+      internalValue = new
+      true
+    } else {
+      false
+    }
+  }
+
+  public actual fun getAndSet(value: V): V {
+    val oldValue = internalValue
+    internalValue = value
+    return oldValue
+  }
+
+  public actual fun get(): V = internalValue
+
+  public actual fun set(value: V) {
+    internalValue = value
+  }
+}
diff --git a/arrow-libs/core/arrow-core/src/jvmMain/kotlin/arrow/core/continuations/AtomicRef.kt b/arrow-libs/core/arrow-core/src/jvmMain/kotlin/arrow/core/continuations/AtomicRef.kt
new file mode 100644
index 00000000000..564deb22311
--- /dev/null
+++ b/arrow-libs/core/arrow-core/src/jvmMain/kotlin/arrow/core/continuations/AtomicRef.kt
@@ -0,0 +1,7 @@
+@file:JvmName("AtomicReferenceActual")
+
+package arrow.core.continuations
+
+import java.util.concurrent.atomic.AtomicReference
+
+public actual typealias AtomicRef<V> = AtomicReference<V>
diff --git a/arrow-libs/core/arrow-core/src/nativeMain/kotlin/arrow/core/continuations/AtomicRef.kt b/arrow-libs/core/arrow-core/src/nativeMain/kotlin/arrow/core/continuations/AtomicRef.kt
new file mode 100644
index 00000000000..bc63616ad47
--- /dev/null
+++ b/arrow-libs/core/arrow-core/src/nativeMain/kotlin/arrow/core/continuations/AtomicRef.kt
@@ -0,0 +1,30 @@
+package arrow.core.continuations
+
+import kotlin.native.concurrent.AtomicReference
+import kotlin.native.concurrent.freeze
+import kotlin.native.concurrent.isFrozen
+
+public actual class AtomicRef<V> actual constructor(initialValue: V) {
+  private val atom = AtomicReference(initialValue.freeze())
+  public actual fun get(): V = atom.value
+
+  public actual fun set(value: V) {
+    atom.value = value.freeze()
+  }
+
+  public actual fun getAndSet(value: V): V {
+    if (atom.isFrozen) value.freeze()
+    while (true) {
+      val cur = atom.value
+      if (cur === value) return cur
+      if (atom.compareAndSwap(cur, value) === cur) return cur
+    }
+  }
+
+  /**
+   * Compare current value with expected and set to new if they're the same. Note, 'compare' is checking
+   * the actual object id, not 'equals'.
+   */
+  public actual fun compareAndSet(expected: V, new: V): Boolean =
+    atom.compareAndSet(expected, new.freeze())
+}
diff --git a/arrow-libs/fx/arrow-fx-coroutines-test/src/jvmMain/kotlin/arrow/fx/coroutines/predef-test-jvm.kt b/arrow-libs/fx/arrow-fx-coroutines-test/src/jvmMain/kotlin/arrow/fx/coroutines/predef-test-jvm.kt
index fb7dae887c1..44c119c1508 100644
--- a/arrow-libs/fx/arrow-fx-coroutines-test/src/jvmMain/kotlin/arrow/fx/coroutines/predef-test-jvm.kt
+++ b/arrow-libs/fx/arrow-fx-coroutines-test/src/jvmMain/kotlin/arrow/fx/coroutines/predef-test-jvm.kt
@@ -1,6 +1,6 @@
 package arrow.fx.coroutines
 
-import arrow.continuations.generic.AtomicRef
+import arrow.core.continuations.AtomicRef
 import java.util.concurrent.ThreadFactory
 import kotlin.coroutines.CoroutineContext
 
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/Atomic.kt b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/Atomic.kt
index 246b09609c5..e8b16b27798 100644
--- a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/Atomic.kt
+++ b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/Atomic.kt
@@ -1,6 +1,6 @@
 package arrow.fx.coroutines
 
-import arrow.continuations.generic.AtomicRef
+import arrow.core.continuations.AtomicRef
 
 /**
  * An [Atomic] with an initial value of [A].
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/CircuitBreaker.kt b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/CircuitBreaker.kt
index bd8eed25eef..ccc8a6cd478 100644
--- a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/CircuitBreaker.kt
+++ b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/CircuitBreaker.kt
@@ -1,7 +1,7 @@
 package arrow.fx.coroutines
 
-import arrow.continuations.generic.AtomicRef
 import arrow.core.Either
+import arrow.core.continuations.AtomicRef
 import arrow.core.identity
 import arrow.fx.coroutines.CircuitBreaker.State.Closed
 import arrow.fx.coroutines.CircuitBreaker.State.HalfOpen
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/Resource.kt b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/Resource.kt
index cbedff467db..43bbd4f719e 100644
--- a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/Resource.kt
+++ b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/Resource.kt
@@ -1,7 +1,7 @@
 package arrow.fx.coroutines
 
-import arrow.continuations.generic.AtomicRef
-import arrow.continuations.generic.update
+import arrow.core.continuations.AtomicRef
+import arrow.core.continuations.update
 import arrow.core.NonEmptyList
 import arrow.core.ValidatedNel
 import arrow.core.identity
diff --git a/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/TVar.kt b/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/TVar.kt
index 2d256acd255..01224173376 100644
--- a/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/TVar.kt
+++ b/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/TVar.kt
@@ -1,8 +1,8 @@
 package arrow.fx.stm
 
-import arrow.continuations.generic.AtomicRef
-import arrow.continuations.generic.update
-import arrow.continuations.generic.updateAndGet
+import arrow.core.continuations.AtomicRef
+import arrow.core.continuations.update
+import arrow.core.continuations.updateAndGet
 import arrow.fx.stm.internal.STMFrame
 import arrow.fx.stm.internal.STMTransaction
 import kotlin.coroutines.resume
diff --git a/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/internal/Impl.kt b/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/internal/Impl.kt
index dfb6fae6931..327d6a68173 100644
--- a/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/internal/Impl.kt
+++ b/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/internal/Impl.kt
@@ -1,6 +1,6 @@
 package arrow.fx.stm.internal
 
-import arrow.continuations.generic.AtomicRef
+import arrow.core.continuations.AtomicRef
 import arrow.fx.stm.STM
 import arrow.fx.stm.TVar
 import kotlinx.coroutines.suspendCancellableCoroutine