diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index f51b576141a..49aeecf89e2 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -48,6 +48,7 @@ dependencies {
     compileOnly(intellijPluginDep("copyright"))
     compileOnly(intellijPluginDep("properties"))
     compileOnly(intellijPluginDep("java-i18n"))
+    compileOnly(intellijPluginDep("stream-debugger"))
 
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(projectTests(":compiler:tests-common"))
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/LibraryUtil.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/LibraryUtil.kt
index 7c7160d1ce4..8b85e63c6e7 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/LibraryUtil.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/LibraryUtil.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib
+package org.jetbrains.kotlin.idea.debugger.sequence.lib
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionLibrarySupport.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionLibrarySupport.kt
index 82c30a16b8f..7c2e3dd5d0e 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionLibrarySupport.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionLibrarySupport.kt
@@ -1,8 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.collections
 
-import com.intellij.debugger.streams.kotlin.trace.impl.handler.collections.*
-import com.intellij.debugger.streams.kotlin.trace.impl.interpret.FilterTraceInterpreter
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.interpret.FilterTraceInterpreter
 import com.intellij.debugger.streams.lib.IntermediateOperation
 import com.intellij.debugger.streams.lib.TerminalOperation
 import com.intellij.debugger.streams.lib.impl.LibrarySupportBase
@@ -14,6 +13,9 @@ import com.intellij.debugger.streams.trace.TerminatorCallHandler
 import com.intellij.debugger.streams.trace.dsl.Dsl
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
 import com.intellij.debugger.streams.wrapper.TerminatorStreamCall
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections.BothSemanticHandlerWrapper
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections.BothSemanticsHandler
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections.FilterCallHandler
 
 /**
  * @author Vitaliy.Bibaev
@@ -30,7 +32,8 @@ class KotlinCollectionLibrarySupport : LibrarySupportBase() {
   }
 
   private abstract class CollectionOperation(override val name: String,
-                                             handler: BothSemanticsHandler)
+                                             handler: BothSemanticsHandler
+  )
     : IntermediateOperation, TerminalOperation {
 
     private val wrapper = BothSemanticHandlerWrapper(handler)
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionSupportProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionSupportProvider.kt
index d668df9b9e9..ea2989da491 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionSupportProvider.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionSupportProvider.kt
@@ -1,11 +1,11 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.collections
 
-import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
-import com.intellij.debugger.streams.kotlin.psi.collections.KotlinCollectionChainBuilder
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinCollectionsPeekCallFactory
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
-import com.intellij.debugger.streams.kotlin.trace.impl.KotlinTraceExpressionBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.collections.KotlinCollectionChainBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCollectionsPeekCallFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.KotlinTraceExpressionBuilder
 import com.intellij.debugger.streams.lib.LibrarySupport
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 import com.intellij.debugger.streams.trace.TraceExpressionBuilder
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/JavaStandardLibrarySupportProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/JavaStandardLibrarySupportProvider.kt
index 1f4ce0e187e..13e3fbaef5d 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/JavaStandardLibrarySupportProvider.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/JavaStandardLibrarySupportProvider.kt
@@ -1,14 +1,14 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.java
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.java
 
-import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainTransformerImpl
-import com.intellij.debugger.streams.kotlin.psi.impl.PackageBasedCallChecker
-import com.intellij.debugger.streams.kotlin.psi.impl.TerminatedChainBuilder
-import com.intellij.debugger.streams.kotlin.psi.java.JavaStreamChainTypeExtractor
-import com.intellij.debugger.streams.kotlin.trace.dsl.JavaPeekCallFactory
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
-import com.intellij.debugger.streams.kotlin.trace.impl.KotlinTraceExpressionBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.KotlinChainTransformerImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.PackageBasedCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.TerminatedChainBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.java.JavaStreamChainTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.JavaPeekCallFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.KotlinTraceExpressionBuilder
 import com.intellij.debugger.streams.lib.LibrarySupport
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 import com.intellij.debugger.streams.lib.impl.StandardLibrarySupport
@@ -24,7 +24,8 @@ class JavaStandardLibrarySupportProvider : LibrarySupportProvider {
   private companion object {
     val builder = TerminatedChainBuilder(
         KotlinChainTransformerImpl(JavaStreamChainTypeExtractor()),
-        PackageBasedCallChecker("java.util.stream"))
+        PackageBasedCallChecker("java.util.stream")
+    )
     val support = StandardLibrarySupport()
     val dsl = DslImpl(KotlinStatementFactory(JavaPeekCallFactory()))
   }
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/StreamExLibrarySupportProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/StreamExLibrarySupportProvider.kt
index 9771d5fe96f..ef74f688474 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/StreamExLibrarySupportProvider.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/StreamExLibrarySupportProvider.kt
@@ -1,14 +1,14 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.java
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.java
 
-import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainTransformerImpl
-import com.intellij.debugger.streams.kotlin.psi.impl.PackageBasedCallChecker
-import com.intellij.debugger.streams.kotlin.psi.impl.TerminatedChainBuilder
-import com.intellij.debugger.streams.kotlin.psi.java.JavaStreamChainTypeExtractor
-import com.intellij.debugger.streams.kotlin.trace.dsl.JavaPeekCallFactory
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
-import com.intellij.debugger.streams.kotlin.trace.impl.KotlinTraceExpressionBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.KotlinChainTransformerImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.PackageBasedCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.TerminatedChainBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.java.JavaStreamChainTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.JavaPeekCallFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.KotlinTraceExpressionBuilder
 import com.intellij.debugger.streams.lib.LibrarySupport
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 import com.intellij.debugger.streams.lib.impl.StreamExLibrarySupport
@@ -22,8 +22,10 @@ import com.intellij.openapi.project.Project
  */
 class StreamExLibrarySupportProvider : LibrarySupportProvider {
   private companion object {
-    val streamChainBuilder = TerminatedChainBuilder(KotlinChainTransformerImpl(JavaStreamChainTypeExtractor()),
-        PackageBasedCallChecker("one.util.streamex"))
+    val streamChainBuilder = TerminatedChainBuilder(
+      KotlinChainTransformerImpl(JavaStreamChainTypeExtractor()),
+      PackageBasedCallChecker("one.util.streamex")
+    )
     val support = StreamExLibrarySupport()
     val dsl = DslImpl(KotlinStatementFactory(JavaPeekCallFactory()))
     val expressionBuilder = KotlinTraceExpressionBuilder(dsl, support.createHandlerFactory(dsl))
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequenceSupportProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequenceSupportProvider.kt
index 63782e303a8..b3d5575d9ae 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequenceSupportProvider.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequenceSupportProvider.kt
@@ -1,14 +1,14 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.sequence
 
-import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainTransformerImpl
-import com.intellij.debugger.streams.kotlin.psi.impl.TerminatedChainBuilder
-import com.intellij.debugger.streams.kotlin.psi.sequence.SequenceCallChecker
-import com.intellij.debugger.streams.kotlin.psi.sequence.SequenceTypeExtractor
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinCollectionsPeekCallFactory
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
-import com.intellij.debugger.streams.kotlin.trace.impl.KotlinTraceExpressionBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.KotlinChainTransformerImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.TerminatedChainBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.sequence.SequenceCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.sequence.SequenceTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCollectionsPeekCallFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.KotlinTraceExpressionBuilder
 import com.intellij.debugger.streams.lib.LibrarySupport
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 import com.intellij.debugger.streams.trace.TraceExpressionBuilder
@@ -24,8 +24,9 @@ class KotlinSequenceSupportProvider : LibrarySupportProvider {
 
   private companion object {
     val builder: StreamChainBuilder = TerminatedChainBuilder(
-        KotlinChainTransformerImpl(SequenceTypeExtractor()),
-        SequenceCallChecker())
+      KotlinChainTransformerImpl(SequenceTypeExtractor()),
+      SequenceCallChecker()
+    )
     val support = KotlinSequencesSupport()
     val dsl = DslImpl(KotlinStatementFactory(KotlinCollectionsPeekCallFactory()))
     val expressionBuilder = KotlinTraceExpressionBuilder(dsl, support.createHandlerFactory(dsl))
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequencesSupport.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequencesSupport.kt
index 37358f4a394..36b05c09513 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequencesSupport.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequencesSupport.kt
@@ -1,11 +1,11 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.sequence
 
-import com.intellij.debugger.streams.kotlin.resolve.ChunkedResolver
-import com.intellij.debugger.streams.kotlin.resolve.FilteredMapResolver
-import com.intellij.debugger.streams.kotlin.resolve.WindowedResolver
-import com.intellij.debugger.streams.kotlin.trace.impl.handler.sequence.FilterIsInstanceHandler
-import com.intellij.debugger.streams.kotlin.trace.impl.handler.sequence.KotlinDistinctByHandler
+import org.jetbrains.kotlin.idea.debugger.sequence.resolve.ChunkedResolver
+import org.jetbrains.kotlin.idea.debugger.sequence.resolve.FilteredMapResolver
+import org.jetbrains.kotlin.idea.debugger.sequence.resolve.WindowedResolver
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.sequence.FilterIsInstanceHandler
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.sequence.KotlinDistinctByHandler
 import com.intellij.debugger.streams.lib.IntermediateOperation
 import com.intellij.debugger.streams.lib.impl.*
 import com.intellij.debugger.streams.resolve.AppendResolver
@@ -57,5 +57,6 @@ class KotlinSequencesSupport : LibrarySupportBase() {
 
   private class FilterIsInstanceOperationHandler()
     : IntermediateOperationBase("filterIsInstance", ::FilterIsInstanceHandler,
-      SimplePeekCallTraceInterpreter(), FilteredMapResolver())
+      SimplePeekCallTraceInterpreter(), FilteredMapResolver()
+  )
 }
\ No newline at end of file
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/CallTypeExtractor.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/CallTypeExtractor.kt
index 821405d5073..0f3bc618dc1 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/CallTypeExtractor.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/CallTypeExtractor.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi
+package org.jetbrains.kotlin.idea.debugger.sequence.psi
 
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import org.jetbrains.kotlin.psi.KtCallExpression
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/KotlinPsiUtil.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/KotlinPsiUtil.kt
index a2c1c26477d..369702e64e3 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/KotlinPsiUtil.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/KotlinPsiUtil.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi
+package org.jetbrains.kotlin.idea.debugger.sequence.psi
 
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/StreamCallChecker.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/StreamCallChecker.kt
index 58ed38c6466..8f7adc59a77 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/StreamCallChecker.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/StreamCallChecker.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi
+package org.jetbrains.kotlin.idea.debugger.sequence.psi
 
 import org.jetbrains.kotlin.psi.KtCallExpression
 
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/CollectionChainTransformer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/CollectionChainTransformer.kt
index 7e5b8a6c4b3..9f3c17da47d 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/CollectionChainTransformer.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/CollectionChainTransformer.kt
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.collections
 
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainTransformerImpl
-import com.intellij.debugger.streams.kotlin.psi.resolveType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.KotlinChainTransformerImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.resolveType
 import com.intellij.debugger.streams.psi.ChainTransformer
 import com.intellij.debugger.streams.wrapper.QualifierExpression
 import com.intellij.debugger.streams.wrapper.StreamChain
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/KotlinCollectionChainBuilder.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/KotlinCollectionChainBuilder.kt
index 95934ec2a33..d60e68c7ced 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/KotlinCollectionChainBuilder.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/KotlinCollectionChainBuilder.kt
@@ -1,10 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.collections
 
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainBuilderBase
-import com.intellij.debugger.streams.kotlin.psi.previousCall
-import com.intellij.debugger.streams.kotlin.psi.receiverType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.KotlinChainBuilderBase
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.previousCall
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.receiverType
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.typeUtil.supertypes
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/KotlinCollectionsTypeExtractor.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/KotlinCollectionsTypeExtractor.kt
index bfca9e411fb..cabaa9a144b 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/KotlinCollectionsTypeExtractor.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/collections/KotlinCollectionsTypeExtractor.kt
@@ -1,11 +1,11 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.collections
 
-import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.ANY
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.NULLABLE_ANY
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.CallTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.ANY
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.NULLABLE_ANY
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.openapi.diagnostic.Logger
 import org.jetbrains.kotlin.types.KotlinType
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/KotlinChainBuilderBase.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/KotlinChainBuilderBase.kt
index 9a891d5eafe..f41aa724fee 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/KotlinChainBuilderBase.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/KotlinChainBuilderBase.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.impl
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.impl
 
 import com.intellij.debugger.streams.psi.ChainTransformer
 import com.intellij.debugger.streams.psi.PsiUtil
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/KotlinChainTransformerImpl.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/KotlinChainTransformerImpl.kt
index 00bce230afa..1dc0e8795a6 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/KotlinChainTransformerImpl.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/KotlinChainTransformerImpl.kt
@@ -1,10 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.impl
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.impl
 
-import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.psi.callName
-import com.intellij.debugger.streams.kotlin.psi.resolveType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.CallTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.callName
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.resolveType
 import com.intellij.debugger.streams.psi.ChainTransformer
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.debugger.streams.wrapper.CallArgument
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/PackageBasedCallChecker.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/PackageBasedCallChecker.kt
index c9fc30127a0..ae7ab640c47 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/PackageBasedCallChecker.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/PackageBasedCallChecker.kt
@@ -1,10 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.impl
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.impl
 
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.psi.StreamCallChecker
-import com.intellij.debugger.streams.kotlin.psi.receiverType
-import com.intellij.debugger.streams.kotlin.psi.resolveType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.StreamCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.receiverType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.resolveType
 import com.intellij.openapi.util.text.StringUtil
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.types.KotlinType
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/TerminatedChainBuilder.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/TerminatedChainBuilder.kt
index 3b535e8722f..760e2baf9a9 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/TerminatedChainBuilder.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/impl/TerminatedChainBuilder.kt
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.impl
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.impl
 
-import com.intellij.debugger.streams.kotlin.psi.StreamCallChecker
-import com.intellij.debugger.streams.kotlin.psi.previousCall
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.StreamCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.previousCall
 import com.intellij.debugger.streams.psi.ChainTransformer
 import org.jetbrains.kotlin.psi.KtCallExpression
 import java.util.*
@@ -11,7 +11,8 @@ import java.util.*
  * @author Vitaliy.Bibaev
  */
 open class TerminatedChainBuilder(transformer: ChainTransformer<KtCallExpression>,
-                                  private val callChecker: StreamCallChecker)
+                                  private val callChecker: StreamCallChecker
+)
   : KotlinChainBuilderBase(transformer) {
   override val existenceChecker: ExistenceChecker = MyExistenceChecker()
 
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/JavaStreamChainTypeExtractor.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/JavaStreamChainTypeExtractor.kt
index fe764cb908c..9a0409a28be 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/JavaStreamChainTypeExtractor.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/JavaStreamChainTypeExtractor.kt
@@ -1,9 +1,9 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java
 
-import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.CallTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.trace.impl.handler.type.ClassTypeImpl
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.psi.CommonClassNames
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/SequenceCallChecker.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/SequenceCallChecker.kt
index 1ae98a255fb..b91c7a117e0 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/SequenceCallChecker.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/SequenceCallChecker.kt
@@ -1,10 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.sequence
 
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.psi.StreamCallChecker
-import com.intellij.debugger.streams.kotlin.psi.receiverType
-import com.intellij.debugger.streams.kotlin.psi.resolveType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.StreamCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.receiverType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.resolveType
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.typeUtil.supertypes
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/SequenceTypeExtractor.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/SequenceTypeExtractor.kt
index b2a5c3edb5d..0283dddae35 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/SequenceTypeExtractor.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/SequenceTypeExtractor.kt
@@ -1,9 +1,9 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.sequence
 
-import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.CallTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.trace.impl.handler.type.ClassTypeImpl
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.openapi.diagnostic.Logger
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/ChunkedResolver.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/ChunkedResolver.kt
index 7db95ec5d95..60bc7e77e8b 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/ChunkedResolver.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/ChunkedResolver.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.resolve
+package org.jetbrains.kotlin.idea.debugger.sequence.resolve
 
 import com.intellij.debugger.streams.resolve.ValuesOrderResolver
 import com.intellij.debugger.streams.trace.TraceElement
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/FilteredMapResolver.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/FilteredMapResolver.kt
index c3da36d3a2f..b5b4b6b6b67 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/FilteredMapResolver.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/FilteredMapResolver.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.resolve
+package org.jetbrains.kotlin.idea.debugger.sequence.resolve
 
 import com.intellij.debugger.streams.resolve.ValuesOrderResolver
 import com.intellij.debugger.streams.trace.TraceElement
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/WindowedResolver.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/WindowedResolver.kt
index 821e1e87714..01e016e434a 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/WindowedResolver.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/resolve/WindowedResolver.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.resolve
+package org.jetbrains.kotlin.idea.debugger.sequence.resolve
 
 import com.intellij.debugger.streams.resolve.ValuesOrderResolver
 import com.intellij.debugger.streams.trace.TraceElement
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/JavaPeekCallFactory.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/JavaPeekCallFactory.kt
index 8cc3c385116..0cfa4223325 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/JavaPeekCallFactory.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/JavaPeekCallFactory.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.impl.handler.PeekCall
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinArrayVariable.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinArrayVariable.kt
index 6f0310e1d51..72fa268e2ff 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinArrayVariable.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinArrayVariable.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.ArrayVariable
 import com.intellij.debugger.streams.trace.dsl.Expression
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinAssignmentStatement.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinAssignmentStatement.kt
index d5072b757df..3e8d6ddddfc 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinAssignmentStatement.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinAssignmentStatement.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.Expression
 import com.intellij.debugger.streams.trace.dsl.Variable
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinCodeBlock.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinCodeBlock.kt
index b7f405023a6..68618df22f0 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinCodeBlock.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinCodeBlock.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.Expression
 import com.intellij.debugger.streams.trace.dsl.StatementFactory
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinCollectionsPeekCallFactory.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinCollectionsPeekCallFactory.kt
index 6b78c669dde..588fb2e59f4 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinCollectionsPeekCallFactory.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinCollectionsPeekCallFactory.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
-import com.intellij.debugger.streams.kotlin.trace.impl.handler.OnEachCall
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.OnEachCall
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
 
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForEachLoop.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForEachLoop.kt
index 9b07f2fc0d0..7d503e871e5 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForEachLoop.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForEachLoop.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.Convertable
 import com.intellij.debugger.streams.trace.dsl.Expression
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForLoop.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForLoop.kt
index 467a9610696..4ac6b2a77b5 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForLoop.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForLoop.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.Convertable
 import com.intellij.debugger.streams.trace.dsl.Expression
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForLoopBody.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForLoopBody.kt
index c36dcd90ee8..a34c989bb8e 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForLoopBody.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinForLoopBody.kt
@@ -6,6 +6,7 @@ import com.intellij.debugger.streams.trace.dsl.ForLoopBody
 import com.intellij.debugger.streams.trace.dsl.StatementFactory
 import com.intellij.debugger.streams.trace.dsl.Variable
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCodeBlock
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinIfBranch.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinIfBranch.kt
index 76e304a12b9..a7f2f7267ce 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinIfBranch.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinIfBranch.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.CodeBlock
 import com.intellij.debugger.streams.trace.dsl.Expression
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinLambda.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinLambda.kt
index 58dd4ae457c..fdabb03b47a 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinLambda.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinLambda.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.CodeBlock
 import com.intellij.debugger.streams.trace.dsl.Expression
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinLambdaBody.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinLambdaBody.kt
index 9563da6dd6c..5c3cbd4002e 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinLambdaBody.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinLambdaBody.kt
@@ -1,9 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.Expression
 import com.intellij.debugger.streams.trace.dsl.LambdaBody
 import com.intellij.debugger.streams.trace.dsl.StatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCodeBlock
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinListVariable.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinListVariable.kt
index 2c80ab2ef7a..fe3ae34241f 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinListVariable.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinListVariable.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.Expression
 import com.intellij.debugger.streams.trace.dsl.ListVariable
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinMapVariable.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinMapVariable.kt
index 1a3b1228d89..1344df009ef 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinMapVariable.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinMapVariable.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.*
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinStatementFactory.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinStatementFactory.kt
index 786f0f7d72b..cdafc1e7841 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinStatementFactory.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinStatementFactory.kt
@@ -1,12 +1,14 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
+import com.intellij.debugger.streams.kotlin.trace.dsl.*
 import com.intellij.debugger.streams.trace.dsl.*
 import com.intellij.debugger.streams.trace.dsl.impl.AssignmentStatement
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
 import com.intellij.debugger.streams.trace.dsl.impl.VariableImpl
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
+
 /**
  * @author Vitaliy.Bibaev
  */
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinTryBlock.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinTryBlock.kt
index 38d3f6a710f..be7479a7aa9 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinTryBlock.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinTryBlock.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.CodeBlock
 import com.intellij.debugger.streams.trace.dsl.StatementFactory
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinTypes.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinTypes.kt
index fd964da8f70..7404f99a0bc 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinTypes.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinTypes.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.Types
 import com.intellij.debugger.streams.trace.impl.handler.type.*
@@ -40,7 +40,7 @@ object KotlinTypes : Types {
     FLOAT -> ArrayTypeImpl(FLOAT, { "kotlin.FloatArray" }, { "kotlin.FloatArray($it)" })
     DOUBLE -> ArrayTypeImpl(DOUBLE, { "kotlin.DoubleArray" }, { "kotlin.DoubleArray($it)" })
     else -> ArrayTypeImpl(nullable { elementType }, { "kotlin.Array<$it>" },
-        { "kotlin.arrayOfNulls<${elementType.genericTypeName}>($it)" })
+                          { "kotlin.arrayOfNulls<${elementType.genericTypeName}>($it)" })
   }
 
   override fun map(keyType: GenericType, valueType: GenericType): MapType =
@@ -66,8 +66,10 @@ object KotlinTypes : Types {
   }
 
   private val primitiveTypesIndex: Map<String, GenericType> =
-      listOf(KotlinTypes.BOOLEAN, KotlinTypes.BYTE, KotlinTypes.INT, KotlinTypes.SHORT,
-          KotlinTypes.CHAR, KotlinTypes.LONG, KotlinTypes.FLOAT, KotlinTypes.DOUBLE)
+      listOf(
+          BOOLEAN, BYTE, INT, SHORT,
+          CHAR, LONG, FLOAT, DOUBLE
+      )
           .associate { it.genericTypeName to it }
 
   private val primitiveArraysIndex: Map<String, ArrayType> = primitiveTypesIndex.asSequence()
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinVariableDeclaration.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinVariableDeclaration.kt
index 5df79505ba1..ce0917a964d 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinVariableDeclaration.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinVariableDeclaration.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.dsl.Variable
 import com.intellij.debugger.streams.trace.dsl.VariableDeclaration
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/PeekCallFactory.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/PeekCallFactory.kt
index 2c7d0f08cfa..e5c274d7073 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/PeekCallFactory.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/PeekCallFactory.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
 
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/KotlinTraceExpressionBuilder.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/KotlinTraceExpressionBuilder.kt
index 6eae57cbfa0..2130c15599d 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/KotlinTraceExpressionBuilder.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/KotlinTraceExpressionBuilder.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl
 
 import com.intellij.debugger.streams.lib.HandlerFactory
 import com.intellij.debugger.streams.trace.dsl.Dsl
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/CallUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/CallUtils.kt
index 438b1d6bfd1..ac5fe42a6c5 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/CallUtils.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/CallUtils.kt
@@ -1,10 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler
 
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.wrapper.*
 import com.intellij.debugger.streams.wrapper.impl.IntermediateStreamCallImpl
 import com.intellij.debugger.streams.wrapper.impl.TerminatorStreamCallImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/OnEachCall.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/OnEachCall.kt
index 3239bf5d4a0..7ff786d5c9c 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/OnEachCall.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/OnEachCall.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler
 
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.debugger.streams.wrapper.CallArgument
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/BothSemanticHandlerWrapper.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/BothSemanticHandlerWrapper.kt
index 96c5b0e04bc..507f1e4573d 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/BothSemanticHandlerWrapper.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/BothSemanticHandlerWrapper.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections
 
 import com.intellij.debugger.streams.trace.IntermediateCallHandler
 import com.intellij.debugger.streams.trace.TerminatorCallHandler
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/BothSemanticsHandler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/BothSemanticsHandler.kt
index de8aea7680e..21978c68066 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/BothSemanticsHandler.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/BothSemanticsHandler.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections
 
 import com.intellij.debugger.streams.trace.dsl.*
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionHandlerBase.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionHandlerBase.kt
index 4affc98cf87..93acc1cdebf 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionHandlerBase.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionHandlerBase.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections
 
 import com.intellij.debugger.streams.trace.TraceHandler
 import com.intellij.debugger.streams.trace.dsl.Dsl
@@ -12,7 +12,8 @@ import com.intellij.debugger.streams.wrapper.StreamCall
  * @author Vitaliy.Bibaev
  */
 abstract class CollectionHandlerBase(order: Int, private val dsl: Dsl,
-                                     private val call: StreamCall, private val internalHandler: BothSemanticsHandler)
+                                     private val call: StreamCall, private val internalHandler: BothSemanticsHandler
+)
   : TraceHandler {
   private val declarations: List<VariableDeclaration> = internalHandler.variablesDeclaration(call, order, dsl)
   protected val variables: List<Variable> = declarations.map(VariableDeclaration::variable)
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionIntermediateHandler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionIntermediateHandler.kt
index ed3e7b3d130..fe9d8621c70 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionIntermediateHandler.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionIntermediateHandler.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections
 
 import com.intellij.debugger.streams.trace.IntermediateCallHandler
 import com.intellij.debugger.streams.trace.dsl.*
@@ -12,7 +12,8 @@ class CollectionIntermediateHandler(
     order: Int,
     private val call: IntermediateStreamCall,
     private val dsl: Dsl,
-    private val internalHandler: BothSemanticsHandler)
+    private val internalHandler: BothSemanticsHandler
+)
   : IntermediateCallHandler, CollectionHandlerBase(order, dsl, call, internalHandler) {
 
   override fun prepareResult(): CodeBlock {
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionTerminatorHandler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionTerminatorHandler.kt
index a5893285985..3ed3f562769 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionTerminatorHandler.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/CollectionTerminatorHandler.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections
 
 import com.intellij.debugger.streams.trace.TerminatorCallHandler
 import com.intellij.debugger.streams.trace.dsl.CodeBlock
@@ -8,6 +8,8 @@ import com.intellij.debugger.streams.trace.dsl.Expression
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
 import com.intellij.debugger.streams.wrapper.TerminatorStreamCall
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections.BothSemanticsHandler
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections.CollectionHandlerBase
 
 /**
  * @author Vitaliy.Bibaev
@@ -15,7 +17,8 @@ import com.intellij.debugger.streams.wrapper.TerminatorStreamCall
 class CollectionTerminatorHandler(private val call: TerminatorStreamCall,
                                   private val resultExpression: String,
                                   private val dsl: Dsl,
-                                  private val internalHandler: BothSemanticsHandler)
+                                  private val internalHandler: BothSemanticsHandler
+)
   : TerminatorCallHandler, CollectionHandlerBase(Int.MAX_VALUE, dsl, call, internalHandler) {
 
   override fun prepareResult(): CodeBlock {
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/FilterCallHandler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/FilterCallHandler.kt
index b1b407b7432..d09bf0e6c22 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/FilterCallHandler.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/collections/FilterCallHandler.kt
@@ -1,8 +1,6 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections
 
-import com.intellij.debugger.streams.kotlin.trace.impl.handler.typeBefore
-import com.intellij.debugger.streams.kotlin.trace.impl.handler.withArgs
 import com.intellij.debugger.streams.trace.dsl.*
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
 import com.intellij.debugger.streams.trace.impl.handler.type.ClassTypeImpl
@@ -11,6 +9,8 @@ import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
 import com.intellij.debugger.streams.wrapper.StreamCall
 import com.intellij.debugger.streams.wrapper.TerminatorStreamCall
 import com.intellij.debugger.streams.wrapper.impl.CallArgumentImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.typeBefore
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.withArgs
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/sequence/FilterIsInstanceHandler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/sequence/FilterIsInstanceHandler.kt
index fd6d4df25b0..9805bcd3c93 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/sequence/FilterIsInstanceHandler.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/sequence/FilterIsInstanceHandler.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.sequence
 
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.trace.dsl.CodeBlock
 import com.intellij.debugger.streams.trace.dsl.Dsl
 import com.intellij.debugger.streams.trace.dsl.Expression
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/sequence/KotlinDistinctByHandler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/sequence/KotlinDistinctByHandler.kt
index bf51f83a463..5c8d1a44067 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/sequence/KotlinDistinctByHandler.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/sequence/KotlinDistinctByHandler.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.sequence
 
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.trace.dsl.*
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
 import com.intellij.debugger.streams.trace.impl.handler.type.ClassTypeImpl
@@ -11,7 +11,6 @@ import com.intellij.debugger.streams.wrapper.CallArgument
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
 import com.intellij.debugger.streams.wrapper.impl.CallArgumentImpl
 import com.intellij.debugger.streams.wrapper.impl.IntermediateStreamCallImpl
-import one.util.streamex.StreamEx
 
 /**
  * Based on com.intellij.debugger.streams.trace.impl.handler.unified.DistinctByKeyHandler
@@ -64,7 +63,6 @@ class KotlinDistinctByHandler(callNumber: Int, private val call: IntermediateStr
   override fun prepareResult(): CodeBlock {
     val keys2TimesBefore = dsl.map(KotlinTypes.NULLABLE_ANY, dsl.types.list(dsl.types.INT), "keys2Times")
     val transitions = dsl.map(dsl.types.INT, dsl.types.INT, "transitionsMap")
-    StreamEx.of(1).distinct().toList()
     return dsl.block {
       add(peekHandler.prepareResult())
       declare(keys2TimesBefore.defaultDeclaration())
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/FilterTraceInterpreter.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/FilterTraceInterpreter.kt
index 902dc8e6a12..86203f2e548 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/FilterTraceInterpreter.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/FilterTraceInterpreter.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.interpret
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.interpret
 
 import com.intellij.debugger.streams.trace.CallTraceInterpreter
 import com.intellij.debugger.streams.trace.TraceElement
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/InterpreterUtil.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/InterpreterUtil.kt
index 8d7278ec1bf..8e424d16db6 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/InterpreterUtil.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/InterpreterUtil.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.interpret
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.interpret
 
 import com.intellij.debugger.streams.trace.TraceElement
 import com.intellij.debugger.streams.trace.impl.interpret.ex.UnexpectedValueException
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/ValuesOrder.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/ValuesOrder.kt
index 6f31b28cb93..6142612a306 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/ValuesOrder.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/interpret/ValuesOrder.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.interpret
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.interpret
 
 import com.intellij.debugger.streams.trace.TraceElement
 import com.intellij.debugger.streams.trace.TraceInfo
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/JdkManager.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/JdkManager.kt
index 1d1cdf75594..757b73d43f0 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/JdkManager.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/JdkManager.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin
+package org.jetbrains.kotlin.idea.debugger.sequence
 
 import com.intellij.openapi.projectRoots.JavaSdk
 import com.intellij.openapi.projectRoots.Sdk
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/KotlinPsiChainBuilderTestCase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/KotlinPsiChainBuilderTestCase.kt
index f5dc8e853c9..0fdcbe329a1 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/KotlinPsiChainBuilderTestCase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/KotlinPsiChainBuilderTestCase.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin
+package org.jetbrains.kotlin.idea.debugger.sequence
 
 import com.intellij.debugger.streams.test.StreamChainBuilderTestCase
 import com.intellij.debugger.streams.wrapper.StreamChain
@@ -17,7 +17,7 @@ import com.intellij.psi.impl.source.PsiFileImpl
 import com.intellij.testFramework.LightPlatformTestCase
 import com.intellij.testFramework.PsiTestUtil
 import junit.framework.TestCase
-import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker
+import org.jetbrains.kotlin.idea.caches.project.LibraryModificationTracker
 import org.jetbrains.kotlin.idea.decompiler.KotlinDecompiledFileViewProvider
 import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile
 import java.io.File
@@ -48,7 +48,8 @@ abstract class KotlinPsiChainBuilderTestCase(private val relativePath: String) :
       if (ProjectLibraryTable.getInstance(LightPlatformTestCase.getProject()).getLibraryByName(stdLibName) == null) {
         VfsRootAccess.allowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY)
         PsiTestUtil.addLibrary(testRootDisposable, LightPlatformTestCase.getModule(), stdLibName,
-            LibraryUtil.LIBRARIES_DIRECTORY, LibraryUtil.KOTLIN_STD_LIBRARY_JAR_NAME)
+                               LibraryUtil.LIBRARIES_DIRECTORY, LibraryUtil.KOTLIN_STD_LIBRARY_JAR_NAME
+        )
       }
     }
     LibraryModificationTracker.getInstance(LightPlatformTestCase.getProject()).incModificationCount()
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/LibraryUtil.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/LibraryUtil.kt
index e2ca5e8fe77..1fe98fd07f5 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/LibraryUtil.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/LibraryUtil.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin
+package org.jetbrains.kotlin.idea.debugger.sequence
 
 import java.io.File
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/dsl/KotlinDslTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/dsl/KotlinDslTest.kt
index 209d724ac9d..88b5e71f4da 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/dsl/KotlinDslTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/dsl/KotlinDslTest.kt
@@ -1,16 +1,16 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.dsl
 
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinCollectionsPeekCallFactory
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCollectionsPeekCallFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory
 import com.intellij.debugger.streams.test.DslTestCase
 import com.intellij.debugger.streams.trace.dsl.impl.DslImpl
 
 /**
  * @author Vitaliy.Bibaev
  */
-class KotlinDslTest : DslTestCase(DslImpl(KotlinStatementFactory(KotlinCollectionsPeekCallFactory()))) {
-  override fun getTestDataPath(): String {
-    return "testData/dsl"
-  }
-}
\ No newline at end of file
+//class KotlinDslTest : DslTestCase(DslImpl(KotlinStatementFactory(KotlinCollectionsPeekCallFactory()))) {
+//  override fun getTestDataPath(): String {
+//    return "testData/dsl"
+//  }
+//}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/KotlinOutputChecker.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/KotlinOutputChecker.kt
index 00b6a4b30d6..b9c88f715b6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/KotlinOutputChecker.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/KotlinOutputChecker.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec
+package org.jetbrains.kotlin.idea.debugger.sequence.exec
 
 import com.intellij.debugger.impl.OutputChecker
 import com.intellij.idea.IdeaLogger
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/KotlinTraceEvaluationTestCase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/KotlinTraceEvaluationTestCase.kt
index 569ac44e6b5..8b0ba457554 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/KotlinTraceEvaluationTestCase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/KotlinTraceEvaluationTestCase.kt
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec
+package org.jetbrains.kotlin.idea.debugger.sequence.exec
 
 import com.intellij.debugger.impl.OutputChecker
-import com.intellij.debugger.streams.kotlin.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.LibraryUtil
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 import com.intellij.debugger.streams.test.TraceExecutionTestCase
 import com.intellij.execution.configurations.JavaParameters
@@ -35,13 +35,13 @@ abstract class KotlinTraceEvaluationTestCase : TraceExecutionTestCase() {
     super.setUpModule()
     ApplicationManager.getApplication().runWriteAction {
       VfsRootAccess.allowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY)
-      PsiTestUtil.addLibrary(myModule, "${LibraryUtil.LIBRARIES_DIRECTORY}/$STDLIB_JAR_NAME")
+      PsiTestUtil.addLibrary(myModule, "${LibraryUtil.LIBRARIES_DIRECTORY}/${STDLIB_JAR_NAME}")
     }
   }
 
   override fun createJavaParameters(mainClass: String?): JavaParameters {
     val javaParameters = super.createJavaParameters(mainClass)
-    javaParameters.classPath.add("${LibraryUtil.LIBRARIES_DIRECTORY}/$STDLIB_JAR_NAME")
+    javaParameters.classPath.add("${LibraryUtil.LIBRARIES_DIRECTORY}/${STDLIB_JAR_NAME}")
     return javaParameters
   }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/ChecksTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/ChecksTest.kt
index 5b49d6f51a6..803e1506ff4 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/ChecksTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/ChecksTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
 import org.junit.Ignore
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/CollectionTestCase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/CollectionTestCase.kt
index fc48e702d42..cd469751a3c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/CollectionTestCase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/CollectionTestCase.kt
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
-import com.intellij.debugger.streams.kotlin.exec.KotlinTraceEvaluationTestCase
-import com.intellij.debugger.streams.kotlin.lib.collections.KotlinCollectionSupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.KotlinTraceEvaluationTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.collections.KotlinCollectionSupportProvider
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/DifferentSourceTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/DifferentSourceTest.kt
index e30abb6eef9..b1f4d688f15 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/DifferentSourceTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/DifferentSourceTest.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/DistinctOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/DistinctOperationsTest.kt
index 47701eae128..5648af4532f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/DistinctOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/DistinctOperationsTest.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FilterOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FilterOperationsTest.kt
index d5ca00beabc..70767aaa298 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FilterOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FilterOperationsTest.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FinalOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FinalOperationsTest.kt
index 6542ae24803..3aa2481aff0 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FinalOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FinalOperationsTest.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FlatMapOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FlatMapOperationsTest.kt
index 1cf978a9df8..9f32cb9a777 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FlatMapOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/FlatMapOperationsTest.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/GroupingOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/GroupingOperationsTest.kt
index e431fbf85c1..228a77eab74 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/GroupingOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/GroupingOperationsTest.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/MapOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/MapOperationsTest.kt
index 2a23cb83c80..406d3e4fb6f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/MapOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/MapOperationsTest.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/MiscOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/MiscOperationsTest.kt
index 16798ec725d..41dd6dce1c3 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/MiscOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/MiscOperationsTest.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/ZipOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/ZipOperationsTest.kt
index cc97908b803..b3d584cb755 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/ZipOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/collection/ZipOperationsTest.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection
 
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/java/JavaStreamTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/java/JavaStreamTest.kt
index d4d6f08ee8f..94eb33eb224 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/java/JavaStreamTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/java/JavaStreamTest.kt
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.java
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.java
 
-import com.intellij.debugger.streams.kotlin.exec.KotlinTraceEvaluationTestCase
-import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.KotlinTraceEvaluationTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.JavaStandardLibrarySupportProvider
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/AppendOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/AppendOperationsTest.kt
index 559271b2cc9..8c38b0b1b80 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/AppendOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/AppendOperationsTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/DistinctOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/DistinctOperationsTest.kt
index 50ab03a44ec..063af30b417 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/DistinctOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/DistinctOperationsTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/FilterOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/FilterOperationsTest.kt
index c75774edd81..e66cf07aba8 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/FilterOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/FilterOperationsTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
 
 class FilterOperationsTest : OperationsTestCase("filter") {
     fun testFilter() = doTestWithResult()
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/FlatMapOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/FlatMapOperationsTest.kt
index 0b5af99a6c9..03bf17e7715 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/FlatMapOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/FlatMapOperationsTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/MappingOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/MappingOperationsTest.kt
index 410cb105f36..e988c12ba22 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/MappingOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/MappingOperationsTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/MiscOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/MiscOperationsTest.kt
index 64739329ad0..1d5f8663d61 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/MiscOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/MiscOperationsTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/OperationsTestCase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/OperationsTestCase.kt
index 0f2da898eeb..e359f3dd6f2 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/OperationsTestCase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/OperationsTestCase.kt
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
 
-import com.intellij.debugger.streams.kotlin.exec.KotlinTraceEvaluationTestCase
-import com.intellij.debugger.streams.kotlin.lib.sequence.KotlinSequenceSupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.KotlinTraceEvaluationTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.sequence.KotlinSequenceSupportProvider
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 
 abstract class OperationsTestCase(private val packageName: String) : KotlinTraceEvaluationTestCase() {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/SortingOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/SortingOperationsTest.kt
index c293139ae3f..c8c3099ac29 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/SortingOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/SortingOperationsTest.kt
@@ -1,5 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
+
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence.OperationsTestCase
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/TerminalOperationsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/TerminalOperationsTest.kt
index 2bb51b6d435..0d61d169ccf 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/TerminalOperationsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/sequence/TerminalOperationsTest.kt
@@ -1,5 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
+
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence.OperationsTestCase
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/TypedChainTestCase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/TypedChainTestCase.kt
index f02623dfd39..81d5caa7699 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/TypedChainTestCase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/TypedChainTestCase.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi
+package org.jetbrains.kotlin.idea.debugger.sequence.psi
 
-import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/PositiveCollectionBuildTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/PositiveCollectionBuildTest.kt
index d3c06e70583..c9262414637 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/PositiveCollectionBuildTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/PositiveCollectionBuildTest.kt
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.collection
 
-import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.lib.collections.KotlinCollectionSupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.collections.KotlinCollectionSupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/TypedCollectionChainTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/TypedCollectionChainTest.kt
index f13b624e16c..716f6ea0c27 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/TypedCollectionChainTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/TypedCollectionChainTest.kt
@@ -1,9 +1,9 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.collection
 
-import com.intellij.debugger.streams.kotlin.lib.collections.KotlinCollectionSupportProvider
-import com.intellij.debugger.streams.kotlin.psi.TypedChainTestCase
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.collections.KotlinCollectionSupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.TypedChainTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/AmbiguousChainsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/AmbiguousChainsTest.kt
index c64f53e8354..7c31feeeb2a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/AmbiguousChainsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/AmbiguousChainsTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/LocationPositiveChainTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/LocationPositiveChainTest.kt
index 819c1b257f7..76abfd2d017 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/LocationPositiveChainTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/LocationPositiveChainTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/NegativeJavaStreamTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/NegativeJavaStreamTest.kt
index f69fb88cb1e..72115d5f597 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/NegativeJavaStreamTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/NegativeJavaStreamTest.kt
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java
 
-import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.JavaStandardLibrarySupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/PositiveJavaStreamTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/PositiveJavaStreamTest.kt
index 85004d8f17a..b42e9fe6beb 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/PositiveJavaStreamTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/PositiveJavaStreamTest.kt
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java
 
-import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.JavaStandardLibrarySupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/PositiveStreamExTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/PositiveStreamExTest.kt
index 256a59f5a2f..f7f26774e6d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/PositiveStreamExTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/PositiveStreamExTest.kt
@@ -1,9 +1,9 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java
 
-import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.LibraryUtil
-import com.intellij.debugger.streams.kotlin.lib.java.StreamExLibrarySupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.StreamExLibrarySupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
@@ -20,7 +20,7 @@ class PositiveStreamExTest : KotlinPsiChainBuilderTestCase.Positive("streams/pos
     ApplicationManager.getApplication().runWriteAction {
       VfsRootAccess.allowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY)
       PsiTestUtil.addLibrary(testRootDisposable, LightPlatformTestCase.getModule(),
-          "StreamEx", LibraryUtil.LIBRARIES_DIRECTORY, "streamex-0.6.5.jar")
+                             "StreamEx", LibraryUtil.LIBRARIES_DIRECTORY, "streamex-0.6.5.jar")
     }
   }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/TypedJavaChainTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/TypedJavaChainTest.kt
index dd9fee8ffa3..334faa7b89c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/TypedJavaChainTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/TypedJavaChainTest.kt
@@ -1,12 +1,12 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java
 
-import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
-import com.intellij.debugger.streams.kotlin.psi.TypedChainTestCase
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.DOUBLE
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.INT
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.LONG
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.NULLABLE_ANY
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.JavaStandardLibrarySupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.TypedChainTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.DOUBLE
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.INT
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.LONG
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.NULLABLE_ANY
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/TypedSequenceChain.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/TypedSequenceChain.kt
index 84b136ab5bc..3c7c9d567c6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/TypedSequenceChain.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/TypedSequenceChain.kt
@@ -1,9 +1,9 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.sequence
 
-import com.intellij.debugger.streams.kotlin.lib.sequence.KotlinSequenceSupportProvider
-import com.intellij.debugger.streams.kotlin.psi.TypedChainTestCase
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.sequence.KotlinSequenceSupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.TypedChainTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 
 /**