diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index bf628291234..bac65b38703 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -422,7 +422,7 @@
         id="kotlinJavaSafeDeleteDelegate"
         language="jet"
         implementationClass="org.jetbrains.kotlin.idea.refactoring.safeDelete.KotlinJavaSafeDeleteDelegate"/>
-    <debugger.jvmSmartStepIntoHandler implementation="org.jetbrains.kotlin.idea.debugger.KotlinSmartStepIntoHandler"/>
+    <debugger.jvmSmartStepIntoHandler implementation="org.jetbrains.kotlin.idea.debugger.stepping.KotlinSmartStepIntoHandler"/>
     <debugger.positionManagerFactory implementation="org.jetbrains.kotlin.idea.debugger.JetPositionManagerFactory"/>
     <debugger.codeFragmentFactory implementation="org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory"/>
     <debuggerEditorTextProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.debugger.KotlinEditorTextProvider"/>
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
index 6e97b706a6d..cbf9bafb077 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
@@ -28,6 +28,7 @@ import com.intellij.xdebugger.settings.DebuggerSettingsCategory
 import com.intellij.xdebugger.settings.XDebuggerSettings
 
 import com.intellij.xdebugger.XDebuggerUtil
+import org.jetbrains.kotlin.idea.debugger.stepping.KotlinSteppingConfigurableUi
 
 State(name = "KotlinDebuggerSettings", storages = arrayOf(Storage(file = StoragePathMacros.APP_CONFIG + "/kotlin_debug.xml")))
 public class KotlinDebuggerSettings : XDebuggerSettings<KotlinDebuggerSettings>("kotlin_debugger"), Getter<KotlinDebuggerSettings> {
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinMethodSmartStepIntoTarget.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinMethodSmartStepIntoTarget.kt
similarity index 93%
rename from idea/src/org/jetbrains/kotlin/idea/debugger/KotlinMethodSmartStepIntoTarget.kt
rename to idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinMethodSmartStepIntoTarget.kt
index 29832266e88..c78c52d5e53 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinMethodSmartStepIntoTarget.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinMethodSmartStepIntoTarget.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.idea.debugger
+package org.jetbrains.kotlin.idea.debugger.stepping
 
 import com.intellij.debugger.actions.MethodSmartStepTarget
 import com.intellij.psi.PsiElement
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSmartStepIntoHandler.kt
similarity index 98%
rename from idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt
rename to idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSmartStepIntoHandler.kt
index 0e3dc57ae0b..7d6c71fbbdb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSmartStepIntoHandler.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.debugger
+package org.jetbrains.kotlin.idea.debugger.stepping
 
 import com.intellij.debugger.SourcePosition
 import com.intellij.debugger.actions.JvmSmartStepIntoHandler
@@ -34,6 +34,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
+import org.jetbrains.kotlin.idea.debugger.MockSourcePosition
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.form b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingConfigurableUi.form
similarity index 93%
rename from idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.form
rename to idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingConfigurableUi.form
index ae4ed8d29f7..dba6b4d2f49 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.form
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingConfigurableUi.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.debugger.KotlinSteppingConfigurableUi">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.debugger.stepping.KotlinSteppingConfigurableUi">
   <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.java b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingConfigurableUi.java
similarity index 92%
rename from idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.java
rename to idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingConfigurableUi.java
index 5be66cba39c..2d0b162da86 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.java
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingConfigurableUi.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.debugger;
+package org.jetbrains.kotlin.idea.debugger.stepping;
 
 
 import com.intellij.openapi.options.ConfigurableUi;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.idea.debugger.KotlinDebuggerSettings;
 
 import javax.swing.*;
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt
index 08ee980fa15..bab52c3683e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt
@@ -22,8 +22,9 @@ import com.intellij.debugger.engine.BasicStepMethodFilter
 import com.intellij.debugger.engine.SuspendContextImpl
 import com.intellij.debugger.ui.breakpoints.LineBreakpoint
 import com.intellij.openapi.util.io.FileUtil
-import org.jetbrains.kotlin.idea.debugger.KotlinSmartStepIntoHandler.KotlinBasicStepMethodFilter
-import org.jetbrains.kotlin.idea.debugger.KotlinSmartStepIntoHandler.KotlinMethodSmartStepTarget
+import org.jetbrains.kotlin.idea.debugger.stepping.KotlinBasicStepMethodFilter
+import org.jetbrains.kotlin.idea.debugger.stepping.KotlinSmartStepIntoHandler
+import org.jetbrains.kotlin.idea.debugger.stepping.KotlinMethodSmartStepTarget
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.test.InTextDirectivesUtils.getPrefixedInt
 import java.io.File
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt
index 4dc3e1ebfcc..826ec7120d3 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt
@@ -23,6 +23,7 @@ import com.intellij.psi.util.PsiFormatUtil
 import com.intellij.psi.util.PsiFormatUtilBase
 import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.debugger.stepping.KotlinSmartStepIntoHandler
 import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.InTextDirectivesUtils