diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index ec3e6e790d2..c9f1b8903c4 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -19,8 +19,6 @@ sourceSets {
             srcDir 'src'
             srcDir commonSrcDir
             srcDir '../unsigned/src'
-            srcDir '../coroutines/common/src'
-            srcDir '../coroutines/src'
         }
     }
     test {
diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle
index 1de12932ccf..7924298b0ad 100644
--- a/libraries/stdlib/js/build.gradle
+++ b/libraries/stdlib/js/build.gradle
@@ -15,9 +15,6 @@ def builtinsSrcDir = "${buildDir}/builtin-sources"
 def builtinsSrcDir2 = "${buildDir}/builtin-sources-for-builtins"
 def commonSrcDir = "${projectDir}/../src/kotlin"
 def commonSrcDir2 = "${projectDir}/../common/src"
-def coroutinesCommonHSrcDir = "${rootDir}/libraries/stdlib/coroutines/common/src"
-def coroutinesCommonSrcDir = "${rootDir}/libraries/stdlib/coroutines/src"
-def coroutinesJsSrcDir = "${rootDir}/libraries/stdlib/coroutines/js/src"
 def coroutinesExpJsSrcDir = "${rootDir}/libraries/stdlib/coroutines-experimental/js/src"
 
 def builtinsDir = "${rootDir}/core/builtins"
@@ -50,7 +47,6 @@ sourceSets {
         kotlin {
             srcDir builtinsSrcDir
             srcDir jsSrcDir
-            srcDir coroutinesJsSrcDir
         }
     }
 
@@ -151,7 +147,7 @@ compileKotlin2Js {
         sourceMap = true
         sourceMapPrefix = "./"
         freeCompilerArgs += [
-            "-source-map-base-dirs", [builtinsSrcDir, jsSrcDir, commonSrcDir, commonSrcDir2, coroutinesJsSrcDir, coroutinesCommonSrcDir, coroutinesCommonHSrcDir, unsignedCommonSrcDir].collect { file(it).absoluteFile }.join(File.pathSeparator),
+            "-source-map-base-dirs", [builtinsSrcDir, jsSrcDir, commonSrcDir, commonSrcDir2, unsignedCommonSrcDir].collect { file(it).absoluteFile }.join(File.pathSeparator),
             "-Xuse-experimental=kotlin.Experimental",
             "-Xuse-experimental=kotlin.ExperimentalMultiplatform",
             "-Xuse-experimental=kotlin.contracts.ExperimentalContracts",
@@ -253,7 +249,7 @@ task compileJs(type: JavaExec) {
             if (prefixToRemove != null) sourcePath.substring(prefixToRemove.length()) else sourcePath
         }
 
-        def sourceMapSourcesBaseDirs = [jsSrcDir, jsSrcJsDir, builtinsSrcDir, commonSrcDir, commonSrcDir2, projectDir, experimentalSrcDir,  unsignedCommonSrcDir, coroutinesJsSrcDir, coroutinesCommonSrcDir, coroutinesCommonHSrcDir]
+        def sourceMapSourcesBaseDirs = [jsSrcDir, jsSrcJsDir, builtinsSrcDir, commonSrcDir, commonSrcDir2, projectDir, experimentalSrcDir,  unsignedCommonSrcDir]
 
         sourceMap.sourcesContent = sourceMap.sources.collect { sourceName ->
             def text = sourceMapSourcesBaseDirs.collect { file("$it/$sourceName") }.find { it.exists() }?.text
diff --git a/libraries/stdlib/coroutines/js/src/kotlin/coroutines/js/internal/CoroutineImpl.kt b/libraries/stdlib/js/src/kotlin/coroutines/CoroutineImpl.kt
similarity index 100%
rename from libraries/stdlib/coroutines/js/src/kotlin/coroutines/js/internal/CoroutineImpl.kt
rename to libraries/stdlib/js/src/kotlin/coroutines/CoroutineImpl.kt
diff --git a/libraries/stdlib/coroutines/js/src/kotlin/coroutines/SafeContinuationJs.kt b/libraries/stdlib/js/src/kotlin/coroutines/SafeContinuationJs.kt
similarity index 100%
rename from libraries/stdlib/coroutines/js/src/kotlin/coroutines/SafeContinuationJs.kt
rename to libraries/stdlib/js/src/kotlin/coroutines/SafeContinuationJs.kt
diff --git a/libraries/stdlib/coroutines/js/src/kotlin/coroutines/intrinsics/IntrinsicsJs.kt b/libraries/stdlib/js/src/kotlin/coroutines/intrinsics/IntrinsicsJs.kt
similarity index 100%
rename from libraries/stdlib/coroutines/js/src/kotlin/coroutines/intrinsics/IntrinsicsJs.kt
rename to libraries/stdlib/js/src/kotlin/coroutines/intrinsics/IntrinsicsJs.kt
diff --git a/libraries/stdlib/coroutines/js/src/kotlin/coroutines/js/internal/EmptyContinuation.kt b/libraries/stdlib/js/src/kotlin/coroutines/js/internal/EmptyContinuation.kt
similarity index 100%
rename from libraries/stdlib/coroutines/js/src/kotlin/coroutines/js/internal/EmptyContinuation.kt
rename to libraries/stdlib/js/src/kotlin/coroutines/js/internal/EmptyContinuation.kt
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 068cdc21a14..fbb829826ea 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -19,7 +19,6 @@ sourceSets {
             srcDir "${rootDir}/core/builtins/src"
             srcDir 'runtime'
             srcDir 'src'
-            srcDir '../coroutines/jvm/src'
         }
     }
     experimental {
diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt
similarity index 100%
rename from libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt
rename to libraries/stdlib/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt
diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt
similarity index 100%
rename from libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt
rename to libraries/stdlib/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt
diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt
similarity index 100%
rename from libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt
rename to libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt
diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/CoroutineStackFrame.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/CoroutineStackFrame.kt
similarity index 100%
rename from libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/CoroutineStackFrame.kt
rename to libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/CoroutineStackFrame.kt
diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/DebugMetadata.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/DebugMetadata.kt
similarity index 100%
rename from libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/DebugMetadata.kt
rename to libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/DebugMetadata.kt
diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/DebugProbes.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/DebugProbes.kt
similarity index 100%
rename from libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/DebugProbes.kt
rename to libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/DebugProbes.kt
diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/RunSuspend.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/RunSuspend.kt
similarity index 100%
rename from libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/RunSuspend.kt
rename to libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/RunSuspend.kt
diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/boxing.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/boxing.kt
similarity index 100%
rename from libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/boxing.kt
rename to libraries/stdlib/jvm/src/kotlin/coroutines/jvm/internal/boxing.kt
diff --git a/libraries/stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt b/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt
similarity index 100%
rename from libraries/stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt
rename to libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt
diff --git a/libraries/stdlib/coroutines/src/kotlin/coroutines/Continuation.kt b/libraries/stdlib/src/kotlin/coroutines/Continuation.kt
similarity index 100%
rename from libraries/stdlib/coroutines/src/kotlin/coroutines/Continuation.kt
rename to libraries/stdlib/src/kotlin/coroutines/Continuation.kt
diff --git a/libraries/stdlib/coroutines/src/kotlin/coroutines/ContinuationInterceptor.kt b/libraries/stdlib/src/kotlin/coroutines/ContinuationInterceptor.kt
similarity index 100%
rename from libraries/stdlib/coroutines/src/kotlin/coroutines/ContinuationInterceptor.kt
rename to libraries/stdlib/src/kotlin/coroutines/ContinuationInterceptor.kt
diff --git a/libraries/stdlib/coroutines/src/kotlin/coroutines/CoroutineContext.kt b/libraries/stdlib/src/kotlin/coroutines/CoroutineContext.kt
similarity index 100%
rename from libraries/stdlib/coroutines/src/kotlin/coroutines/CoroutineContext.kt
rename to libraries/stdlib/src/kotlin/coroutines/CoroutineContext.kt
diff --git a/libraries/stdlib/coroutines/src/kotlin/coroutines/CoroutineContextImpl.kt b/libraries/stdlib/src/kotlin/coroutines/CoroutineContextImpl.kt
similarity index 100%
rename from libraries/stdlib/coroutines/src/kotlin/coroutines/CoroutineContextImpl.kt
rename to libraries/stdlib/src/kotlin/coroutines/CoroutineContextImpl.kt
diff --git a/libraries/stdlib/coroutines/common/src/kotlin/CoroutinesH.kt b/libraries/stdlib/src/kotlin/coroutines/CoroutinesH.kt
similarity index 100%
rename from libraries/stdlib/coroutines/common/src/kotlin/CoroutinesH.kt
rename to libraries/stdlib/src/kotlin/coroutines/CoroutinesH.kt
diff --git a/libraries/stdlib/coroutines/common/src/kotlin/CoroutinesIntrinsicsH.kt b/libraries/stdlib/src/kotlin/coroutines/CoroutinesIntrinsicsH.kt
similarity index 100%
rename from libraries/stdlib/coroutines/common/src/kotlin/CoroutinesIntrinsicsH.kt
rename to libraries/stdlib/src/kotlin/coroutines/CoroutinesIntrinsicsH.kt
diff --git a/libraries/stdlib/coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt b/libraries/stdlib/src/kotlin/coroutines/intrinsics/Intrinsics.kt
similarity index 100%
rename from libraries/stdlib/coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt
rename to libraries/stdlib/src/kotlin/coroutines/intrinsics/Intrinsics.kt
diff --git a/libraries/stdlib/coroutines/src/kotlin/Result.kt b/libraries/stdlib/src/kotlin/util/Result.kt
similarity index 100%
rename from libraries/stdlib/coroutines/src/kotlin/Result.kt
rename to libraries/stdlib/src/kotlin/util/Result.kt
diff --git a/libraries/stdlib/coroutines/src/kotlin/SuccessOrFailure.kt b/libraries/stdlib/src/kotlin/util/SuccessOrFailure.kt
similarity index 100%
rename from libraries/stdlib/coroutines/src/kotlin/SuccessOrFailure.kt
rename to libraries/stdlib/src/kotlin/util/SuccessOrFailure.kt