From 8fa8ba70558cfd610d91b1c6ba55c37967ac35c5 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Thu, 26 Jan 2017 13:56:10 +0300
Subject: [PATCH] Move coroutine-related runtime parts to
 kotlin.coroutines.experimental package

 #KT-15975 Fixed
---
 .../box/coroutines/accessorForSuspend.kt      |   4 +-
 .../codegen/box/coroutines/asyncIterator.kt   |   4 +-
 .../box/coroutines/asyncIteratorToList.kt     |   4 +-
 .../testData/codegen/box/coroutines/await.kt  |  12 +--
 .../box/coroutines/beginWithException.kt      |   4 +-
 .../beginWithExceptionNoHandleException.kt    |   4 +-
 .../codegen/box/coroutines/coercionToUnit.kt  |   4 +-
 .../coroutines/controlFlow/breakFinally.kt    |   4 +-
 .../coroutines/controlFlow/breakStatement.kt  |   4 +-
 .../controlFlow/doWhileStatement.kt           |   4 +-
 .../box/coroutines/controlFlow/forContinue.kt |   4 +-
 .../coroutines/controlFlow/forStatement.kt    |   4 +-
 .../box/coroutines/controlFlow/ifStatement.kt |   4 +-
 .../controlFlow/returnFromFinally.kt          |   4 +-
 .../coroutines/controlFlow/switchLikeWhen.kt  |   4 +-
 .../coroutines/controlFlow/throwFromCatch.kt  |   4 +-
 .../controlFlow/throwInTryWithHandleResult.kt |   4 +-
 .../coroutines/controlFlow/whileStatement.kt  |   4 +-
 .../controllerAccessFromInnerLambda.kt        |   4 +-
 .../coroutines/defaultParametersInSuspend.kt  |   4 +-
 .../codegen/box/coroutines/dispatchResume.kt  |   4 +-
 .../codegen/box/coroutines/emptyClosure.kt    |   4 +-
 .../box/coroutines/falseUnitCoercion.kt       |   4 +-
 .../codegen/box/coroutines/generate.kt        |   4 +-
 .../codegen/box/coroutines/handleException.kt |   4 +-
 .../coroutines/handleResultCallEmptyBody.kt   |   4 +-
 .../handleResultNonUnitExpression.kt          |   4 +-
 .../box/coroutines/handleResultSuspended.kt   |   4 +-
 .../codegen/box/coroutines/illegalState.kt    |   4 +-
 .../box/coroutines/inlineSuspendFunction.kt   |   4 +-
 .../box/coroutines/inlinedTryCatchFinally.kt  |   4 +-
 .../box/coroutines/innerSuspensionCalls.kt    |   4 +-
 .../box/coroutines/instanceOfContinuation.kt  |   4 +-
 .../intLikeVarSpilling/complicatedMerge.kt    |   4 +-
 .../intLikeVarSpilling/i2bResult.kt           |   4 +-
 .../loadFromBooleanArray.kt                   |   4 +-
 .../intLikeVarSpilling/loadFromByteArray.kt   |   4 +-
 .../intLikeVarSpilling/noVariableInTable.kt   |   4 +-
 .../intLikeVarSpilling/sameIconst1ManyVars.kt |   4 +-
 .../intLikeVarSpilling/usedInArrayStore.kt    |   4 +-
 .../intLikeVarSpilling/usedInMethodCall.kt    |   4 +-
 .../intLikeVarSpilling/usedInPutfield.kt      |   4 +-
 .../intLikeVarSpilling/usedInVarStore.kt      |   4 +-
 .../box/coroutines/iterateOverArray.kt        |   4 +-
 .../codegen/box/coroutines/kt12958.kt         |   4 +-
 .../codegen/box/coroutines/kt15016.kt         |   6 +-
 .../codegen/box/coroutines/kt15017.kt         |   4 +-
 .../box/coroutines/lastExpressionIsLoop.kt    |   4 +-
 .../box/coroutines/lastStatementInc.kt        |   4 +-
 .../box/coroutines/lastStementAssignment.kt   |   4 +-
 .../box/coroutines/lastUnitExpression.kt      |   4 +-
 .../codegen/box/coroutines/localDelegate.kt   |   8 +-
 .../inlineFunctionWithOptionalParam.kt        |   4 +-
 .../box/coroutines/multiModule/simple.kt      |   8 +-
 .../box/coroutines/multipleInvokeCalls.kt     |   4 +-
 .../multipleInvokeCallsInsideInlineLambda1.kt |   4 +-
 .../multipleInvokeCallsInsideInlineLambda2.kt |   4 +-
 .../multipleInvokeCallsInsideInlineLambda3.kt |   4 +-
 .../codegen/box/coroutines/nestedTryCatch.kt  |   4 +-
 .../box/coroutines/noSuspensionPoints.kt      |   4 +-
 .../nonLocalReturnFromInlineLambda.kt         |   4 +-
 .../nonLocalReturnFromInlineLambdaDeep.kt     |   4 +-
 .../codegen/box/coroutines/returnByLabel.kt   |   4 +-
 .../testData/codegen/box/coroutines/simple.kt |   4 +-
 .../codegen/box/coroutines/simpleException.kt |   4 +-
 .../box/coroutines/simpleWithHandleResult.kt  |   4 +-
 .../coroutines/stackUnwinding/exception.kt    |   4 +-
 .../stackUnwinding/inlineSuspendFunction.kt   |   4 +-
 .../box/coroutines/stackUnwinding/simple.kt   |   4 +-
 .../stackUnwinding/suspendInCycle.kt          |   4 +-
 .../coroutines/statementLikeLastExpression.kt |   4 +-
 .../box/coroutines/suspendDefaultImpl.kt      |   4 +-
 .../box/coroutines/suspendDelegation.kt       |   4 +-
 .../box/coroutines/suspendFromInlineLambda.kt |   4 +-
 .../suspendFunImportedFromObject.kt           |   6 +-
 .../dispatchResume.kt                         |   4 +-
 .../handleException.kt                        |   4 +-
 .../suspendFunctionAsCoroutine/inline.kt      |   4 +-
 .../inlineTwoReceivers.kt                     |   6 +-
 .../suspendFunctionAsCoroutine/member.kt      |   4 +-
 .../noinlineTwoReceivers.kt                   |   6 +-
 .../suspendFunctionAsCoroutine/operators.kt   |   4 +-
 .../privateFunctions.kt                       |   4 +-
 .../privateInFile.kt                          |   4 +-
 .../returnNoSuspend.kt                        |   4 +-
 .../suspendFunctionAsCoroutine/simple.kt      |   4 +-
 .../withVariables.kt                          |   4 +-
 .../suspendFunctionTypeCall/localVal.kt       |   4 +-
 .../suspendFunctionTypeCall/manyParameters.kt |   4 +-
 .../suspendFunctionTypeCall/simple.kt         |   4 +-
 .../codegen/box/coroutines/suspendInCycle.kt  |   4 +-
 .../suspendInTheMiddleOfObjectConstruction.kt |   4 +-
 .../coroutines/suspensionInsideSafeCall.kt    |   4 +-
 .../suspensionInsideSafeCallWithElvis.kt      |   4 +-
 .../tailOperations/suspendWithIf.kt           |   4 +-
 .../tailOperations/suspendWithTryCatch.kt     |   4 +-
 .../tailOperations/suspendWithWhen.kt         |   4 +-
 .../tryCatchFinallyWithHandleResult.kt        |   4 +-
 .../coroutines/tryCatchWithHandleResult.kt    |   4 +-
 .../tryFinallyInsideInlineLambda.kt           |   4 +-
 .../coroutines/tryFinallyWithHandleResult.kt  |   4 +-
 .../unitTypeReturn/coroutineNonLocalReturn.kt |   4 +-
 .../unitTypeReturn/coroutineReturn.kt         |   4 +-
 .../unitTypeReturn/suspendNonLocalReturn.kt   |   4 +-
 .../unitTypeReturn/suspendReturn.kt           |   4 +-
 .../coroutines/varValueConflictsWithTable.kt  |   4 +-
 .../varValueConflictsWithTableSameSort.kt     |   4 +-
 .../bytecodeListing/coroutineFields.kt        |   4 +-
 .../bytecodeListing/coroutineFields.txt       |  20 ++--
 .../codegen/bytecodeText/constCoroutine.kt    |   6 +-
 .../intLikeVarSpilling/complicatedMerge.kt    |   4 +-
 .../intLikeVarSpilling/i2bResult.kt           |   4 +-
 .../loadFromBooleanArray.kt                   |   4 +-
 .../intLikeVarSpilling/loadFromByteArray.kt   |   4 +-
 .../intLikeVarSpilling/noVariableInTable.kt   |   4 +-
 .../intLikeVarSpilling/sameIconst1ManyVars.kt |   4 +-
 .../intLikeVarSpilling/usedInArrayStore.kt    |   4 +-
 .../intLikeVarSpilling/usedInMethodCall.kt    |   4 +-
 .../intLikeVarSpilling/usedInPutfield.kt      |   4 +-
 .../intLikeVarSpilling/usedInVarStore.kt      |   4 +-
 .../coroutines/varValueConflictsWithTable.kt  |   4 +-
 .../varValueConflictsWithTableSameSort.kt     |   4 +-
 .../dumpDeclarations/suspendOverride.json     |   6 +-
 compiler/testData/codegen/java8/box/async.kt  |   4 +-
 .../codegen/java8/box/asyncException.kt       |   6 +-
 .../coroutinesBinary.kt                       |   4 +-
 .../coroutines/noDefaultCoroutineImports.kt   |   2 +-
 .../restrictSuspension/extensions.kt          |   2 +-
 .../restrictSuspension/notRelatedFun.kt       |   2 +-
 .../restrictSuspension/sameInstance.kt        |   2 +-
 .../restrictSuspension/simpleForbidden.kt     |   2 +-
 .../tests/coroutines/suspendApplicability.kt  |   2 +-
 .../coroutines/suspendCoroutineOrReturn.kt    |   4 +-
 .../tests/coroutines/suspendFunctions.kt      |   2 +-
 .../tests/coroutines/tailCalls/forbidden.kt   |   4 +-
 .../tailCalls/nothingTypedSuspendFunction.kt  |   4 +-
 .../tests/coroutines/tailCalls/tryCatch.kt    |   4 +-
 .../tests/coroutines/tailCalls/valid.kt       |   4 +-
 .../incompatibleCallables/common.kt           |   2 +-
 .../incompatibleCallables/jvm.kt              |   2 +-
 .../kotlin/test/KotlinTestUtils.java          |   2 +-
 .../kotlin/resolve/DescriptorUtils.java       |   2 +-
 .../stubBuilder/Modifiers/Modifiers.kt        |   2 +-
 .../stubBuilder/Modifiers/Modifiers.txt       |   6 +-
 .../annotation/Annotation_verification.xml    |   2 +-
 .../inlineFunCallSite/coroutine/usage.kt      |   4 +-
 js/js.libraries/src/core/coroutines.kt        |   4 +-
 .../stdlib/common/src/kotlin/CoroutinesH.kt   |   2 +-
 .../src/kotlin/collections/SequenceBuilder.kt |   4 +-
 .../ContinuationInterceptor.kt                |   2 +-
 .../{ => experimental}/CoroutineContext.kt    |   2 +-
 .../CoroutineContextImpl.kt                   |   4 +-
 .../{ => experimental}/Coroutines.kt          |   4 +-
 .../{ => experimental}/CoroutinesLibrary.kt   |  28 ++++-
 .../intrinsics/Intrinsics.kt                  |   4 +-
 .../jvm}/internal/CoroutineImpl.kt            |  10 +-
 .../jvm}/internal/CoroutineIntrinsics.kt      |   7 +-
 .../test/coroutines/CoroutineContextTest.kt   |   4 +-
 .../kotlin-stdlib-runtime-merged.txt          | 100 +++++++++---------
 .../reference-public-api/kotlin-stdlib.txt    | 100 +++++++++---------
 160 files changed, 451 insertions(+), 430 deletions(-)
 rename libraries/stdlib/src/kotlin/coroutines/{ => experimental}/ContinuationInterceptor.kt (97%)
 rename libraries/stdlib/src/kotlin/coroutines/{ => experimental}/CoroutineContext.kt (98%)
 rename libraries/stdlib/src/kotlin/coroutines/{ => experimental}/CoroutineContextImpl.kt (98%)
 rename libraries/stdlib/src/kotlin/coroutines/{ => experimental}/Coroutines.kt (95%)
 rename libraries/stdlib/src/kotlin/coroutines/{ => experimental}/CoroutinesLibrary.kt (83%)
 rename libraries/stdlib/src/kotlin/coroutines/{ => experimental}/intrinsics/Intrinsics.kt (95%)
 rename libraries/stdlib/src/kotlin/coroutines/{ => experimental/jvm}/internal/CoroutineImpl.kt (89%)
 rename libraries/stdlib/src/kotlin/coroutines/{ => experimental/jvm}/internal/CoroutineIntrinsics.kt (76%)

diff --git a/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt b/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt
index 364267d68fe..a107ef05993 100644
--- a/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt
+++ b/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)
diff --git a/compiler/testData/codegen/box/coroutines/asyncIterator.kt b/compiler/testData/codegen/box/coroutines/asyncIterator.kt
index 0d04fb781a7..9ca14d43c98 100644
--- a/compiler/testData/codegen/box/coroutines/asyncIterator.kt
+++ b/compiler/testData/codegen/box/coroutines/asyncIterator.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 interface AsyncGenerator<in T> {
     suspend fun yield(value: T)
diff --git a/compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt b/compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt
index 2c42a69ceee..e4d6a3a6d8b 100644
--- a/compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt
+++ b/compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 interface AsyncGenerator<in T> {
     suspend fun yield(value: T)
diff --git a/compiler/testData/codegen/box/coroutines/await.kt b/compiler/testData/codegen/box/coroutines/await.kt
index 78f9d099dd0..2a9d842c05d 100644
--- a/compiler/testData/codegen/box/coroutines/await.kt
+++ b/compiler/testData/codegen/box/coroutines/await.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // FILE: promise.kt
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Promise<T>(private val executor: ((T) -> Unit) -> Unit) {
     private var value: Any? = null
@@ -49,8 +49,8 @@ fun processQueue() {
 }
 
 // FILE: await.kt
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 private var log = ""
 
@@ -95,8 +95,8 @@ fun <T> asyncOperation(resultSupplier: () -> T) = Promise<T> { resolve ->
 fun getLog() = log
 
 // FILE: main.kt
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 private fun test() = async<String> {
     val o = await(asyncOperation { "O" })
diff --git a/compiler/testData/codegen/box/coroutines/beginWithException.kt b/compiler/testData/codegen/box/coroutines/beginWithException.kt
index 3e8464cfa38..e11a087a858 100644
--- a/compiler/testData/codegen/box/coroutines/beginWithException.kt
+++ b/compiler/testData/codegen/box/coroutines/beginWithException.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): Any = suspendCoroutineOrReturn { x -> }
 
diff --git a/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt b/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt
index 6948a917de6..235c8c3075b 100644
--- a/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt
+++ b/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 suspend fun suspendHere(): Any = suspendCoroutineOrReturn { x ->}
 
 fun builder(c: suspend () -> Unit) {
diff --git a/compiler/testData/codegen/box/coroutines/coercionToUnit.kt b/compiler/testData/codegen/box/coroutines/coercionToUnit.kt
index fd32cf70a8f..dd29dbddd9c 100644
--- a/compiler/testData/codegen/box/coroutines/coercionToUnit.kt
+++ b/compiler/testData/codegen/box/coroutines/coercionToUnit.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 suspend fun <T> await(t: T): T = suspendCoroutineOrReturn { c ->
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt b/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt
index c1e5b5ef513..baaedfb4495 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt
index 2afb66fed33..30fc75b1f84 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt
index ffb6aac5099..27241802b66 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt b/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt
index a68269835d4..f591e57adad 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt
index 1aa4b2bdcca..c9a17303b68 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt
index dad5ab4a7d4..71f81cf688b 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt b/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt
index 523e9ef3db2..0c0405de98b 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var result = ""
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt b/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt
index d6bceae838f..2f93c497082 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt b/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt
index a58fac93052..9420d1b91d5 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt
index 693cc4aa85f..59a42166e02 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt
index 8090e40d633..f0c268d0af4 100644
--- a/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt
+++ b/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt b/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt
index a22cd7526f6..ece0ff26921 100644
--- a/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt
+++ b/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var result = false
diff --git a/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt b/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt
index b9d0226e122..fc56d18ca21 100644
--- a/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt
+++ b/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(a: String = "abc", i: Int = 2): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/dispatchResume.kt b/compiler/testData/codegen/box/coroutines/dispatchResume.kt
index 5d725d0e05e..b3488d3f28f 100644
--- a/compiler/testData/codegen/box/coroutines/dispatchResume.kt
+++ b/compiler/testData/codegen/box/coroutines/dispatchResume.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var log = ""
diff --git a/compiler/testData/codegen/box/coroutines/emptyClosure.kt b/compiler/testData/codegen/box/coroutines/emptyClosure.kt
index 8094bf4ea4d..540a0a25217 100644
--- a/compiler/testData/codegen/box/coroutines/emptyClosure.kt
+++ b/compiler/testData/codegen/box/coroutines/emptyClosure.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var result = 0
 
diff --git a/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt b/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt
index 8d5f2ad9de6..022e74b80fd 100644
--- a/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt
+++ b/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun <T> suspendHere(v: T): T = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/generate.kt b/compiler/testData/codegen/box/coroutines/generate.kt
index d10f11bb533..b326b232ace 100644
--- a/compiler/testData/codegen/box/coroutines/generate.kt
+++ b/compiler/testData/codegen/box/coroutines/generate.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // FULL_JDK
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 fun box(): String {
     val x = gen().joinToString()
diff --git a/compiler/testData/codegen/box/coroutines/handleException.kt b/compiler/testData/codegen/box/coroutines/handleException.kt
index be4eb86bf9d..7ef67a04bfd 100644
--- a/compiler/testData/codegen/box/coroutines/handleException.kt
+++ b/compiler/testData/codegen/box/coroutines/handleException.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var exception: Throwable? = null
diff --git a/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt b/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt
index b9eb3a6bc1c..20bf73c9e0e 100644
--- a/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt
+++ b/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 fun builder(c: suspend () -> Unit): String {
diff --git a/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt b/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt
index 841363b99be..bae4da5fab2 100644
--- a/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt
+++ b/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt b/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt
index 7b7859cccad..4a011ed2261 100644
--- a/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt
+++ b/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var log = ""
diff --git a/compiler/testData/codegen/box/coroutines/illegalState.kt b/compiler/testData/codegen/box/coroutines/illegalState.kt
index edc61314b27..11d1cf7170c 100644
--- a/compiler/testData/codegen/box/coroutines/illegalState.kt
+++ b/compiler/testData/codegen/box/coroutines/illegalState.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TARGET_BACKEND: JVM
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
     x.resume(Unit)
diff --git a/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt b/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt
index c31fe6d2cc7..2ad35e90f0c 100644
--- a/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt
+++ b/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt
@@ -4,8 +4,8 @@
 // CHECK_NOT_CALLED: suspendInline_61zpoe$
 // CHECK_NOT_CALLED: suspendInline_6r51u9$
 // CHECK_NOT_CALLED: suspendInline
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     fun withValue(v: String, x: Continuation<String>) {
diff --git a/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt b/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt
index dd803039834..71a4ff6a5da 100644
--- a/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt
+++ b/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 var wasCalled = false
diff --git a/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt b/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt
index 3a17dd7dd84..b5eadb4c952 100644
--- a/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt
+++ b/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var i = 0
diff --git a/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt b/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt
index bb2d0f32248..b7468dc713f 100644
--- a/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt
+++ b/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // WITH_REFLECT
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun runInstanceOf(): Boolean = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt
index 42d7cac2929..5142e7804ed 100644
--- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt
+++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt
index 2b2d665be72..c6aa585c8d5 100644
--- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt
+++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt
index 2409129a56a..e264f22f2dc 100644
--- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt
+++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt
index b80ae0714b7..1efc473ea59 100644
--- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt
+++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt
index df7af8d271c..361ca74875d 100644
--- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt
+++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt
index 372e237f685..62d7f065422 100644
--- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt
+++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt
index 6b091928145..2e16ba91215 100644
--- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt
+++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TARGET_BACKEND: JVM
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt
index e23cf66b5ef..03f3714ed62 100644
--- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt
+++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt
index ecf3605cfcf..76e22fe2ef0 100644
--- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt
+++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TARGET_BACKEND: JVM
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt
index 1343bbeaaa5..7b95bd6370f 100644
--- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt
+++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/iterateOverArray.kt b/compiler/testData/codegen/box/coroutines/iterateOverArray.kt
index 39aad3dd897..87e12b602f7 100644
--- a/compiler/testData/codegen/box/coroutines/iterateOverArray.kt
+++ b/compiler/testData/codegen/box/coroutines/iterateOverArray.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/kt12958.kt b/compiler/testData/codegen/box/coroutines/kt12958.kt
index 1ac633f9ba8..c39baa283a1 100644
--- a/compiler/testData/codegen/box/coroutines/kt12958.kt
+++ b/compiler/testData/codegen/box/coroutines/kt12958.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // WITH_CONTINUATION
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun <V> suspendHere(v: V): V = suspendCoroutineOrReturn { x ->
     x.resume(v)
diff --git a/compiler/testData/codegen/box/coroutines/kt15016.kt b/compiler/testData/codegen/box/coroutines/kt15016.kt
index 99552c1c01c..f439dfa8379 100644
--- a/compiler/testData/codegen/box/coroutines/kt15016.kt
+++ b/compiler/testData/codegen/box/coroutines/kt15016.kt
@@ -1,9 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
-import kotlin.coroutines.startCoroutine
+import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.startCoroutine
 
 class Bar(val x: Any)
 inline fun Any.map(transform: (Any) -> Any) {
diff --git a/compiler/testData/codegen/box/coroutines/kt15017.kt b/compiler/testData/codegen/box/coroutines/kt15017.kt
index ca00897a991..7ea892a72de 100644
--- a/compiler/testData/codegen/box/coroutines/kt15017.kt
+++ b/compiler/testData/codegen/box/coroutines/kt15017.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.startCoroutine
+import kotlin.coroutines.experimental.startCoroutine
 
 class Controller {
     suspend inline fun suspendInlineThrow(v: String): String = throw RuntimeException(v)
@@ -22,4 +22,4 @@ fun box(): String {
     }
 
     return result
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt b/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt
index 9cb8ba844a6..7ee684372e9 100644
--- a/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt
+++ b/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var result = ""
diff --git a/compiler/testData/codegen/box/coroutines/lastStatementInc.kt b/compiler/testData/codegen/box/coroutines/lastStatementInc.kt
index fb75e1ef35e..a276f517bd3 100644
--- a/compiler/testData/codegen/box/coroutines/lastStatementInc.kt
+++ b/compiler/testData/codegen/box/coroutines/lastStatementInc.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
diff --git a/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt b/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt
index 97ce5df1edb..b2d8397cdbe 100644
--- a/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt
+++ b/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
diff --git a/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt b/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt
index 9ff80f2a9f5..36e9c750b2a 100644
--- a/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt
+++ b/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var ok = false
diff --git a/compiler/testData/codegen/box/coroutines/localDelegate.kt b/compiler/testData/codegen/box/coroutines/localDelegate.kt
index d2169d806a8..5dcd1c6853b 100644
--- a/compiler/testData/codegen/box/coroutines/localDelegate.kt
+++ b/compiler/testData/codegen/box/coroutines/localDelegate.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
 
 class OkDelegate {
     operator fun getValue(receiver: Any?, property: Any?): String = "OK"
@@ -26,4 +26,4 @@ fun box(): String {
         val ok by OkDelegate()
         ok
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt
index a0c179a9304..8bd32078f68 100644
--- a/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt
+++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt
@@ -8,8 +8,8 @@ inline fun foo(x: String = "OK"): String {
 // FILE: main.kt
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var result = ""
 
diff --git a/compiler/testData/codegen/box/coroutines/multiModule/simple.kt b/compiler/testData/codegen/box/coroutines/multiModule/simple.kt
index 135bce26064..f5df43d1557 100644
--- a/compiler/testData/codegen/box/coroutines/multiModule/simple.kt
+++ b/compiler/testData/codegen/box/coroutines/multiModule/simple.kt
@@ -4,8 +4,8 @@
 // FILE: controller.kt
 package lib
 
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
@@ -17,8 +17,8 @@ class Controller {
 // MODULE: main(controller, support)
 // FILE: main.kt
 import lib.*
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 fun builder(c: suspend Controller.() -> Unit) {
     c.startCoroutine(Controller(), EmptyContinuation)
diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt
index e0c45449385..f38b8ef799a 100644
--- a/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt
+++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var lastSuspension: Continuation<String>? = null
diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt
index 02878b2e11b..508b8dd795e 100644
--- a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt
+++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var lastSuspension: Continuation<String>? = null
diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt
index 7a8201139b7..5609cd6a6e7 100644
--- a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt
+++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var lastSuspension: Continuation<String>? = null
diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt
index 8d8453da3b0..317472e1900 100644
--- a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt
+++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var lastSuspension: Continuation<String>? = null
diff --git a/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt b/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt
index d146063ef13..4d5aafca00e 100644
--- a/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt
+++ b/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 var wasCalled = false
diff --git a/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt b/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt
index fbc3b18aa54..407817b38dc 100644
--- a/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt
+++ b/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 fun builder(c: suspend () -> Int): Int {
diff --git a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt
index 4f45ffb4e28..8c3a95ebefc 100644
--- a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt
+++ b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var cResult = 0
diff --git a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt
index 68f996aac48..1bcd41e8b98 100644
--- a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt
+++ b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {
diff --git a/compiler/testData/codegen/box/coroutines/returnByLabel.kt b/compiler/testData/codegen/box/coroutines/returnByLabel.kt
index 0b7d4b20948..20cd1317d84 100644
--- a/compiler/testData/codegen/box/coroutines/returnByLabel.kt
+++ b/compiler/testData/codegen/box/coroutines/returnByLabel.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
diff --git a/compiler/testData/codegen/box/coroutines/simple.kt b/compiler/testData/codegen/box/coroutines/simple.kt
index bbdeff17c8c..a17cf75dd47 100644
--- a/compiler/testData/codegen/box/coroutines/simple.kt
+++ b/compiler/testData/codegen/box/coroutines/simple.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
diff --git a/compiler/testData/codegen/box/coroutines/simpleException.kt b/compiler/testData/codegen/box/coroutines/simpleException.kt
index 313d9c898c0..07e48d7fd1b 100644
--- a/compiler/testData/codegen/box/coroutines/simpleException.kt
+++ b/compiler/testData/codegen/box/coroutines/simpleException.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt
index a51f4eac45c..dc69ccc7802 100644
--- a/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt
+++ b/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt
index 5b0c2b4f3d6..3b8542609ac 100644
--- a/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt
+++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = throw RuntimeException("OK")
diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt
index ec5310fcecc..0dbf79fcbdd 100644
--- a/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt
+++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt
@@ -4,8 +4,8 @@
 // CHECK_NOT_CALLED: suspendInline_61zpoe$
 // CHECK_NOT_CALLED: suspendInline_6r51u9$
 // CHECK_NOT_CALLED: suspendInline
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend inline fun suspendInline(v: String): String = v
diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt
index 04b178eda69..8490f059c65 100644
--- a/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt
+++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere() = "OK"
diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt
index 04d0308065b..949eb98b135 100644
--- a/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt
+++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Int = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt b/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt
index 9ecc7e75d69..2620ac69ecc 100644
--- a/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt
+++ b/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 suspend fun suspendWithValue(v: String): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt b/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt
index abd50866c8d..c366c340ee8 100644
--- a/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.startCoroutine
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.startCoroutine
+import kotlin.coroutines.experimental.intrinsics.*
 
 interface TestInterface {
     suspend fun toInt(): Int = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/suspendDelegation.kt b/compiler/testData/codegen/box/coroutines/suspendDelegation.kt
index 3c41abd2ee6..236ecbb2d1d 100644
--- a/compiler/testData/codegen/box/coroutines/suspendDelegation.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendDelegation.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = suspendThere()
diff --git a/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt b/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt
index 6da0daeb684..e55d80e1258 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(v: Int): Int = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt b/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt
index 65a7e5b57c4..73612613011 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt
@@ -4,7 +4,7 @@
 // FILE: stuff.kt
 package stuff
 
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 object Host {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
@@ -15,8 +15,8 @@ object Host {
 
 
 // FILE: test.kt
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 import stuff.Host.suspendHere
 
 fun builder(c: suspend () -> Unit) {
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt
index 69b3af8718d..9e6f4019b88 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt
@@ -1,8 +1,8 @@
 // IGNORE_BACKEND: JS
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var log = ""
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt
index f6eafed0ab0..3bb1200a4f8 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var exception: Throwable? = null
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt
index 5d25fb72f3a..75295e6481d 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt
index 3e18b83439d..8839f7e1202 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt
@@ -1,9 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TARGET_BACKEND: JVM
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
 
 class MyTest {
     suspend fun act(value: String): String = suspendCoroutineOrReturn {
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt
index 169f5f89309..c170d3c2184 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class A(val v: String) {
     suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt
index c76260b68c1..f94bff2c116 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
 
 class MyTest {
     suspend fun act(value: String): String = suspendCoroutineOrReturn {
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt
index 8978de73a63..f633a8ff8cf 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // IGNORE_BACKEND: JS
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 import kotlin.reflect.KProperty
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt
index 9d37b9490d7..af80f48833d 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class X {
     var res = ""
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt
index ba486a2b77d..60af0b62aee 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 var x = true
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt
index 1ffb2eb49ac..c88d0ac1444 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt
index 367fff90589..787596f94e9 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt
index ebe64c061b7..c0c9862b7aa 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt
index 8d300dc1354..478e540ad6f 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt
index dd9fd88a0d0..b37b4d6bb4a 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt
index 76aaca07936..2fecc72eba6 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
diff --git a/compiler/testData/codegen/box/coroutines/suspendInCycle.kt b/compiler/testData/codegen/box/coroutines/suspendInCycle.kt
index 5b64735a3fa..ce6c2f38dd3 100644
--- a/compiler/testData/codegen/box/coroutines/suspendInCycle.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendInCycle.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var i = 0
diff --git a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt
index 752143b4cd6..5f8cf5cc9b4 100644
--- a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt
index 3e78928f4a6..576d7e6c3bc 100644
--- a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt
+++ b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class TestClass {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt
index 5039eddc558..31bebf9f401 100644
--- a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt
+++ b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class TestClass {
     suspend fun toInt(): Int = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt
index cb44971de0a..d088e7f7835 100644
--- a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt
+++ b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun foo(x: Any): Int {
     return if (x == "56") suspendHere() else 13
diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt
index d5144fcb907..7fb8d84e1bc 100644
--- a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt
+++ b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun foo(x: Any): Int {
     return try {
diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt
index d8c09467d0e..3494aa023d9 100644
--- a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt
+++ b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun foo(x: Any): Int {
     return when {
diff --git a/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt
index b80883195c8..0f2f61f81c8 100644
--- a/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt
+++ b/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 var wasCalled = false
diff --git a/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt
index 53333e11da3..dcc5ca8b40d 100644
--- a/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt
+++ b/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 var wasCalled = false
diff --git a/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt b/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt
index 0cf0e6c861d..eb350d0db57 100644
--- a/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt
+++ b/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt
index d2e10fcafa1..aabbcd060f0 100644
--- a/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt
+++ b/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 var wasCalled = false
diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt
index 44bf6ebed67..2dc96e88731 100644
--- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt
+++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt
index 0a0753610a3..70335e550d1 100644
--- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt
+++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt
index 7bb61e3f2fa..b03590d8c83 100644
--- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt
+++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // IGNORE_BACKEND: JS
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var result = "0"
 
diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt
index d04878faa34..989c7c6c716 100644
--- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt
+++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var result = "0"
 
diff --git a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt
index 9d597a81f1f..4c4b84431a0 100644
--- a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt
+++ b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt
index d5ca545e3a4..e64ba2f7249 100644
--- a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt
+++ b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeListing/coroutineFields.kt b/compiler/testData/codegen/bytecodeListing/coroutineFields.kt
index ddb99466983..5da9e969674 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutineFields.kt
+++ b/compiler/testData/codegen/bytecodeListing/coroutineFields.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere() = suspendCoroutineOrReturn<String> { x ->
         x.resume("OK")
diff --git a/compiler/testData/codegen/bytecodeListing/coroutineFields.txt b/compiler/testData/codegen/bytecodeListing/coroutineFields.txt
index f34bfcc8d48..a6c6043e36c 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutineFields.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutineFields.txt
@@ -2,7 +2,7 @@
 final class Controller$multipleSuspensions$1 {
     synthetic final field this$0: Controller
     inner class Controller$multipleSuspensions$1
-    method <init>(p0: Controller, p1: kotlin.coroutines.Continuation): void
+    method <init>(p0: Controller, p1: kotlin.coroutines.experimental.Continuation): void
     public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
 }
 
@@ -10,7 +10,7 @@ final class Controller$multipleSuspensions$1 {
 final class Controller$nonTailCall$1 {
     synthetic final field this$0: Controller
     inner class Controller$nonTailCall$1
-    method <init>(p0: Controller, p1: kotlin.coroutines.Continuation): void
+    method <init>(p0: Controller, p1: kotlin.coroutines.experimental.Continuation): void
     public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
 }
 
@@ -19,10 +19,10 @@ public final class Controller {
     inner class Controller$multipleSuspensions$1
     inner class Controller$nonTailCall$1
     public method <init>(): void
-    public final @org.jetbrains.annotations.Nullable method multipleSuspensions(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
-    public final @org.jetbrains.annotations.Nullable method nonTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
-    public final @org.jetbrains.annotations.Nullable method tailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method multipleSuspensions(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method nonTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method tailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
 }
 
 @kotlin.Metadata
@@ -33,11 +33,11 @@ final class CoroutineFieldsKt$box$1 {
     private field L$1: java.lang.Object
     private field p$: Controller
     inner class CoroutineFieldsKt$box$1
-    method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void
-    public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public synthetic method create(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
+    method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.experimental.Continuation): void
+    public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation
+    public synthetic method create(p0: java.lang.Object, p1: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation
     public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
-    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object
     public synthetic method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/bytecodeText/constCoroutine.kt b/compiler/testData/codegen/bytecodeText/constCoroutine.kt
index 3628b6c7b07..0d650447eaa 100644
--- a/compiler/testData/codegen/bytecodeText/constCoroutine.kt
+++ b/compiler/testData/codegen/bytecodeText/constCoroutine.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 suspend fun suspendHere() = ""
 
 fun builder(c: suspend () -> Unit) {
@@ -22,5 +22,5 @@ fun box(): String {
 
 // 2 GETSTATIC kotlin/Unit.INSTANCE
 // 1 GETSTATIC EmptyContinuation.Companion
-// 3 GETSTATIC kotlin\/coroutines\/EmptyCoroutineContext.INSTANCE
+// 3 GETSTATIC kotlin\/coroutines\/experimental\/EmptyCoroutineContext.INSTANCE
 // 6 GETSTATIC
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt
index 4ecedd2e78d..825a765e7c8 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt
index aea850b6961..b86debe4cbd 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt
index 7e8f8698ee6..4aa640a584a 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt
index d5022da5169..814ef18de47 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt
index 9ec7398904f..e262f85d5d7 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt
index 7156ef7052a..321bf65566d 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt
index c4d4a55bcd7..4e82039a5cd 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt
@@ -2,8 +2,8 @@
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
 // TARGET_BACKEND: JVM
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt
index f442e152685..5fcf1731ee2 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt
index 457b0f73bc7..e909b947c0d 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt
@@ -2,8 +2,8 @@
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
 // TARGET_BACKEND: JVM
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt
index da71ccb3571..dbfecb15a01 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt
index de8bb1390f8..9c7dcd7afbc 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
 }
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt
index ee3018c1cc0..231ee8e82f6 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt
@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TREAT_AS_ONE_FILE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
 }
diff --git a/compiler/testData/codegen/dumpDeclarations/suspendOverride.json b/compiler/testData/codegen/dumpDeclarations/suspendOverride.json
index 0ba9b0221cf..317bd0f57ca 100644
--- a/compiler/testData/codegen/dumpDeclarations/suspendOverride.json
+++ b/compiler/testData/codegen/dumpDeclarations/suspendOverride.json
@@ -4,7 +4,7 @@
 		"visibility": "public",
 		"class": "B",
 		"members": [
-			{"visibility": "public",	"declaration": "open suspend fun foo(`$continuation`: kotlin.coroutines.Continuation<kotlin.Boolean>): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"},
+			{"visibility": "public",	"declaration": "open suspend fun foo(`$continuation`: kotlin.coroutines.experimental.Continuation<kotlin.Boolean>): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"},
 			{"visibility": "public",	"declaration": "constructor B()", "name": "<init>", "desc": "()V"}
 		]
 	},
@@ -29,7 +29,7 @@
 		"visibility": "public",
 		"class": "A",
 		"members": [
-			{"visibility": "public",	"declaration": "abstract suspend fun foo(`$continuation`: kotlin.coroutines.Continuation<kotlin.Boolean>): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"}
+			{"visibility": "public",	"declaration": "abstract suspend fun foo(`$continuation`: kotlin.coroutines.experimental.Continuation<kotlin.Boolean>): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"}
 		]
 	},
 	{
@@ -37,7 +37,7 @@
 		"visibility": "public",
 		"class": "C",
 		"members": [
-			{"visibility": "public",	"declaration": "final suspend fun foo(`$continuation`: kotlin.coroutines.Continuation<kotlin.Boolean>): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"},
+			{"visibility": "public",	"declaration": "final suspend fun foo(`$continuation`: kotlin.coroutines.experimental.Continuation<kotlin.Boolean>): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"},
 			{"visibility": "public",	"declaration": "constructor C()", "name": "<init>", "desc": "()V"}
 		]
 	}
diff --git a/compiler/testData/codegen/java8/box/async.kt b/compiler/testData/codegen/java8/box/async.kt
index 1d15a2582ac..a3914f640ba 100644
--- a/compiler/testData/codegen/java8/box/async.kt
+++ b/compiler/testData/codegen/java8/box/async.kt
@@ -2,8 +2,8 @@
 // FULL_JDK
 
 import java.util.concurrent.CompletableFuture
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 fun foo(): CompletableFuture<String> = CompletableFuture.supplyAsync { "foo" }
 fun bar(v: String): CompletableFuture<String> = CompletableFuture.supplyAsync { "bar with $v" }
diff --git a/compiler/testData/codegen/java8/box/asyncException.kt b/compiler/testData/codegen/java8/box/asyncException.kt
index 1c37a4838dc..7610a0f63f3 100644
--- a/compiler/testData/codegen/java8/box/asyncException.kt
+++ b/compiler/testData/codegen/java8/box/asyncException.kt
@@ -2,8 +2,8 @@
 // FULL_JDK
 
 import java.util.concurrent.CompletableFuture
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 fun exception(v: String): CompletableFuture<String> = CompletableFuture.supplyAsync { throw RuntimeException(v) }
 
@@ -46,7 +46,7 @@ fun <T> async(c: suspend () -> T): CompletableFuture<T> {
     val future = CompletableFuture<T>()
     c.startCoroutine(object : Continuation<T> {
         override val context = EmptyCoroutineContext
-        
+
         override fun resume(data: T) {
             future.complete(data)
         }
diff --git a/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt b/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt
index 77170305c0b..e4ffa5ad953 100644
--- a/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt
+++ b/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt
@@ -2,8 +2,8 @@
 // WITH_RUNTIME
 package a
 
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere() = suspendCoroutineOrReturn<String> { x ->
diff --git a/compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.kt b/compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.kt
index 7472bcd6967..36a07498462 100644
--- a/compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.kt
@@ -3,6 +3,6 @@
 fun test(<!UNUSED_PARAMETER!>c<!>: <!UNRESOLVED_REFERENCE!>Continuation<!><Unit>) {}
 
 // FILE: 2.kt
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
 
 fun test2(<!UNUSED_PARAMETER!>c<!>: Continuation<Unit>) {}
diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/extensions.kt b/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/extensions.kt
index 7c4960ee341..c821e734a13 100644
--- a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/extensions.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/extensions.kt
@@ -2,7 +2,7 @@
 
 interface SuperInterface
 
-@kotlin.coroutines.RestrictsSuspension
+@kotlin.coroutines.experimental.RestrictsSuspension
 open class RestrictedController : SuperInterface
 
 class SubClass : RestrictedController()
diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/notRelatedFun.kt b/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/notRelatedFun.kt
index 3334e2247ec..4b8125907ea 100644
--- a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/notRelatedFun.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/notRelatedFun.kt
@@ -2,7 +2,7 @@
 
 interface SuperInterface
 
-@kotlin.coroutines.RestrictsSuspension
+@kotlin.coroutines.experimental.RestrictsSuspension
 open class RestrictedController : SuperInterface
 
 class SubClass : RestrictedController()
diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/sameInstance.kt b/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/sameInstance.kt
index 5b620280c3a..b7bfba29cfc 100644
--- a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/sameInstance.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/sameInstance.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE
 
-@kotlin.coroutines.RestrictsSuspension
+@kotlin.coroutines.experimental.RestrictsSuspension
 class RestrictedController {
     suspend fun member() {}
 }
diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/simpleForbidden.kt b/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/simpleForbidden.kt
index 296aadf0748..594d867359a 100644
--- a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/simpleForbidden.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/simpleForbidden.kt
@@ -1,4 +1,4 @@
-@kotlin.coroutines.RestrictsSuspension
+@kotlin.coroutines.experimental.RestrictsSuspension
 class RestrictedController
 
 suspend fun Any?.extFun() {}
diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendApplicability.kt b/compiler/testData/diagnostics/tests/coroutines/suspendApplicability.kt
index 5bced6f9c3d..e083cbb3232 100644
--- a/compiler/testData/diagnostics/tests/coroutines/suspendApplicability.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/suspendApplicability.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -NOTHING_TO_INLINE
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
 
 suspend fun notMember(q: Double) = 1
 
diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendCoroutineOrReturn.kt b/compiler/testData/diagnostics/tests/coroutines/suspendCoroutineOrReturn.kt
index 1b1edcacd1b..0ceaa9a66d7 100644
--- a/compiler/testData/diagnostics/tests/coroutines/suspendCoroutineOrReturn.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/suspendCoroutineOrReturn.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun noParams(): Unit = suspendCoroutineOrReturn {
diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctions.kt b/compiler/testData/diagnostics/tests/coroutines/suspendFunctions.kt
index e2025e0fa16..d244c9247be 100644
--- a/compiler/testData/diagnostics/tests/coroutines/suspendFunctions.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/suspendFunctions.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
 
 class Controller {
     suspend fun noParams() {
diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/forbidden.kt b/compiler/testData/diagnostics/tests/coroutines/tailCalls/forbidden.kt
index 5ab0bed44ce..c4e016f423d 100644
--- a/compiler/testData/diagnostics/tests/coroutines/tailCalls/forbidden.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/tailCalls/forbidden.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 fun nonSuspend() {}
 
diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/nothingTypedSuspendFunction.kt b/compiler/testData/diagnostics/tests/coroutines/tailCalls/nothingTypedSuspendFunction.kt
index 3404ba5ba29..e79d3fe6c03 100644
--- a/compiler/testData/diagnostics/tests/coroutines/tailCalls/nothingTypedSuspendFunction.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/tailCalls/nothingTypedSuspendFunction.kt
@@ -1,6 +1,6 @@
 // Tail calls are not allowed to be Nothing typed. See KT-15051
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendLogAndThrow(exception: Throwable): Nothing = suspendCoroutineOrReturn { c ->
     c.resumeWithException(exception)
diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/tryCatch.kt b/compiler/testData/diagnostics/tests/coroutines/tailCalls/tryCatch.kt
index 41d381a89b7..3c3c0d77d60 100644
--- a/compiler/testData/diagnostics/tests/coroutines/tailCalls/tryCatch.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/tailCalls/tryCatch.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 fun nonSuspend() {}
 
diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/valid.kt b/compiler/testData/diagnostics/tests/coroutines/tailCalls/valid.kt
index 35905ed83b5..2ba804fe8cc 100644
--- a/compiler/testData/diagnostics/tests/coroutines/tailCalls/valid.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/tailCalls/valid.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun baz() = 1
 
diff --git a/compiler/testData/multiplatform/incompatibleCallables/common.kt b/compiler/testData/multiplatform/incompatibleCallables/common.kt
index 7fc707b5544..4777bc428df 100644
--- a/compiler/testData/multiplatform/incompatibleCallables/common.kt
+++ b/compiler/testData/multiplatform/incompatibleCallables/common.kt
@@ -1,4 +1,4 @@
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
 
 header fun f1()
 
diff --git a/compiler/testData/multiplatform/incompatibleCallables/jvm.kt b/compiler/testData/multiplatform/incompatibleCallables/jvm.kt
index 6cc8fcf1b06..c6fb10abbae 100644
--- a/compiler/testData/multiplatform/incompatibleCallables/jvm.kt
+++ b/compiler/testData/multiplatform/incompatibleCallables/jvm.kt
@@ -1,4 +1,4 @@
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
 
 impl fun f1(): String = ""
 
diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
index 0b27ef6671b..ed5b725e339 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
@@ -650,7 +650,7 @@ public class KotlinTestUtils {
             M supportModule = hasModules ? factory.createModule("support", Collections.<String>emptyList()) : null;
             testFiles.add(factory.createFile(supportModule,
                                              "CoroutineUtil.kt",
-                                             "import kotlin.coroutines.*\n" +
+                                             "import kotlin.coroutines.experimental.*\n" +
                                              "fun <T> handleResultContinuation(x: (T) -> Unit): Continuation<T> = object: Continuation<T> {\n" +
                                              "    override val context = EmptyCoroutineContext\n" +
                                              "    override fun resumeWithException(exception: Throwable) {\n" +
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
index 93b5c38f81f..8fdc620b06a 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
@@ -51,7 +51,7 @@ public class DescriptorUtils {
     public static final FqName JVM_NAME = new FqName("kotlin.jvm.JvmName");
     private static final FqName VOLATILE = new FqName("kotlin.jvm.Volatile");
     private static final FqName SYNCHRONIZED = new FqName("kotlin.jvm.Synchronized");
-    public static final FqName COROUTINES_PACKAGE_FQ_NAME = new FqName("kotlin.coroutines");
+    public static final FqName COROUTINES_PACKAGE_FQ_NAME = new FqName("kotlin.coroutines.experimental");
     public static final FqName CONTINUATION_INTERFACE_FQ_NAME = COROUTINES_PACKAGE_FQ_NAME.child(Name.identifier("Continuation"));
 
     private DescriptorUtils() {
diff --git a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt
index f59daea86a3..9cad5742656 100644
--- a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt
+++ b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt
@@ -1,5 +1,5 @@
 package test
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
 
 data class Modifiers(val x: Int) {
     external fun extFun()
diff --git a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt
index 84147957663..b7d5d8b1b2d 100644
--- a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt
+++ b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt
@@ -139,8 +139,10 @@ PsiJetFileStubImpl[package=test]
               USER_TYPE
                 USER_TYPE
                   USER_TYPE
-                    REFERENCE_EXPRESSION[referencedName=kotlin]
-                  REFERENCE_EXPRESSION[referencedName=coroutines]
+                    USER_TYPE
+                      REFERENCE_EXPRESSION[referencedName=kotlin]
+                    REFERENCE_EXPRESSION[referencedName=coroutines]
+                  REFERENCE_EXPRESSION[referencedName=experimental]
                 REFERENCE_EXPRESSION[referencedName=Continuation]
                 TYPE_ARGUMENT_LIST
                   TYPE_PROJECTION[projectionKind=NONE]
diff --git a/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml b/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml
index 971fa6c7560..ec0ed5c12f8 100644
--- a/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml
+++ b/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml
@@ -50,7 +50,7 @@
   <node text="Retention (kotlin.annotation)"/>
   <node text="Repeatable (kotlin.annotation)"/>
   <node text="MustBeDocumented (kotlin.annotation)"/>
-  <node text="RestrictsSuspension (kotlin.coroutines)"/>
+  <node text="RestrictsSuspension (kotlin.coroutines.experimental)"/>
   <node text="ExtensionFunctionType (kotlin)"/>
   <node text="Metadata (kotlin)"/>
   <node text="DslMarker (kotlin)"/>
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt
index d83d913db23..c6e11a28ed8 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt
@@ -1,6 +1,6 @@
 package usage
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 fun async(x: suspend Controller.() -> Unit) {
     x.startCoroutine(Controller(), object : Continuation<Unit> {
diff --git a/js/js.libraries/src/core/coroutines.kt b/js/js.libraries/src/core/coroutines.kt
index 10f358118ca..4e8fe81b2b7 100644
--- a/js/js.libraries/src/core/coroutines.kt
+++ b/js/js.libraries/src/core/coroutines.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package kotlin.coroutines
+package kotlin.coroutines.experimental
 
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 /**
  * Creates coroutine with receiver type [R] and result type [T].
diff --git a/libraries/stdlib/common/src/kotlin/CoroutinesH.kt b/libraries/stdlib/common/src/kotlin/CoroutinesH.kt
index 290855f9737..79b7b65608d 100644
--- a/libraries/stdlib/common/src/kotlin/CoroutinesH.kt
+++ b/libraries/stdlib/common/src/kotlin/CoroutinesH.kt
@@ -1,4 +1,4 @@
-package kotlin.coroutines
+package kotlin.coroutines.experimental
 
 
 /**
diff --git a/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt b/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt
index 99408853816..bcc35fdf775 100644
--- a/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt
+++ b/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt
@@ -2,8 +2,8 @@
 @file:kotlin.jvm.JvmName("SequencesKt")
 package kotlin.sequences
 
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 /**
  *  Builds a [Sequence] lazily yielding values one by one.
diff --git a/libraries/stdlib/src/kotlin/coroutines/ContinuationInterceptor.kt b/libraries/stdlib/src/kotlin/coroutines/experimental/ContinuationInterceptor.kt
similarity index 97%
rename from libraries/stdlib/src/kotlin/coroutines/ContinuationInterceptor.kt
rename to libraries/stdlib/src/kotlin/coroutines/experimental/ContinuationInterceptor.kt
index b2592cde09b..1158f58aa36 100644
--- a/libraries/stdlib/src/kotlin/coroutines/ContinuationInterceptor.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/experimental/ContinuationInterceptor.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlin.coroutines
+package kotlin.coroutines.experimental
 
 /**
  * Marks coroutine context element that intercepts coroutine continuations.
diff --git a/libraries/stdlib/src/kotlin/coroutines/CoroutineContext.kt b/libraries/stdlib/src/kotlin/coroutines/experimental/CoroutineContext.kt
similarity index 98%
rename from libraries/stdlib/src/kotlin/coroutines/CoroutineContext.kt
rename to libraries/stdlib/src/kotlin/coroutines/experimental/CoroutineContext.kt
index 2f808e1b372..dab29bee133 100644
--- a/libraries/stdlib/src/kotlin/coroutines/CoroutineContext.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/experimental/CoroutineContext.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlin.coroutines
+package kotlin.coroutines.experimental
 
 /**
  * Persistent context for the coroutine. It is an indexed set of [Element] instances.
diff --git a/libraries/stdlib/src/kotlin/coroutines/CoroutineContextImpl.kt b/libraries/stdlib/src/kotlin/coroutines/experimental/CoroutineContextImpl.kt
similarity index 98%
rename from libraries/stdlib/src/kotlin/coroutines/CoroutineContextImpl.kt
rename to libraries/stdlib/src/kotlin/coroutines/experimental/CoroutineContextImpl.kt
index 6f707233ea2..ed46d89a033 100644
--- a/libraries/stdlib/src/kotlin/coroutines/CoroutineContextImpl.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/experimental/CoroutineContextImpl.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package kotlin.coroutines
+package kotlin.coroutines.experimental
 
-import kotlin.coroutines.CoroutineContext.*
+import kotlin.coroutines.experimental.CoroutineContext.*
 
 /**
  * Base class for [CoroutineContext.Element] implementations.
diff --git a/libraries/stdlib/src/kotlin/coroutines/Coroutines.kt b/libraries/stdlib/src/kotlin/coroutines/experimental/Coroutines.kt
similarity index 95%
rename from libraries/stdlib/src/kotlin/coroutines/Coroutines.kt
rename to libraries/stdlib/src/kotlin/coroutines/experimental/Coroutines.kt
index 01393570537..2ddeac7e070 100644
--- a/libraries/stdlib/src/kotlin/coroutines/Coroutines.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/experimental/Coroutines.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlin.coroutines
+package kotlin.coroutines.experimental
 
 /**
  * Interface representing a continuation after a suspension point that returns value of type `T`.
diff --git a/libraries/stdlib/src/kotlin/coroutines/CoroutinesLibrary.kt b/libraries/stdlib/src/kotlin/coroutines/experimental/CoroutinesLibrary.kt
similarity index 83%
rename from libraries/stdlib/src/kotlin/coroutines/CoroutinesLibrary.kt
rename to libraries/stdlib/src/kotlin/coroutines/experimental/CoroutinesLibrary.kt
index 54f22c23dd3..81205bc0a5e 100644
--- a/libraries/stdlib/src/kotlin/coroutines/CoroutinesLibrary.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/experimental/CoroutinesLibrary.kt
@@ -1,11 +1,28 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 @file:kotlin.jvm.JvmName("CoroutinesKt")
 @file:kotlin.jvm.JvmVersion
-package kotlin.coroutines
+package kotlin.coroutines.experimental
 
 import java.lang.IllegalStateException
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.jvm.internal.CoroutineImpl
 
 /**
  * Creates coroutine with receiver type [R] and result type [T].
@@ -18,7 +35,8 @@ import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
 public fun <R, T> (suspend R.() -> T).createCoroutine(
         receiver: R,
         completion: Continuation<T>
-): Continuation<Unit> = ((this as kotlin.coroutines.jvm.internal.CoroutineImpl).create(receiver, completion) as kotlin.coroutines.jvm.internal.CoroutineImpl).facade
+): Continuation<Unit> =
+        ((this as CoroutineImpl).create(receiver, completion) as CoroutineImpl).facade
 
 /**
  * Starts coroutine with receiver type [R] and result type [T].
@@ -44,7 +62,7 @@ public fun <R, T> (suspend R.() -> T).startCoroutine(
 @Suppress("UNCHECKED_CAST")
 public fun <T> (suspend () -> T).createCoroutine(
         completion: Continuation<T>
-): Continuation<Unit> = ((this as kotlin.coroutines.jvm.internal.CoroutineImpl).create(completion) as kotlin.coroutines.jvm.internal.CoroutineImpl).facade
+): Continuation<Unit> = ((this as CoroutineImpl).create(completion) as CoroutineImpl).facade
 
 /**
  * Starts coroutine without receiver and with result type [T].
diff --git a/libraries/stdlib/src/kotlin/coroutines/intrinsics/Intrinsics.kt b/libraries/stdlib/src/kotlin/coroutines/experimental/intrinsics/Intrinsics.kt
similarity index 95%
rename from libraries/stdlib/src/kotlin/coroutines/intrinsics/Intrinsics.kt
rename to libraries/stdlib/src/kotlin/coroutines/experimental/intrinsics/Intrinsics.kt
index d655d286410..ec8f54cbd8e 100644
--- a/libraries/stdlib/src/kotlin/coroutines/intrinsics/Intrinsics.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/experimental/intrinsics/Intrinsics.kt
@@ -16,9 +16,9 @@
 
 @file:kotlin.jvm.JvmName("IntrinsicsKt")
 
-package kotlin.coroutines.intrinsics
+package kotlin.coroutines.experimental.intrinsics
 
-import kotlin.coroutines.Continuation
+import kotlin.coroutines.experimental.Continuation
 
 /**
  * Obtains the current continuation instance inside suspend functions and either suspend
diff --git a/libraries/stdlib/src/kotlin/coroutines/internal/CoroutineImpl.kt b/libraries/stdlib/src/kotlin/coroutines/experimental/jvm/internal/CoroutineImpl.kt
similarity index 89%
rename from libraries/stdlib/src/kotlin/coroutines/internal/CoroutineImpl.kt
rename to libraries/stdlib/src/kotlin/coroutines/experimental/jvm/internal/CoroutineImpl.kt
index 04c8801c3e3..ec31eea1f74 100644
--- a/libraries/stdlib/src/kotlin/coroutines/internal/CoroutineImpl.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/experimental/jvm/internal/CoroutineImpl.kt
@@ -15,13 +15,13 @@
  */
 
 @file:JvmVersion
-package kotlin.coroutines.jvm.internal
+package kotlin.coroutines.experimental.jvm.internal
 
 import java.lang.IllegalStateException
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.ContinuationInterceptor
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.Continuation
+import kotlin.coroutines.experimental.ContinuationInterceptor
+import kotlin.coroutines.experimental.CoroutineContext
+import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
 import kotlin.jvm.internal.Lambda
 
 abstract class CoroutineImpl(
diff --git a/libraries/stdlib/src/kotlin/coroutines/internal/CoroutineIntrinsics.kt b/libraries/stdlib/src/kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsics.kt
similarity index 76%
rename from libraries/stdlib/src/kotlin/coroutines/internal/CoroutineIntrinsics.kt
rename to libraries/stdlib/src/kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsics.kt
index b535a5daaa8..9d63dd1eb24 100644
--- a/libraries/stdlib/src/kotlin/coroutines/internal/CoroutineIntrinsics.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsics.kt
@@ -16,9 +16,10 @@
 
 @file:JvmVersion
 @file:JvmName("CoroutineIntrinsics")
-package kotlin.coroutines.jvm.internal
+package kotlin.coroutines.experimental.jvm.internal
 
-import kotlin.coroutines.Continuation
+import kotlin.coroutines.experimental.Continuation
+import kotlin.coroutines.experimental.jvm.internal.CoroutineImpl
 
 fun <T> normalizeContinuation(continuation: Continuation<T>): Continuation<T> =
-        (continuation as? kotlin.coroutines.jvm.internal.CoroutineImpl)?.facade ?: continuation
+        (continuation as? CoroutineImpl)?.facade ?: continuation
diff --git a/libraries/stdlib/test/coroutines/CoroutineContextTest.kt b/libraries/stdlib/test/coroutines/CoroutineContextTest.kt
index 69f262164eb..aa8fbc407f3 100644
--- a/libraries/stdlib/test/coroutines/CoroutineContextTest.kt
+++ b/libraries/stdlib/test/coroutines/CoroutineContextTest.kt
@@ -18,7 +18,7 @@ package test.coroutines
 
 import kotlin.test.*
 import org.junit.Test
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
 
 class CoroutineContextTest {
     data class CtxA(val i: Int) : AbstractCoroutineContextElement(CtxA) {
@@ -172,4 +172,4 @@ class CoroutineContextTest {
         for (elem in elements)
             assertTrue(ctx[elem.key] == elem)
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
index 2281652f61b..0ffa9715aa8 100644
--- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
@@ -1940,95 +1940,95 @@ public final class kotlin/concurrent/TimersKt {
 	public static final fun timer (Ljava/lang/String;Z)Ljava/util/Timer;
 }
 
-public abstract class kotlin/coroutines/AbstractCoroutineContextElement : kotlin/coroutines/CoroutineContext$Element {
-	public fun <init> (Lkotlin/coroutines/CoroutineContext$Key;)V
+public abstract class kotlin/coroutines/experimental/AbstractCoroutineContextElement : kotlin/coroutines/experimental/CoroutineContext$Element {
+	public fun <init> (Lkotlin/coroutines/experimental/CoroutineContext$Key;)V
 	public fun fold (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-	public fun get (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
-	public fun getKey ()Lkotlin/coroutines/CoroutineContext$Key;
-	public fun minusKey (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
-	public fun plus (Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+	public fun get (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext$Element;
+	public fun getKey ()Lkotlin/coroutines/experimental/CoroutineContext$Key;
+	public fun minusKey (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext;
+	public fun plus (Lkotlin/coroutines/experimental/CoroutineContext;)Lkotlin/coroutines/experimental/CoroutineContext;
 }
 
-public abstract interface class kotlin/coroutines/Continuation {
-	public abstract fun getContext ()Lkotlin/coroutines/CoroutineContext;
+public abstract interface class kotlin/coroutines/experimental/Continuation {
+	public abstract fun getContext ()Lkotlin/coroutines/experimental/CoroutineContext;
 	public abstract fun resume (Ljava/lang/Object;)V
 	public abstract fun resumeWithException (Ljava/lang/Throwable;)V
 }
 
-public abstract interface class kotlin/coroutines/ContinuationInterceptor : kotlin/coroutines/CoroutineContext$Element {
-	public static final field Key Lkotlin/coroutines/ContinuationInterceptor$Key;
-	public abstract fun interceptContinuation (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+public abstract interface class kotlin/coroutines/experimental/ContinuationInterceptor : kotlin/coroutines/experimental/CoroutineContext$Element {
+	public static final field Key Lkotlin/coroutines/experimental/ContinuationInterceptor$Key;
+	public abstract fun interceptContinuation (Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
 }
 
-public final class kotlin/coroutines/ContinuationInterceptor$Key : kotlin/coroutines/CoroutineContext$Key {
+public final class kotlin/coroutines/experimental/ContinuationInterceptor$Key : kotlin/coroutines/experimental/CoroutineContext$Key {
 }
 
-public abstract interface class kotlin/coroutines/CoroutineContext {
+public abstract interface class kotlin/coroutines/experimental/CoroutineContext {
 	public abstract fun fold (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-	public abstract fun get (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
-	public abstract fun minusKey (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
-	public abstract fun plus (Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+	public abstract fun get (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext$Element;
+	public abstract fun minusKey (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext;
+	public abstract fun plus (Lkotlin/coroutines/experimental/CoroutineContext;)Lkotlin/coroutines/experimental/CoroutineContext;
 }
 
-public abstract interface class kotlin/coroutines/CoroutineContext$Element : kotlin/coroutines/CoroutineContext {
-	public abstract fun getKey ()Lkotlin/coroutines/CoroutineContext$Key;
+public abstract interface class kotlin/coroutines/experimental/CoroutineContext$Element : kotlin/coroutines/experimental/CoroutineContext {
+	public abstract fun getKey ()Lkotlin/coroutines/experimental/CoroutineContext$Key;
 }
 
-public abstract interface class kotlin/coroutines/CoroutineContext$Key {
+public abstract interface class kotlin/coroutines/experimental/CoroutineContext$Key {
 }
 
-public final class kotlin/coroutines/CoroutinesKt {
-	public static final fun createCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-	public static final fun createCoroutine (Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-	public static final fun startCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
-	public static final fun startCoroutine (Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
-	public static final fun suspendCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public final class kotlin/coroutines/experimental/CoroutinesKt {
+	public static final fun createCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
+	public static final fun createCoroutine (Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
+	public static final fun startCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/experimental/Continuation;)V
+	public static final fun startCoroutine (Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)V
+	public static final fun suspendCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
 }
 
-public final class kotlin/coroutines/EmptyCoroutineContext : kotlin/coroutines/CoroutineContext {
-	public static final field INSTANCE Lkotlin/coroutines/EmptyCoroutineContext;
+public final class kotlin/coroutines/experimental/EmptyCoroutineContext : kotlin/coroutines/experimental/CoroutineContext {
+	public static final field INSTANCE Lkotlin/coroutines/experimental/EmptyCoroutineContext;
 	public fun fold (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-	public fun get (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+	public fun get (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext$Element;
 	public fun hashCode ()I
-	public fun minusKey (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
-	public fun plus (Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+	public fun minusKey (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext;
+	public fun plus (Lkotlin/coroutines/experimental/CoroutineContext;)Lkotlin/coroutines/experimental/CoroutineContext;
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract interface annotation class kotlin/coroutines/RestrictsSuspension : java/lang/annotation/Annotation {
+public abstract interface annotation class kotlin/coroutines/experimental/RestrictsSuspension : java/lang/annotation/Annotation {
 }
 
-public final class kotlin/coroutines/SafeContinuation : kotlin/coroutines/Continuation {
-	public static final field Companion Lkotlin/coroutines/SafeContinuation$Companion;
-	public fun <init> (Lkotlin/coroutines/Continuation;)V
-	public fun getContext ()Lkotlin/coroutines/CoroutineContext;
+public final class kotlin/coroutines/experimental/SafeContinuation : kotlin/coroutines/experimental/Continuation {
+	public static final field Companion Lkotlin/coroutines/experimental/SafeContinuation$Companion;
+	public fun <init> (Lkotlin/coroutines/experimental/Continuation;)V
+	public fun getContext ()Lkotlin/coroutines/experimental/CoroutineContext;
 	public final fun getResult ()Ljava/lang/Object;
 	public fun resume (Ljava/lang/Object;)V
 	public fun resumeWithException (Ljava/lang/Throwable;)V
 }
 
-public final class kotlin/coroutines/SafeContinuation$Companion {
+public final class kotlin/coroutines/experimental/SafeContinuation$Companion {
 }
 
-public final class kotlin/coroutines/intrinsics/IntrinsicsKt {
+public final class kotlin/coroutines/experimental/intrinsics/IntrinsicsKt {
 	public static final fun getSUSPENDED_MARKER ()Ljava/lang/Object;
 }
 
-public abstract class kotlin/coroutines/jvm/internal/CoroutineImpl : kotlin/jvm/internal/Lambda, kotlin/coroutines/Continuation {
-	protected field completion Lkotlin/coroutines/Continuation;
+public abstract class kotlin/coroutines/experimental/jvm/internal/CoroutineImpl : kotlin/jvm/internal/Lambda, kotlin/coroutines/experimental/Continuation {
+	protected field completion Lkotlin/coroutines/experimental/Continuation;
 	protected field label I
-	public fun <init> (ILkotlin/coroutines/Continuation;)V
-	public fun create (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-	public fun create (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+	public fun <init> (ILkotlin/coroutines/experimental/Continuation;)V
+	public fun create (Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
+	public fun create (Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
 	protected abstract fun doResume (Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object;
-	public fun getContext ()Lkotlin/coroutines/CoroutineContext;
-	public final fun getFacade ()Lkotlin/coroutines/Continuation;
+	public fun getContext ()Lkotlin/coroutines/experimental/CoroutineContext;
+	public final fun getFacade ()Lkotlin/coroutines/experimental/Continuation;
 	public fun resume (Ljava/lang/Object;)V
 	public fun resumeWithException (Ljava/lang/Throwable;)V
 }
 
-public final class kotlin/coroutines/jvm/internal/CoroutineIntrinsics {
-	public static final fun normalizeContinuation (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+public final class kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsics {
+	public static final fun normalizeContinuation (Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
 }
 
 public final class kotlin/internal/PlatformImplementationsKt {
@@ -3363,10 +3363,10 @@ public abstract interface class kotlin/sequences/Sequence {
 }
 
 public abstract class kotlin/sequences/SequenceBuilder {
-	public abstract fun yield (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun yieldAll (Ljava/lang/Iterable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun yieldAll (Ljava/util/Iterator;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun yieldAll (Lkotlin/sequences/Sequence;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun yield (Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
+	public final fun yieldAll (Ljava/lang/Iterable;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
+	public abstract fun yieldAll (Ljava/util/Iterator;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
+	public final fun yieldAll (Lkotlin/sequences/Sequence;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
 }
 
 public final class kotlin/sequences/SequencesKt {
diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt
index 6660de2669c..e88cb947dc4 100644
--- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt
+++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt
@@ -1759,95 +1759,95 @@ public final class kotlin/concurrent/TimersKt {
 	public static final fun timer (Ljava/lang/String;Z)Ljava/util/Timer;
 }
 
-public abstract class kotlin/coroutines/AbstractCoroutineContextElement : kotlin/coroutines/CoroutineContext$Element {
-	public fun <init> (Lkotlin/coroutines/CoroutineContext$Key;)V
+public abstract class kotlin/coroutines/experimental/AbstractCoroutineContextElement : kotlin/coroutines/experimental/CoroutineContext$Element {
+	public fun <init> (Lkotlin/coroutines/experimental/CoroutineContext$Key;)V
 	public fun fold (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-	public fun get (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
-	public fun getKey ()Lkotlin/coroutines/CoroutineContext$Key;
-	public fun minusKey (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
-	public fun plus (Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+	public fun get (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext$Element;
+	public fun getKey ()Lkotlin/coroutines/experimental/CoroutineContext$Key;
+	public fun minusKey (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext;
+	public fun plus (Lkotlin/coroutines/experimental/CoroutineContext;)Lkotlin/coroutines/experimental/CoroutineContext;
 }
 
-public abstract interface class kotlin/coroutines/Continuation {
-	public abstract fun getContext ()Lkotlin/coroutines/CoroutineContext;
+public abstract interface class kotlin/coroutines/experimental/Continuation {
+	public abstract fun getContext ()Lkotlin/coroutines/experimental/CoroutineContext;
 	public abstract fun resume (Ljava/lang/Object;)V
 	public abstract fun resumeWithException (Ljava/lang/Throwable;)V
 }
 
-public abstract interface class kotlin/coroutines/ContinuationInterceptor : kotlin/coroutines/CoroutineContext$Element {
-	public static final field Key Lkotlin/coroutines/ContinuationInterceptor$Key;
-	public abstract fun interceptContinuation (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+public abstract interface class kotlin/coroutines/experimental/ContinuationInterceptor : kotlin/coroutines/experimental/CoroutineContext$Element {
+	public static final field Key Lkotlin/coroutines/experimental/ContinuationInterceptor$Key;
+	public abstract fun interceptContinuation (Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
 }
 
-public final class kotlin/coroutines/ContinuationInterceptor$Key : kotlin/coroutines/CoroutineContext$Key {
+public final class kotlin/coroutines/experimental/ContinuationInterceptor$Key : kotlin/coroutines/experimental/CoroutineContext$Key {
 }
 
-public abstract interface class kotlin/coroutines/CoroutineContext {
+public abstract interface class kotlin/coroutines/experimental/CoroutineContext {
 	public abstract fun fold (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-	public abstract fun get (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
-	public abstract fun minusKey (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
-	public abstract fun plus (Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+	public abstract fun get (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext$Element;
+	public abstract fun minusKey (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext;
+	public abstract fun plus (Lkotlin/coroutines/experimental/CoroutineContext;)Lkotlin/coroutines/experimental/CoroutineContext;
 }
 
-public abstract interface class kotlin/coroutines/CoroutineContext$Element : kotlin/coroutines/CoroutineContext {
-	public abstract fun getKey ()Lkotlin/coroutines/CoroutineContext$Key;
+public abstract interface class kotlin/coroutines/experimental/CoroutineContext$Element : kotlin/coroutines/experimental/CoroutineContext {
+	public abstract fun getKey ()Lkotlin/coroutines/experimental/CoroutineContext$Key;
 }
 
-public abstract interface class kotlin/coroutines/CoroutineContext$Key {
+public abstract interface class kotlin/coroutines/experimental/CoroutineContext$Key {
 }
 
-public final class kotlin/coroutines/CoroutinesKt {
-	public static final fun createCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-	public static final fun createCoroutine (Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-	public static final fun startCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
-	public static final fun startCoroutine (Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
-	public static final fun suspendCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public final class kotlin/coroutines/experimental/CoroutinesKt {
+	public static final fun createCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
+	public static final fun createCoroutine (Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
+	public static final fun startCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/experimental/Continuation;)V
+	public static final fun startCoroutine (Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)V
+	public static final fun suspendCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
 }
 
-public final class kotlin/coroutines/EmptyCoroutineContext : kotlin/coroutines/CoroutineContext {
-	public static final field INSTANCE Lkotlin/coroutines/EmptyCoroutineContext;
+public final class kotlin/coroutines/experimental/EmptyCoroutineContext : kotlin/coroutines/experimental/CoroutineContext {
+	public static final field INSTANCE Lkotlin/coroutines/experimental/EmptyCoroutineContext;
 	public fun fold (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-	public fun get (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+	public fun get (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext$Element;
 	public fun hashCode ()I
-	public fun minusKey (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
-	public fun plus (Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+	public fun minusKey (Lkotlin/coroutines/experimental/CoroutineContext$Key;)Lkotlin/coroutines/experimental/CoroutineContext;
+	public fun plus (Lkotlin/coroutines/experimental/CoroutineContext;)Lkotlin/coroutines/experimental/CoroutineContext;
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract interface annotation class kotlin/coroutines/RestrictsSuspension : java/lang/annotation/Annotation {
+public abstract interface annotation class kotlin/coroutines/experimental/RestrictsSuspension : java/lang/annotation/Annotation {
 }
 
-public final class kotlin/coroutines/SafeContinuation : kotlin/coroutines/Continuation {
-	public static final field Companion Lkotlin/coroutines/SafeContinuation$Companion;
-	public fun <init> (Lkotlin/coroutines/Continuation;)V
-	public fun getContext ()Lkotlin/coroutines/CoroutineContext;
+public final class kotlin/coroutines/experimental/SafeContinuation : kotlin/coroutines/experimental/Continuation {
+	public static final field Companion Lkotlin/coroutines/experimental/SafeContinuation$Companion;
+	public fun <init> (Lkotlin/coroutines/experimental/Continuation;)V
+	public fun getContext ()Lkotlin/coroutines/experimental/CoroutineContext;
 	public final fun getResult ()Ljava/lang/Object;
 	public fun resume (Ljava/lang/Object;)V
 	public fun resumeWithException (Ljava/lang/Throwable;)V
 }
 
-public final class kotlin/coroutines/SafeContinuation$Companion {
+public final class kotlin/coroutines/experimental/SafeContinuation$Companion {
 }
 
-public final class kotlin/coroutines/intrinsics/IntrinsicsKt {
+public final class kotlin/coroutines/experimental/intrinsics/IntrinsicsKt {
 	public static final fun getSUSPENDED_MARKER ()Ljava/lang/Object;
 }
 
-public abstract class kotlin/coroutines/jvm/internal/CoroutineImpl : kotlin/jvm/internal/Lambda, kotlin/coroutines/Continuation {
-	protected field completion Lkotlin/coroutines/Continuation;
+public abstract class kotlin/coroutines/experimental/jvm/internal/CoroutineImpl : kotlin/jvm/internal/Lambda, kotlin/coroutines/experimental/Continuation {
+	protected field completion Lkotlin/coroutines/experimental/Continuation;
 	protected field label I
-	public fun <init> (ILkotlin/coroutines/Continuation;)V
-	public fun create (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-	public fun create (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+	public fun <init> (ILkotlin/coroutines/experimental/Continuation;)V
+	public fun create (Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
+	public fun create (Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
 	protected abstract fun doResume (Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object;
-	public fun getContext ()Lkotlin/coroutines/CoroutineContext;
-	public final fun getFacade ()Lkotlin/coroutines/Continuation;
+	public fun getContext ()Lkotlin/coroutines/experimental/CoroutineContext;
+	public final fun getFacade ()Lkotlin/coroutines/experimental/Continuation;
 	public fun resume (Ljava/lang/Object;)V
 	public fun resumeWithException (Ljava/lang/Throwable;)V
 }
 
-public final class kotlin/coroutines/jvm/internal/CoroutineIntrinsics {
-	public static final fun normalizeContinuation (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+public final class kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsics {
+	public static final fun normalizeContinuation (Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;
 }
 
 public final class kotlin/internal/PlatformImplementationsKt {
@@ -2121,10 +2121,10 @@ public abstract interface class kotlin/sequences/Sequence {
 }
 
 public abstract class kotlin/sequences/SequenceBuilder {
-	public abstract fun yield (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun yieldAll (Ljava/lang/Iterable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun yieldAll (Ljava/util/Iterator;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun yieldAll (Lkotlin/sequences/Sequence;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun yield (Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
+	public final fun yieldAll (Ljava/lang/Iterable;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
+	public abstract fun yieldAll (Ljava/util/Iterator;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
+	public final fun yieldAll (Lkotlin/sequences/Sequence;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
 }
 
 public final class kotlin/sequences/SequencesKt {