From 6d22e063595bda4c7241e30bea21908da4fb38fe Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 8 Jun 2017 20:09:33 +0300
Subject: [PATCH] Move all test data for single test to one directory

---
 .../kotlin/test/util/jetTestUtils.kt          | 18 ++--------
 .../multipleBreakpoints}/clearCache.out       |  0
 .../multipleBreakpoints}/constructors.out     |  0
 .../multipleBreakpoints}/exceptions.out       |  0
 .../extensionMemberFunction.out               |  0
 .../extensionMemberFunctionInObject.out       |  0
 .../extensionMemberProperty.out               |  0
 .../funFromOuterClassInLamdba.out             |  0
 .../multipleBreakpoints}/initializer.out      |  0
 .../isInsideInlineLambda.out                  |  0
 .../library}/customLibClassName.out           |  0
 .../library}/localFunInLibrary.out            |  0
 .../multipleBreakpoints}/localFun.out         |  0
 .../multipleBreakpointsAtLine.out             |  0
 .../privateMembersPriority.out                |  0
 .../remappedParameterInInline.out             |  0
 .../multipleBreakpoints}/smartcasts.out       |  0
 .../multipleBreakpoints}/whenEntry.out        |  0
 .../withoutBodyFunctions.out                  |  0
 .../withoutBodyProperties.out                 |  0
 .../withoutBodyProperties2.out                |  0
 .../withoutBodyTypeParameters.out             |  0
 .../evaluate/singleBreakpoint}/_kt.out        |  0
 .../singleBreakpoint}/abstractFunCall.out     |  0
 ...essToOverridenPropertyWithBackingField.out |  0
 .../singleBreakpoint}/anonymousObjects.out    |  0
 .../evaluate/singleBreakpoint}/arrays.out     |  0
 .../evaluate/singleBreakpoint}/boxParam.out   |  0
 .../singleBreakpoint}/boxReturnValue.out      |  0
 .../breakpointInInlineFun.out                 |  0
 .../singleBreakpoint}/callableBug.out         |  0
 .../classFromAnotherPackage.out               |  0
 .../singleBreakpoint}/classObjectVal.out      |  0
 .../singleBreakpoint}/collections.out         |  0
 .../compilingEvaluator}/ceAnonymousObject.out |  0
 .../ceAnonymousObjectCapturedInClosure.out    |  0
 .../ceAnonymousObjectThisAsReceiver.out       |  0
 .../compilingEvaluator}/ceLambda.out          |  0
 .../compilingEvaluator}/ceLocalClass.out      |  0
 .../ceLocalClassMembers.out                   |  0
 .../ceLocalClassWithSuperClass.out            |  0
 .../compilingEvaluator}/ceMembers.out         |  0
 .../compilingEvaluator}/ceObject.out          |  0
 .../compilingEvaluator}/ceSeveralLambdas.out  |  0
 .../compilingEvaluator}/ceSuperAccess.out     |  0
 .../createExpressionCastToBuiltIn.out         |  0
 .../createExpressionSimple.out                |  0
 .../createExpressionWithArray.out             |  0
 .../delegatedPropertyInOtherFile.out          |  0
 .../singleBreakpoint}/dependentOnFile.out     |  0
 .../evaluate/singleBreakpoint}/doubles.out    |  0
 .../evaluate/singleBreakpoint}/enums.out      |  0
 .../evaluate/singleBreakpoint}/errors.out     |  0
 .../evBreakpointOnPropertyDeclaration.out     |  0
 .../extraVariables}/evDelegatedProperty.out   |  0
 .../extraVariables}/evDuplicateItems.out      |  0
 .../extraVariables}/evFinalProperty.out       |  0
 .../extraVariables}/evFunctionDeclaration.out |  0
 .../extraVariables}/evLineRange.out           |  0
 .../extraVariables}/evProperty.out            |  0
 .../extraVariables}/evPropertyRefExpr.out     |  0
 .../extraVariables}/evSkipAnonymousObject.out |  0
 .../extraVariables}/evSkipLambda.out          |  0
 .../extraVariables}/evSkipLocalClass.out      |  0
 .../extractLocalVariables.out                 |  0
 .../singleBreakpoint}/extractThis.out         |  0
 .../singleBreakpoint}/extractThisInTrait.out  |  0
 .../extractVariablesFromCall.out              |  0
 .../singleBreakpoint}/fileWithError.out       |  0
 .../singleBreakpoint/frame}/catchVariable.out |  0
 .../frame}/delegatedPropertyInClass.out       |  0
 .../delegatedPropertyInClassWithToString.out  |  0
 .../delegatedPropertyInClassWoRenderer.out    |  0
 .../frame}/frameAnonymousObject.out           |  0
 .../frame}/frameClassObject.out               |  0
 .../frame}/frameClosingBracket.out            |  0
 .../frame}/frameExtFunExtFun.out              |  0
 .../frame}/frameExtensionFun.out              |  0
 .../frame}/frameInlineArgument.out            |  0
 .../frameInlineArgumentInsideInlineFun.out    |  0
 .../frame}/frameInlineFun.out                 |  0
 .../frameInlineFunCallInsideInlineFun.out     |  0
 .../frame}/frameInnerClass.out                |  0
 .../frame}/frameInnerLambda.out               |  0
 .../singleBreakpoint/frame}/frameLambda.out   |  0
 .../frame}/frameLambdaNotUsed.out             |  0
 .../frame}/frameLocalVariable.out             |  0
 .../singleBreakpoint/frame}/frameObject.out   |  0
 .../frame}/frameSharedVar.out                 |  0
 .../frame}/frameSharedVarLocalVar.out         |  0
 .../singleBreakpoint/frame}/frameSimple.out   |  0
 .../singleBreakpoint/frame}/frameThis0.out    |  0
 .../singleBreakpoint/frame}/frameThis0Ext.out |  0
 .../frame}/frameThis0This0.out                |  0
 .../singleBreakpoint}/funFromSuperClass.out   |  0
 .../genericCrossinlineArgument.out            |  0
 .../evaluate/singleBreakpoint}/imports.out    |  0
 .../importsLambdaContext.out                  |  0
 .../singleBreakpoint}/inlineFunction.out      |  0
 .../inlineFunctionBreakpointAnotherFile.out   |  0
 .../inlineFunctionBreakpointVariants.out      |  0
 .../evaluate/singleBreakpoint}/innerClass.out |  0
 .../singleBreakpoint}/insertInBlock.out       |  0
 .../internalFunctionEvaluate.out              |  0
 .../singleBreakpoint}/internalProperty.out    |  0
 .../singleBreakpoint/javaContext}/jcBlock.out |  0
 .../javaContext}/jcImports.out                |  0
 .../javaContext}/jcLocalVariable.out          |  0
 .../javaContext}/jcMarkedObject.out           |  0
 .../javaContext}/jcProperty.out               |  0
 .../javaContext}/jcSimple.out                 |  0
 ...kt12206BasePropertyWithoutBackingField.out |  0
 .../kt5554OnlyIntsShouldBeCoerced.out         |  0
 .../kt7046localVarInInline.out                |  0
 .../labels}/lCallOnLabeledObj.out             |  0
 .../singleBreakpoint/labels}/lIdentifier.out  |  0
 .../labels}/lSeveralLabels.out                |  0
 .../singleBreakpoint/labels}/lSimple.out      |  0
 .../labels}/ldifferentTypes.out               |  0
 .../lambdas}/destructuringParam.out           |  0
 .../lambdas}/inlineFunctionalExpression.out   |  0
 .../lambdas}/inlineLambda.out                 |  0
 .../lambdas}/lambdaOnReturn.out               |  0
 .../lambdas}/lambdaOnSecondLine.out           |  0
 .../lambdas}/oneLineFunctionalExpression.out  |  0
 .../lambdas}/oneLineLambda.out                |  0
 .../lambdas}/twoLambdasOnOneLineFirst.out     |  0
 .../lambdas}/twoLambdasOnOneLineSecond.out    |  0
 .../lambdas}/underscoreNames.out              |  0
 .../evaluate/singleBreakpoint}/localClass.out |  0
 .../singleBreakpoint}/localVariables.out      |  0
 .../methodWithBreakpoint.out                  |  0
 .../multilineExpressionAtBreakpoint.out       |  0
 .../nestedInlineArguments.out                 |  0
 .../singleBreakpoint}/onClassHeader.out       |  0
 .../evaluate/singleBreakpoint}/onGetter.out   |  0
 .../singleBreakpoint}/onObjectHeader.out      |  0
 .../evaluate/singleBreakpoint}/package.out    |  0
 .../parametersOfInlineFun.out                 |  0
 .../parametersOfInlineFunSeveralOnLine.out    |  0
 .../singleBreakpoint}/privateClass.out        |  0
 .../singleBreakpoint}/privateMember.out       |  0
 ...ivatePropertyWithExplicitDefaultGetter.out |  0
 .../singleBreakpoint}/protectedMember.out     |  0
 .../singleBreakpoint}/rawTypeskt11831.out     |  0
 .../renderer}/toStringRenderer.out            |  0
 .../evaluate/singleBreakpoint}/simple.out     |  0
 .../evaluate/singleBreakpoint}/stdlib.out     |  0
 .../singleBreakpoint}/typeParameterRef.out    |  0
 .../evaluate/singleBreakpoint}/unboxParam.out |  0
 .../evaluate/singleBreakpoint}/unsafeCall.out |  0
 .../evaluate/singleBreakpoint}/vars.out       |  0
 .../anonymousFunAsParamDefaultValue.out       |  0
 .../stepping/custom}/coroutine.out            |  0
 .../stepping/custom}/crossinlineLiteral.out   |  0
 .../stepping/custom}/funLiteral.out           |  0
 .../custom}/functionCallStoredToVariable.out  |  0
 .../stepping/custom}/fwAbstractProperty.out   |  0
 .../stepping/custom}/fwInitializer.out        |  0
 .../custom}/fwPropertyInInterface.out         |  0
 .../stepping/custom}/inlineInObject.out       |  0
 .../custom}/inlineInObjectSameFileDex.out     |  0
 .../stepping/custom}/inlineProperties.out     |  0
 .../custom}/inlinePropertyAccessors.out       |  0
 .../{outs => src/stepping/custom}/kt15823.out |  0
 .../{outs => src/stepping/custom}/kt17144.out |  0
 .../{outs => src/stepping/custom}/kt17295.out |  0
 .../custom}/manyFilesWithInlineCalls1Dex.out  |  0
 .../custom}/manyFilesWithInlineCalls2Dex.out  |  0
 .../stepping/custom}/severalFunLiterals.out   |  0
 .../custom}/severalFunLiteralsInClass.out     |  0
 .../severalInlineCallsFromOtherFileDex.out    |  0
 .../severalInlineFunctionsInOneFileDex.out    |  0
 .../custom}/simpleConditionalBreakpoint.out   |  0
 .../smartStepIntoComponentFunction.out        |  0
 .../custom}/smartStepIntoConstructor.out      |  0
 .../smartStepIntoFunWithDefaultArgs.out       |  0
 .../smartStepIntoInlinedFunLiteral.out        |  0
 ...artStepIntoInlinedFunctionalExpression.out |  0
 .../custom}/smartStepIntoInsideLambda.out     |  0
 .../custom}/smartStepIntoInterfaceFun.out     |  0
 .../custom}/smartStepIntoInterfaceImpl.out    |  0
 .../custom}/smartStepIntoStoredLambda.out     |  0
 .../custom}/smartStepIntoSubClass.out         |  0
 .../custom}/smartStepIntoWithDelegates.out    |  0
 .../custom}/smartStepIntoWithOverrides.out    |  0
 .../custom}/stepIntoStdlibInlineFun2step.out  |  0
 .../custom}/stepOutInlineFunctionStdlib.out   |  0
 .../stepOverNonLocalReturnInLambda.out        |  0
 .../stepping/custom}/syntheticProvider.out    |  0
 .../stepping/filters}/checkNotNull.out        |  0
 .../filters}/doNotSkipClassloader.out         |  0
 .../filters}/doNotSkipConstructors.out        |  0
 .../{outs => src/stepping/filters}/npe.out    |  0
 .../stepping/filters}/reflectKClass.out       |  0
 .../stepping/filters}/skipClassloader.out     |  0
 .../stepping/filters}/skipConstructors.out    |  0
 .../stepping/filters}/stdlibStep.out          |  0
 .../filters}/stepIntoMultiFileFacade.out      |  0
 .../stepIntoSpecificKotlinClasses.out         |  0
 .../stepping/filters}/stepIntoStdlib.out      |  0
 .../filters}/stepIntoStdlibFacadeClass.out    |  0
 .../stepping/stepInto}/accessors.out          |  0
 .../stepping/stepInto}/continueLabel.out      |  0
 .../stepping/stepInto}/defaultAccessors.out   |  0
 .../stepping/stepInto}/forLoop.out            |  0
 .../stepping/stepInto}/functionReference.out  |  0
 .../stepping/stepInto}/inlineDex.out          |  0
 .../stepping/stepInto}/inlineOnly.out         |  0
 .../stepping/stepInto}/propertyReference.out  |  0
 .../stepping/stepInto}/returnVoid.out         |  0
 .../stepping/stepInto}/samAdapter.out         |  0
 .../stepping/stepInto}/siSuspendFun.out       |  0
 .../stepping/stepInto}/skipSimpleGetter.out   |  0
 .../stepInto}/skipSimpleGetterLocalVal.out    |  0
 .../skipSimpleGetterMethodWithProperty.out    |  0
 .../stepInto}/stepIntoFromInlineFun.out       |  0
 .../stepping/stepInto}/stepIntoInlineFun.out  |  0
 .../stepInto}/stepIntoStdLibInlineFun.out     |  0
 .../stepping/stepInto}/syntheticMethods.out   |  0
 .../stepInto}/syntheticMethodsSkip.out        |  0
 .../stepping/stepInto}/traits.out             |  0
 .../stepping/stepInto}/whenExpr.out           |  0
 .../classObjectFunFromClass.out               |  0
 .../classObjectFunFromTopLevel.out            |  0
 .../stepIntoAndSmartStepInto}/extFun.out      |  0
 .../stepIntoAndSmartStepInto}/javaFun.out     |  0
 .../memberFunFromClass.out                    |  0
 .../memberFunFromTopLevel.out                 |  0
 .../memberGetterFromClass.out                 |  0
 .../memberGetterFromTopLevel.out              |  0
 .../stepIntoAndSmartStepInto}/objectFun.out   |  0
 .../topLevelFunFromClass.out                  |  0
 .../topLevelFunFromTopLevel.out               |  0
 .../topLevelGetterFromClass.out               |  0
 .../topLevelGetterFromTopLevel.out            |  0
 .../stepping/stepOut}/fwBackingField.out      |  0
 .../stepOut}/inapplicableFieldWatchpoints.out |  0
 .../stepping/stepOut}/souSuspendFun.out       |  0
 .../stepOut}/stepOutInlineFunction.out        |  0
 .../stepOut}/stepOutInlinedLambdaArgument.out |  0
 .../stepOutInlinedLambdaArgumentOneLine.out   |  0
 .../stepOutSeveralInlineArgumentDeepest.out   |  0
 .../stepOutSeveralInlineFunctions.out         |  0
 .../stepOutSeveralInlineFunctionsDeepest.out  |  0
 .../stepping/stepOver}/asIterableInFor.out    |  0
 .../stepOver}/ifCapturedVariableKt9118.out    |  0
 .../inlineCallInForRangeExpression.out        |  0
 .../stepOver}/inlineFunctionSameLines.out     |  0
 .../stepping/stepOver}/inlineInClassDex.out   |  0
 .../stepping/stepOver}/inlineInIfFalse.out    |  0
 .../stepping/stepOver}/inlineInIfFalseDex.out |  0
 .../stepping/stepOver}/inlineInIfTrue.out     |  0
 .../stepping/stepOver}/inlineInIfTrueDex.out  |  0
 .../stepping/stepOver}/inlineInObjectDex.out  |  0
 .../noParameterLambdaArgumentCallInInline.out |  0
 .../noParameterLambdaArgumentCallInLambda.out |  0
 .../soInlineAnonymousFunctionArgument.out     |  0
 .../soInlineAnonymousFunctionArgumentDex.out  |  0
 .../soInlineCallInLastStatementInInline.out   |  0
 ...soInlineCallInLastStatementInInlineDex.out |  0
 ...nLastStatementInInlineFunctionArgument.out |  0
 ...stStatementInInlineFunctionArgumentDex.out |  0
 ...ineCallInLastStatementInInlineInInline.out |  0
 ...ntOfInlineWithArgumentFromCalleeAndOwn.out |  0
 .../stepping/stepOver}/soInlineFunDex.out     |  0
 .../stepOver}/soInlineFunOnOneLineFor.out     |  0
 .../stepOver}/soInlineFunOnOneLineForDex.out  |  0
 .../stepping/stepOver}/soInlineFunWithFor.out |  0
 ...WithLastStatementMultilineArgumentCall.out |  0
 ...unWithLastStatementOneLineArgumentCall.out |  0
 .../soInlineIfConditionLambdaFalse.out        |  0
 .../soInlineIfConditionLambdaTrue.out         |  0
 .../stepOver}/soInlineIterableFunDex.out      |  0
 .../stepping/stepOver}/soInlineLibFunDex.out  |  0
 .../stepOver}/soInlineOperatorIterator.out    |  0
 .../stepOver}/soInlineWhileCondition.out      |  0
 .../stepOver}/soInlineWhileConditionDex.out   |  0
 .../soReifiedInlineIfConditionFalse.out       |  0
 .../stepOver}/soSimpleInlineIfCondition.out   |  0
 .../stepOver}/stepOverCatchClause.out         |  0
 .../stepOverDeclarationInInlineFun.out        |  0
 .../stepOverFalseConditionInLastIfInWhile.out |  0
 .../stepOver}/stepOverForWithInline.out       |  0
 .../stepOver}/stepOverIfWithInline.out        |  0
 .../stepOverInlineFunWithRecursionCall.out    |  0
 .../stepOverInlineFunctionInReturn.out        |  0
 .../stepOver}/stepOverInlinedLambda.out       |  0
 .../stepOver}/stepOverInlinedLambdaStdlib.out |  0
 .../stepOver}/stepOverInsideInlineFun.out     |  0
 .../stepOver}/stepOverReifiedParam.out        |  0
 .../stepping/stepOver}/stepOverSimpleFun.out  |  0
 .../stepOver}/stepOverTryCatchWithInline.out  |  0
 .../stepOver}/stepOverWhenInReturn.out        |  0
 .../stepOver}/stepOverWhenWithInline.out      |  0
 .../stepOver}/stepOverWhileWithInline.out     |  0
 ...usFunctionInInlinedCallWithCrossInline.out |  0
 ...unctionInInlinedCallWithCrossInlineDex.out |  0
 .../stepOver}/stopInCrossinlineInSuspend.out  |  0
 .../stepOver}/stopInExtensionInlineCall.out   |  0
 .../stepOver}/stopInInlineCallInField.out     |  0
 ...allInFieldInClassWithNonDefaultPrimary.out |  0
 .../stopInInlineCallInFieldInDelegate.out     |  0
 .../stopInInlineCallInFieldInLocalClass.out   |  0
 .../stopInInlineCallLocalFunLambda.out        |  0
 .../stepping/stepOver}/stopInInlineFunDex.out |  0
 .../stepOver}/stopInInlineInOtherFileDex.out  |  0
 ...InlineInOtherFileWithLambdaArgumentDex.out |  0
 .../stepOver}/stopInInlineUnderOtherCall.out  |  0
 .../stopInInlineUnderSamConversion.out        |  0
 .../stopInInlinedInSpecialNamedFun.out        |  0
 .../stopInInlinedInSpecialNamedFunWithGet.out |  0
 ...nctionWithSuspendPointsInObjectLiteral.out |  0
 ...pInLabdaOfCrossinlineCalledInAnonymous.out |  0
 ...opInLambdaInInlinedCallWithCrossInline.out |  0
 ...nLambdaInInlinedCallWithCrossInlineDex.out |  0
 .../stopInLambdaInlineCallLambda.out          |  0
 .../stopInLocalFunInSecondaryConstructor.out  |  0
 .../stopInLocalFunInlineCallLambda.out        |  0
 .../stopInNamelessFunInInlineCall.out         |  0
 ...onInlinedLambdaInInlineCallWithClosure.out |  0
 ...nlinedLambdaInInlineCallWithoutClosure.out |  0
 ...opInObjectLiteralInInlineCallNoClosure.out |  0
 ...InObjectLiteralInInlineCallWithClosure.out |  0
 ...eralInInlineCallWithClosureInAnonymous.out |  0
 ...stopInSuspendFunctionWithSuspendPoints.out |  0
 ...tionWithSuspendPointsInAnonymousObject.out |  0
 ...InObjectLiteralInInlineCallWithClosure.out |  0
 ...pInSuspendFunctionWithoutSuspendPoints.out |  0
 ...neCallInLocalFunInSecondaryConstructor.out |  0
 .../idea/debugger/KotlinDebuggerTestCase.java | 33 ++++++++++++++-----
 .../idea/debugger/KotlinOutputChecker.kt      | 18 +++++-----
 332 files changed, 37 insertions(+), 32 deletions(-)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/clearCache.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/constructors.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/exceptions.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/extensionMemberFunction.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/extensionMemberFunctionInObject.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/extensionMemberProperty.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/funFromOuterClassInLamdba.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/initializer.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/isInsideInlineLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints/library}/customLibClassName.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints/library}/localFunInLibrary.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/localFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/multipleBreakpointsAtLine.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/privateMembersPriority.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/remappedParameterInInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/smartcasts.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/whenEntry.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/withoutBodyFunctions.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/withoutBodyProperties.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/withoutBodyProperties2.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/multipleBreakpoints}/withoutBodyTypeParameters.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/_kt.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/abstractFunCall.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/accessToOverridenPropertyWithBackingField.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/anonymousObjects.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/arrays.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/boxParam.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/boxReturnValue.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/breakpointInInlineFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/callableBug.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/classFromAnotherPackage.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/classObjectVal.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/collections.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceAnonymousObject.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceAnonymousObjectCapturedInClosure.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceAnonymousObjectThisAsReceiver.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceLocalClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceLocalClassMembers.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceLocalClassWithSuperClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceMembers.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceObject.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceSeveralLambdas.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/compilingEvaluator}/ceSuperAccess.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/createExpression}/createExpressionCastToBuiltIn.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/createExpression}/createExpressionSimple.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/createExpression}/createExpressionWithArray.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/delegatedPropertyInOtherFile.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/dependentOnFile.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/doubles.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/enums.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/errors.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evBreakpointOnPropertyDeclaration.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evDelegatedProperty.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evDuplicateItems.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evFinalProperty.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evFunctionDeclaration.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evLineRange.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evProperty.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evPropertyRefExpr.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evSkipAnonymousObject.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evSkipLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/extraVariables}/evSkipLocalClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/extractLocalVariables.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/extractThis.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/extractThisInTrait.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/extractVariablesFromCall.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/fileWithError.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/catchVariable.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/delegatedPropertyInClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/delegatedPropertyInClassWithToString.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/delegatedPropertyInClassWoRenderer.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameAnonymousObject.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameClassObject.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameClosingBracket.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameExtFunExtFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameExtensionFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameInlineArgument.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameInlineArgumentInsideInlineFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameInlineFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameInlineFunCallInsideInlineFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameInnerClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameInnerLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameLambdaNotUsed.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameLocalVariable.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameObject.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameSharedVar.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameSharedVarLocalVar.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameSimple.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameThis0.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameThis0Ext.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/frame}/frameThis0This0.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/funFromSuperClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/genericCrossinlineArgument.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/imports.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/importsLambdaContext.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/inlineFunction.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/inlineFunctionBreakpointAnotherFile.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/inlineFunctionBreakpointVariants.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/innerClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/insertInBlock.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/internalFunctionEvaluate.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/internalProperty.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/javaContext}/jcBlock.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/javaContext}/jcImports.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/javaContext}/jcLocalVariable.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/javaContext}/jcMarkedObject.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/javaContext}/jcProperty.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/javaContext}/jcSimple.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/kt12206BasePropertyWithoutBackingField.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/kt5554OnlyIntsShouldBeCoerced.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/kt7046localVarInInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/labels}/lCallOnLabeledObj.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/labels}/lIdentifier.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/labels}/lSeveralLabels.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/labels}/lSimple.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/labels}/ldifferentTypes.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/lambdas}/destructuringParam.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/lambdas}/inlineFunctionalExpression.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/lambdas}/inlineLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/lambdas}/lambdaOnReturn.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/lambdas}/lambdaOnSecondLine.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/lambdas}/oneLineFunctionalExpression.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/lambdas}/oneLineLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/lambdas}/twoLambdasOnOneLineFirst.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/lambdas}/twoLambdasOnOneLineSecond.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/lambdas}/underscoreNames.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/localClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/localVariables.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/methodWithBreakpoint.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/multilineExpressionAtBreakpoint.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/nestedInlineArguments.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/onClassHeader.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/onGetter.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/onObjectHeader.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/package.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/parametersOfInlineFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/parametersOfInlineFunSeveralOnLine.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/privateClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/privateMember.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/privatePropertyWithExplicitDefaultGetter.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/protectedMember.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/rawTypeskt11831.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint/renderer}/toStringRenderer.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/simple.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/stdlib.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/typeParameterRef.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/unboxParam.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/unsafeCall.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/evaluate/singleBreakpoint}/vars.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/anonymousFunAsParamDefaultValue.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/coroutine.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/crossinlineLiteral.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/funLiteral.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/functionCallStoredToVariable.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/fwAbstractProperty.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/fwInitializer.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/fwPropertyInInterface.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/inlineInObject.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/inlineInObjectSameFileDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/inlineProperties.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/inlinePropertyAccessors.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/kt15823.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/kt17144.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/kt17295.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/manyFilesWithInlineCalls1Dex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/manyFilesWithInlineCalls2Dex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/severalFunLiterals.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/severalFunLiteralsInClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/severalInlineCallsFromOtherFileDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/severalInlineFunctionsInOneFileDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/simpleConditionalBreakpoint.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoComponentFunction.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoConstructor.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoFunWithDefaultArgs.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoInlinedFunLiteral.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoInlinedFunctionalExpression.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoInsideLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoInterfaceFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoInterfaceImpl.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoStoredLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoSubClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoWithDelegates.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/smartStepIntoWithOverrides.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/stepIntoStdlibInlineFun2step.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/stepOutInlineFunctionStdlib.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/stepOverNonLocalReturnInLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/custom}/syntheticProvider.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/checkNotNull.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/doNotSkipClassloader.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/doNotSkipConstructors.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/npe.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/reflectKClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/skipClassloader.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/skipConstructors.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/stdlibStep.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/stepIntoMultiFileFacade.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/stepIntoSpecificKotlinClasses.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/stepIntoStdlib.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/filters}/stepIntoStdlibFacadeClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/accessors.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/continueLabel.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/defaultAccessors.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/forLoop.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/functionReference.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/inlineDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/inlineOnly.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/propertyReference.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/returnVoid.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/samAdapter.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/siSuspendFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/skipSimpleGetter.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/skipSimpleGetterLocalVal.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/skipSimpleGetterMethodWithProperty.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/stepIntoFromInlineFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/stepIntoInlineFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/stepIntoStdLibInlineFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/syntheticMethods.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/syntheticMethodsSkip.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/traits.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepInto}/whenExpr.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/classObjectFunFromClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/classObjectFunFromTopLevel.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/extFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/javaFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/memberFunFromClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/memberFunFromTopLevel.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/memberGetterFromClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/memberGetterFromTopLevel.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/objectFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/topLevelFunFromClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/topLevelFunFromTopLevel.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/topLevelGetterFromClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepIntoAndSmartStepInto}/topLevelGetterFromTopLevel.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOut}/fwBackingField.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOut}/inapplicableFieldWatchpoints.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOut}/souSuspendFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOut}/stepOutInlineFunction.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOut}/stepOutInlinedLambdaArgument.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOut}/stepOutInlinedLambdaArgumentOneLine.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOut}/stepOutSeveralInlineArgumentDeepest.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOut}/stepOutSeveralInlineFunctions.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOut}/stepOutSeveralInlineFunctionsDeepest.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/asIterableInFor.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/ifCapturedVariableKt9118.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/inlineCallInForRangeExpression.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/inlineFunctionSameLines.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/inlineInClassDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/inlineInIfFalse.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/inlineInIfFalseDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/inlineInIfTrue.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/inlineInIfTrueDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/inlineInObjectDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/noParameterLambdaArgumentCallInInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/noParameterLambdaArgumentCallInLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineAnonymousFunctionArgument.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineAnonymousFunctionArgumentDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineCallInLastStatementInInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineCallInLastStatementInInlineDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineCallInLastStatementInInlineFunctionArgument.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineCallInLastStatementInInlineFunctionArgumentDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineCallInLastStatementInInlineInInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineFunDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineFunOnOneLineFor.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineFunOnOneLineForDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineFunWithFor.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineFunWithLastStatementMultilineArgumentCall.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineFunWithLastStatementOneLineArgumentCall.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineIfConditionLambdaFalse.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineIfConditionLambdaTrue.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineIterableFunDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineLibFunDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineOperatorIterator.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineWhileCondition.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soInlineWhileConditionDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soReifiedInlineIfConditionFalse.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/soSimpleInlineIfCondition.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverCatchClause.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverDeclarationInInlineFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverFalseConditionInLastIfInWhile.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverForWithInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverIfWithInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverInlineFunWithRecursionCall.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverInlineFunctionInReturn.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverInlinedLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverInlinedLambdaStdlib.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverInsideInlineFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverReifiedParam.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverSimpleFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverTryCatchWithInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverWhenInReturn.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverWhenWithInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stepOverWhileWithInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInAnonymousFunctionInInlinedCallWithCrossInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInCrossinlineInSuspend.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInExtensionInlineCall.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlineCallInField.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlineCallInFieldInClassWithNonDefaultPrimary.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlineCallInFieldInDelegate.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlineCallInFieldInLocalClass.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlineCallLocalFunLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlineFunDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlineInOtherFileDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlineInOtherFileWithLambdaArgumentDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlineUnderOtherCall.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlineUnderSamConversion.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlinedInSpecialNamedFun.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlinedInSpecialNamedFunWithGet.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInLabdaOfCrossinlineCalledInAnonymous.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInLambdaInInlinedCallWithCrossInline.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInLambdaInInlinedCallWithCrossInlineDex.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInLambdaInlineCallLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInLocalFunInSecondaryConstructor.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInLocalFunInlineCallLambda.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInNamelessFunInInlineCall.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInNonInlinedLambdaInInlineCallWithClosure.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInNonInlinedLambdaInInlineCallWithoutClosure.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInObjectLiteralInInlineCallNoClosure.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInObjectLiteralInInlineCallWithClosure.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInObjectLiteralInInlineCallWithClosureInAnonymous.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInSuspendFunctionWithSuspendPoints.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInSuspendFunctionWithSuspendPointsInAnonymousObject.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInSuspendFunctionWithoutSuspendPoints.out (100%)
 rename idea/testData/debugger/tinyApp/{outs => src/stepping/stepOver}/stopInlineCallInLocalFunInSecondaryConstructor.out (100%)

diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/util/jetTestUtils.kt b/compiler/tests-common/org/jetbrains/kotlin/test/util/jetTestUtils.kt
index 9a73e6f6b77..17e6368c5d0 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/test/util/jetTestUtils.kt
+++ b/compiler/tests-common/org/jetbrains/kotlin/test/util/jetTestUtils.kt
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.test.util
 
-import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.*
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.util.SmartFMap
@@ -48,7 +47,7 @@ fun PsiFile.findElementsByCommentPrefix(prefix: String): Map<PsiElement, String>
                                     comment,
                                     PsiWhiteSpace::class.java, PsiComment::class.java, KtPackageDirective::class.java
                             )
-                        } as? PsiElement ?: return
+                        } ?: return
 
                         result = result.plus(elementToAdd, commentText.substring(prefix.length).trim())
                     }
@@ -58,17 +57,6 @@ fun PsiFile.findElementsByCommentPrefix(prefix: String): Map<PsiElement, String>
     return result
 }
 
-fun lastModificationDate(dir: File): Long {
-    var lastModified: Long = -1L
-
-    FileUtil.processFilesRecursively(dir) { file ->
-        val fileModified = file.lastModified()
-        if (fileModified > lastModified) {
-            lastModified = fileModified
-        }
-
-        true
-    }
-
-    return lastModified
+fun findLastModifiedFile(dir: File, skipFile: (File) -> Boolean): File {
+    return dir.walk().filterNot(skipFile).maxBy { it.lastModified() }!!
 }
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/outs/clearCache.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/clearCache.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.out
diff --git a/idea/testData/debugger/tinyApp/outs/constructors.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/constructors.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/constructors.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/constructors.out
diff --git a/idea/testData/debugger/tinyApp/outs/exceptions.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/exceptions.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.out
diff --git a/idea/testData/debugger/tinyApp/outs/extensionMemberFunction.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/extensionMemberFunction.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/extensionMemberFunction.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/extensionMemberFunction.out
diff --git a/idea/testData/debugger/tinyApp/outs/extensionMemberFunctionInObject.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/extensionMemberFunctionInObject.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/extensionMemberFunctionInObject.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/extensionMemberFunctionInObject.out
diff --git a/idea/testData/debugger/tinyApp/outs/extensionMemberProperty.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/extensionMemberProperty.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/extensionMemberProperty.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/extensionMemberProperty.out
diff --git a/idea/testData/debugger/tinyApp/outs/funFromOuterClassInLamdba.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/funFromOuterClassInLamdba.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/funFromOuterClassInLamdba.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/funFromOuterClassInLamdba.out
diff --git a/idea/testData/debugger/tinyApp/outs/initializer.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/initializer.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/initializer.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/initializer.out
diff --git a/idea/testData/debugger/tinyApp/outs/isInsideInlineLambda.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/isInsideInlineLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/isInsideInlineLambda.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/isInsideInlineLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/customLibClassName.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/customLibClassName.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/customLibClassName.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/customLibClassName.out
diff --git a/idea/testData/debugger/tinyApp/outs/localFunInLibrary.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/localFunInLibrary.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/localFunInLibrary.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/localFunInLibrary.out
diff --git a/idea/testData/debugger/tinyApp/outs/localFun.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/localFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/localFun.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/localFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/multipleBreakpointsAtLine.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/multipleBreakpointsAtLine.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/multipleBreakpointsAtLine.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/multipleBreakpointsAtLine.out
diff --git a/idea/testData/debugger/tinyApp/outs/privateMembersPriority.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/privateMembersPriority.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/privateMembersPriority.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/privateMembersPriority.out
diff --git a/idea/testData/debugger/tinyApp/outs/remappedParameterInInline.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/remappedParameterInInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/remappedParameterInInline.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/remappedParameterInInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartcasts.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/smartcasts.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartcasts.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/smartcasts.out
diff --git a/idea/testData/debugger/tinyApp/outs/whenEntry.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/whenEntry.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.out
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyFunctions.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyFunctions.out
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties.out
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyProperties2.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties2.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/withoutBodyProperties2.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties2.out
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyTypeParameters.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out
rename to idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyTypeParameters.out
diff --git a/idea/testData/debugger/tinyApp/outs/_kt.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/_kt.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/_kt.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/_kt.out
diff --git a/idea/testData/debugger/tinyApp/outs/abstractFunCall.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/abstractFunCall.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/abstractFunCall.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/abstractFunCall.out
diff --git a/idea/testData/debugger/tinyApp/outs/accessToOverridenPropertyWithBackingField.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/accessToOverridenPropertyWithBackingField.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/accessToOverridenPropertyWithBackingField.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/accessToOverridenPropertyWithBackingField.out
diff --git a/idea/testData/debugger/tinyApp/outs/anonymousObjects.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/anonymousObjects.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/anonymousObjects.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/anonymousObjects.out
diff --git a/idea/testData/debugger/tinyApp/outs/arrays.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/arrays.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/arrays.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/arrays.out
diff --git a/idea/testData/debugger/tinyApp/outs/boxParam.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/boxParam.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/boxParam.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/boxParam.out
diff --git a/idea/testData/debugger/tinyApp/outs/boxReturnValue.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/boxReturnValue.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/boxReturnValue.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/boxReturnValue.out
diff --git a/idea/testData/debugger/tinyApp/outs/breakpointInInlineFun.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/breakpointInInlineFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/breakpointInInlineFun.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/breakpointInInlineFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/callableBug.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/callableBug.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/callableBug.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/callableBug.out
diff --git a/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.out
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectVal.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classObjectVal.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/classObjectVal.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classObjectVal.out
diff --git a/idea/testData/debugger/tinyApp/outs/collections.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/collections.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceAnonymousObject.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceAnonymousObject.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceAnonymousObjectCapturedInClosure.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObjectCapturedInClosure.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceAnonymousObjectCapturedInClosure.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObjectCapturedInClosure.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceAnonymousObjectThisAsReceiver.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObjectThisAsReceiver.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceAnonymousObjectThisAsReceiver.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObjectThisAsReceiver.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceLambda.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceLambda.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceLocalClass.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceLocalClass.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceLocalClassMembers.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClassMembers.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceLocalClassMembers.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClassMembers.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceLocalClassWithSuperClass.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClassWithSuperClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceLocalClassWithSuperClass.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClassWithSuperClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceMembers.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceMembers.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceMembers.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceMembers.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceObject.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceObject.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceSeveralLambdas.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSeveralLambdas.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceSeveralLambdas.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSeveralLambdas.out
diff --git a/idea/testData/debugger/tinyApp/outs/ceSuperAccess.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSuperAccess.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ceSuperAccess.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSuperAccess.out
diff --git a/idea/testData/debugger/tinyApp/outs/createExpressionCastToBuiltIn.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/createExpression/createExpressionCastToBuiltIn.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/createExpressionCastToBuiltIn.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/createExpression/createExpressionCastToBuiltIn.out
diff --git a/idea/testData/debugger/tinyApp/outs/createExpressionSimple.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/createExpression/createExpressionSimple.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/createExpressionSimple.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/createExpression/createExpressionSimple.out
diff --git a/idea/testData/debugger/tinyApp/outs/createExpressionWithArray.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/createExpression/createExpressionWithArray.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/createExpressionWithArray.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/createExpression/createExpressionWithArray.out
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInOtherFile.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/delegatedPropertyInOtherFile.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/delegatedPropertyInOtherFile.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/delegatedPropertyInOtherFile.out
diff --git a/idea/testData/debugger/tinyApp/outs/dependentOnFile.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/dependentOnFile.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.out
diff --git a/idea/testData/debugger/tinyApp/outs/doubles.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/doubles.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/doubles.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/doubles.out
diff --git a/idea/testData/debugger/tinyApp/outs/enums.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/enums.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/enums.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/enums.out
diff --git a/idea/testData/debugger/tinyApp/outs/errors.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/errors.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/errors.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/errors.out
diff --git a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evBreakpointOnPropertyDeclaration.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evBreakpointOnPropertyDeclaration.out
diff --git a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evDelegatedProperty.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evDelegatedProperty.out
diff --git a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evDuplicateItems.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evDuplicateItems.out
diff --git a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evFinalProperty.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evFinalProperty.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evFinalProperty.out
diff --git a/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evFunctionDeclaration.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evFunctionDeclaration.out
diff --git a/idea/testData/debugger/tinyApp/outs/evLineRange.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evLineRange.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evLineRange.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evLineRange.out
diff --git a/idea/testData/debugger/tinyApp/outs/evProperty.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evProperty.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evProperty.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evProperty.out
diff --git a/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evPropertyRefExpr.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evPropertyRefExpr.out
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipAnonymousObject.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipAnonymousObject.out
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evSkipLambda.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipLocalClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipLocalClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractLocalVariables.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractLocalVariables.out
diff --git a/idea/testData/debugger/tinyApp/outs/extractThis.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractThis.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/extractThis.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractThis.out
diff --git a/idea/testData/debugger/tinyApp/outs/extractThisInTrait.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractThisInTrait.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/extractThisInTrait.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractThisInTrait.out
diff --git a/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractVariablesFromCall.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractVariablesFromCall.out
diff --git a/idea/testData/debugger/tinyApp/outs/fileWithError.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/fileWithError.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/fileWithError.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/fileWithError.out
diff --git a/idea/testData/debugger/tinyApp/outs/catchVariable.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/catchVariable.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/catchVariable.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/catchVariable.out
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWithToString.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClassWithToString.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWithToString.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClassWithToString.out
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClassWoRenderer.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClassWoRenderer.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameAnonymousObject.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameAnonymousObject.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameClassObject.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameClassObject.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClosingBracket.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClosingBracket.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtFunExtFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtFunExtFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtensionFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtensionFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInlineArgument.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInlineArgument.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInlineArgumentInsideInlineFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInlineArgumentInsideInlineFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineFun.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInlineFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameInlineFun.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInlineFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInlineFunCallInsideInlineFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInlineFunCallInsideInlineFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameInnerClass.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambda.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameLambda.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambdaNotUsed.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambdaNotUsed.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLocalVariable.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLocalVariable.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameObject.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameObject.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameObject.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameObject.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVar.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameSharedVar.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVar.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVarLocalVar.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVarLocalVar.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameSimple.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSimple.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameSimple.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSimple.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameThis0.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0Ext.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0Ext.out
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0This0.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/frameThis0This0.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0This0.out
diff --git a/idea/testData/debugger/tinyApp/outs/funFromSuperClass.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/funFromSuperClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/funFromSuperClass.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/funFromSuperClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/genericCrossinlineArgument.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/genericCrossinlineArgument.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/genericCrossinlineArgument.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/genericCrossinlineArgument.out
diff --git a/idea/testData/debugger/tinyApp/outs/imports.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/imports.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/imports.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/imports.out
diff --git a/idea/testData/debugger/tinyApp/outs/importsLambdaContext.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/importsLambdaContext.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineFunction.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/inlineFunction.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineFunction.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/inlineFunction.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointAnotherFile.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/inlineFunctionBreakpointAnotherFile.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointAnotherFile.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/inlineFunctionBreakpointAnotherFile.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointVariants.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/inlineFunctionBreakpointVariants.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointVariants.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/inlineFunctionBreakpointVariants.out
diff --git a/idea/testData/debugger/tinyApp/outs/innerClass.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/innerClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/innerClass.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/innerClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/insertInBlock.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/insertInBlock.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/insertInBlock.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/insertInBlock.out
diff --git a/idea/testData/debugger/tinyApp/outs/internalFunctionEvaluate.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/internalFunctionEvaluate.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/internalFunctionEvaluate.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/internalFunctionEvaluate.out
diff --git a/idea/testData/debugger/tinyApp/outs/internalProperty.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/internalProperty.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/internalProperty.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/internalProperty.out
diff --git a/idea/testData/debugger/tinyApp/outs/jcBlock.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcBlock.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/jcBlock.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcBlock.out
diff --git a/idea/testData/debugger/tinyApp/outs/jcImports.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcImports.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/jcImports.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcImports.out
diff --git a/idea/testData/debugger/tinyApp/outs/jcLocalVariable.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcLocalVariable.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/jcLocalVariable.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcLocalVariable.out
diff --git a/idea/testData/debugger/tinyApp/outs/jcMarkedObject.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcMarkedObject.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/jcMarkedObject.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcMarkedObject.out
diff --git a/idea/testData/debugger/tinyApp/outs/jcProperty.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcProperty.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/jcProperty.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcProperty.out
diff --git a/idea/testData/debugger/tinyApp/outs/jcSimple.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcSimple.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/jcSimple.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/javaContext/jcSimple.out
diff --git a/idea/testData/debugger/tinyApp/outs/kt12206BasePropertyWithoutBackingField.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt12206BasePropertyWithoutBackingField.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/kt12206BasePropertyWithoutBackingField.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt12206BasePropertyWithoutBackingField.out
diff --git a/idea/testData/debugger/tinyApp/outs/kt5554OnlyIntsShouldBeCoerced.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt5554OnlyIntsShouldBeCoerced.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/kt5554OnlyIntsShouldBeCoerced.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt5554OnlyIntsShouldBeCoerced.out
diff --git a/idea/testData/debugger/tinyApp/outs/kt7046localVarInInline.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt7046localVarInInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/kt7046localVarInInline.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt7046localVarInInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/lCallOnLabeledObj.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lCallOnLabeledObj.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/lCallOnLabeledObj.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lCallOnLabeledObj.out
diff --git a/idea/testData/debugger/tinyApp/outs/lIdentifier.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lIdentifier.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/lIdentifier.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lIdentifier.out
diff --git a/idea/testData/debugger/tinyApp/outs/lSeveralLabels.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lSeveralLabels.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/lSeveralLabels.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lSeveralLabels.out
diff --git a/idea/testData/debugger/tinyApp/outs/lSimple.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lSimple.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/lSimple.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lSimple.out
diff --git a/idea/testData/debugger/tinyApp/outs/ldifferentTypes.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/ldifferentTypes.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ldifferentTypes.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/ldifferentTypes.out
diff --git a/idea/testData/debugger/tinyApp/outs/destructuringParam.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/destructuringParam.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/destructuringParam.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/destructuringParam.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineFunctionalExpression.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/inlineFunctionalExpression.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineFunctionalExpression.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/inlineFunctionalExpression.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineLambda.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/inlineLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineLambda.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/inlineLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/lambdaOnReturn.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/lambdaOnReturn.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/lambdaOnReturn.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/lambdaOnReturn.out
diff --git a/idea/testData/debugger/tinyApp/outs/lambdaOnSecondLine.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/lambdaOnSecondLine.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/lambdaOnSecondLine.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/lambdaOnSecondLine.out
diff --git a/idea/testData/debugger/tinyApp/outs/oneLineFunctionalExpression.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/oneLineFunctionalExpression.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/oneLineFunctionalExpression.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/oneLineFunctionalExpression.out
diff --git a/idea/testData/debugger/tinyApp/outs/oneLineLambda.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/oneLineLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/oneLineLambda.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/oneLineLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineFirst.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineFirst.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineFirst.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineFirst.out
diff --git a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineSecond.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineSecond.out
diff --git a/idea/testData/debugger/tinyApp/outs/underscoreNames.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/underscoreNames.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/underscoreNames.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/underscoreNames.out
diff --git a/idea/testData/debugger/tinyApp/outs/localClass.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/localClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/localClass.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/localClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/localVariables.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/localVariables.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/localVariables.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/localVariables.out
diff --git a/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.out
diff --git a/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.out
diff --git a/idea/testData/debugger/tinyApp/outs/nestedInlineArguments.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/nestedInlineArguments.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/nestedInlineArguments.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/nestedInlineArguments.out
diff --git a/idea/testData/debugger/tinyApp/outs/onClassHeader.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onClassHeader.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/onClassHeader.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onClassHeader.out
diff --git a/idea/testData/debugger/tinyApp/outs/onGetter.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onGetter.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/onGetter.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onGetter.out
diff --git a/idea/testData/debugger/tinyApp/outs/onObjectHeader.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onObjectHeader.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/onObjectHeader.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onObjectHeader.out
diff --git a/idea/testData/debugger/tinyApp/outs/package.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/package.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/package.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/package.out
diff --git a/idea/testData/debugger/tinyApp/outs/parametersOfInlineFun.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/parametersOfInlineFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/parametersOfInlineFun.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/parametersOfInlineFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/parametersOfInlineFunSeveralOnLine.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/parametersOfInlineFunSeveralOnLine.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/parametersOfInlineFunSeveralOnLine.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/parametersOfInlineFunSeveralOnLine.out
diff --git a/idea/testData/debugger/tinyApp/outs/privateClass.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/privateClass.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/privateMember.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/privateMember.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.out
diff --git a/idea/testData/debugger/tinyApp/outs/privatePropertyWithExplicitDefaultGetter.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privatePropertyWithExplicitDefaultGetter.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/privatePropertyWithExplicitDefaultGetter.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privatePropertyWithExplicitDefaultGetter.out
diff --git a/idea/testData/debugger/tinyApp/outs/protectedMember.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/protectedMember.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/protectedMember.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/protectedMember.out
diff --git a/idea/testData/debugger/tinyApp/outs/rawTypeskt11831.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/rawTypeskt11831.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/rawTypeskt11831.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/rawTypeskt11831.out
diff --git a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/renderer/toStringRenderer.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/toStringRenderer.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/renderer/toStringRenderer.out
diff --git a/idea/testData/debugger/tinyApp/outs/simple.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/simple.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.out
diff --git a/idea/testData/debugger/tinyApp/outs/stdlib.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/stdlib.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stdlib.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/stdlib.out
diff --git a/idea/testData/debugger/tinyApp/outs/typeParameterRef.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/typeParameterRef.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/typeParameterRef.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/typeParameterRef.out
diff --git a/idea/testData/debugger/tinyApp/outs/unboxParam.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unboxParam.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/unboxParam.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unboxParam.out
diff --git a/idea/testData/debugger/tinyApp/outs/unsafeCall.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unsafeCall.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/unsafeCall.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unsafeCall.out
diff --git a/idea/testData/debugger/tinyApp/outs/vars.out b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/vars.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/vars.out
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/vars.out
diff --git a/idea/testData/debugger/tinyApp/outs/anonymousFunAsParamDefaultValue.out b/idea/testData/debugger/tinyApp/src/stepping/custom/anonymousFunAsParamDefaultValue.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/anonymousFunAsParamDefaultValue.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/anonymousFunAsParamDefaultValue.out
diff --git a/idea/testData/debugger/tinyApp/outs/coroutine.out b/idea/testData/debugger/tinyApp/src/stepping/custom/coroutine.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/coroutine.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/coroutine.out
diff --git a/idea/testData/debugger/tinyApp/outs/crossinlineLiteral.out b/idea/testData/debugger/tinyApp/src/stepping/custom/crossinlineLiteral.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/crossinlineLiteral.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/crossinlineLiteral.out
diff --git a/idea/testData/debugger/tinyApp/outs/funLiteral.out b/idea/testData/debugger/tinyApp/src/stepping/custom/funLiteral.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/funLiteral.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/funLiteral.out
diff --git a/idea/testData/debugger/tinyApp/outs/functionCallStoredToVariable.out b/idea/testData/debugger/tinyApp/src/stepping/custom/functionCallStoredToVariable.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/functionCallStoredToVariable.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/functionCallStoredToVariable.out
diff --git a/idea/testData/debugger/tinyApp/outs/fwAbstractProperty.out b/idea/testData/debugger/tinyApp/src/stepping/custom/fwAbstractProperty.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/fwAbstractProperty.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/fwAbstractProperty.out
diff --git a/idea/testData/debugger/tinyApp/outs/fwInitializer.out b/idea/testData/debugger/tinyApp/src/stepping/custom/fwInitializer.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/fwInitializer.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/fwInitializer.out
diff --git a/idea/testData/debugger/tinyApp/outs/fwPropertyInInterface.out b/idea/testData/debugger/tinyApp/src/stepping/custom/fwPropertyInInterface.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/fwPropertyInInterface.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/fwPropertyInInterface.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInObject.out b/idea/testData/debugger/tinyApp/src/stepping/custom/inlineInObject.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineInObject.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/inlineInObject.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInObjectSameFileDex.out b/idea/testData/debugger/tinyApp/src/stepping/custom/inlineInObjectSameFileDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineInObjectSameFileDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/inlineInObjectSameFileDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineProperties.out b/idea/testData/debugger/tinyApp/src/stepping/custom/inlineProperties.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineProperties.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/inlineProperties.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlinePropertyAccessors.out b/idea/testData/debugger/tinyApp/src/stepping/custom/inlinePropertyAccessors.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlinePropertyAccessors.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/inlinePropertyAccessors.out
diff --git a/idea/testData/debugger/tinyApp/outs/kt15823.out b/idea/testData/debugger/tinyApp/src/stepping/custom/kt15823.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/kt15823.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/kt15823.out
diff --git a/idea/testData/debugger/tinyApp/outs/kt17144.out b/idea/testData/debugger/tinyApp/src/stepping/custom/kt17144.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/kt17144.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/kt17144.out
diff --git a/idea/testData/debugger/tinyApp/outs/kt17295.out b/idea/testData/debugger/tinyApp/src/stepping/custom/kt17295.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/kt17295.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/kt17295.out
diff --git a/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls1Dex.out b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls1Dex.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.out
diff --git a/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls2Dex.out b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls2Dex.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.out
diff --git a/idea/testData/debugger/tinyApp/outs/severalFunLiterals.out b/idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiterals.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/severalFunLiterals.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiterals.out
diff --git a/idea/testData/debugger/tinyApp/outs/severalFunLiteralsInClass.out b/idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiteralsInClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/severalFunLiteralsInClass.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiteralsInClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/severalInlineCallsFromOtherFileDex.out b/idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineCallsFromOtherFileDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/severalInlineCallsFromOtherFileDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineCallsFromOtherFileDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/severalInlineFunctionsInOneFileDex.out b/idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineFunctionsInOneFileDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/severalInlineFunctionsInOneFileDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineFunctionsInOneFileDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/simpleConditionalBreakpoint.out b/idea/testData/debugger/tinyApp/src/stepping/custom/simpleConditionalBreakpoint.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/simpleConditionalBreakpoint.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/simpleConditionalBreakpoint.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoComponentFunction.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoComponentFunction.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoComponentFunction.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoComponentFunction.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoConstructor.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoConstructor.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoConstructor.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoConstructor.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoFunWithDefaultArgs.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoFunWithDefaultArgs.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoFunWithDefaultArgs.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoFunWithDefaultArgs.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunLiteral.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunLiteral.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunLiteral.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunLiteral.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunctionalExpression.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunctionalExpression.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunctionalExpression.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunctionalExpression.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInsideLambda.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInsideLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoInsideLambda.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInsideLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceFun.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInterfaceFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInterfaceFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceImpl.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInterfaceImpl.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceImpl.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInterfaceImpl.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoStoredLambda.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoStoredLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoStoredLambda.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoStoredLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoSubClass.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoSubClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoSubClass.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoSubClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoWithDelegates.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoWithDelegates.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoWithDelegates.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoWithDelegates.out
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoWithOverrides.out b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoWithOverrides.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/smartStepIntoWithOverrides.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoWithOverrides.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoStdlibInlineFun2step.out b/idea/testData/debugger/tinyApp/src/stepping/custom/stepIntoStdlibInlineFun2step.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepIntoStdlibInlineFun2step.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/stepIntoStdlibInlineFun2step.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutInlineFunctionStdlib.out b/idea/testData/debugger/tinyApp/src/stepping/custom/stepOutInlineFunctionStdlib.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOutInlineFunctionStdlib.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/stepOutInlineFunctionStdlib.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverNonLocalReturnInLambda.out b/idea/testData/debugger/tinyApp/src/stepping/custom/stepOverNonLocalReturnInLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverNonLocalReturnInLambda.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/stepOverNonLocalReturnInLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/syntheticProvider.out b/idea/testData/debugger/tinyApp/src/stepping/custom/syntheticProvider.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/syntheticProvider.out
rename to idea/testData/debugger/tinyApp/src/stepping/custom/syntheticProvider.out
diff --git a/idea/testData/debugger/tinyApp/outs/checkNotNull.out b/idea/testData/debugger/tinyApp/src/stepping/filters/checkNotNull.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/checkNotNull.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/checkNotNull.out
diff --git a/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out b/idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.out
diff --git a/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out b/idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipConstructors.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipConstructors.out
diff --git a/idea/testData/debugger/tinyApp/outs/npe.out b/idea/testData/debugger/tinyApp/src/stepping/filters/npe.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/npe.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/npe.out
diff --git a/idea/testData/debugger/tinyApp/outs/reflectKClass.out b/idea/testData/debugger/tinyApp/src/stepping/filters/reflectKClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/reflectKClass.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/reflectKClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/skipClassloader.out b/idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/skipClassloader.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.out
diff --git a/idea/testData/debugger/tinyApp/outs/skipConstructors.out b/idea/testData/debugger/tinyApp/src/stepping/filters/skipConstructors.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/skipConstructors.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/skipConstructors.out
diff --git a/idea/testData/debugger/tinyApp/outs/stdlibStep.out b/idea/testData/debugger/tinyApp/src/stepping/filters/stdlibStep.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stdlibStep.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/stdlibStep.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoMultiFileFacade.out b/idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoMultiFileFacade.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepIntoMultiFileFacade.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoMultiFileFacade.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out b/idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoSpecificKotlinClasses.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoSpecificKotlinClasses.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out b/idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlib.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlib.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out b/idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlibFacadeClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out
rename to idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlibFacadeClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/accessors.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/accessors.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.out
diff --git a/idea/testData/debugger/tinyApp/outs/continueLabel.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/continueLabel.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/continueLabel.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/continueLabel.out
diff --git a/idea/testData/debugger/tinyApp/outs/defaultAccessors.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/defaultAccessors.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/defaultAccessors.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/defaultAccessors.out
diff --git a/idea/testData/debugger/tinyApp/outs/forLoop.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/forLoop.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/forLoop.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/forLoop.out
diff --git a/idea/testData/debugger/tinyApp/outs/functionReference.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/functionReference.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/functionReference.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/functionReference.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineOnly.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineOnly.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineOnly.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineOnly.out
diff --git a/idea/testData/debugger/tinyApp/outs/propertyReference.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/propertyReference.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/propertyReference.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/propertyReference.out
diff --git a/idea/testData/debugger/tinyApp/outs/returnVoid.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/returnVoid.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/returnVoid.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/returnVoid.out
diff --git a/idea/testData/debugger/tinyApp/outs/samAdapter.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/samAdapter.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/samAdapter.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/samAdapter.out
diff --git a/idea/testData/debugger/tinyApp/outs/siSuspendFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/siSuspendFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/siSuspendFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/siSuspendFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/skipSimpleGetter.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/skipSimpleGetter.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/skipSimpleGetter.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/skipSimpleGetter.out
diff --git a/idea/testData/debugger/tinyApp/outs/skipSimpleGetterLocalVal.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/skipSimpleGetterLocalVal.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/skipSimpleGetterLocalVal.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/skipSimpleGetterLocalVal.out
diff --git a/idea/testData/debugger/tinyApp/outs/skipSimpleGetterMethodWithProperty.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/skipSimpleGetterMethodWithProperty.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/skipSimpleGetterMethodWithProperty.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/skipSimpleGetterMethodWithProperty.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoFromInlineFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoFromInlineFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepIntoFromInlineFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoFromInlineFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoInlineFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoInlineFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepIntoInlineFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoInlineFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoStdLibInlineFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoStdLibInlineFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepIntoStdLibInlineFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoStdLibInlineFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/syntheticMethods.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/syntheticMethods.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/syntheticMethods.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/syntheticMethods.out
diff --git a/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/syntheticMethodsSkip.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/syntheticMethodsSkip.out
diff --git a/idea/testData/debugger/tinyApp/outs/traits.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/traits.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/traits.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/traits.out
diff --git a/idea/testData/debugger/tinyApp/outs/whenExpr.out b/idea/testData/debugger/tinyApp/src/stepping/stepInto/whenExpr.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/whenExpr.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/whenExpr.out
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.out
diff --git a/idea/testData/debugger/tinyApp/outs/extFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/extFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/extFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/extFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/javaFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/javaFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/memberFunFromClass.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromTopLevel.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromTopLevel.out
diff --git a/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromTopLevel.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromTopLevel.out
diff --git a/idea/testData/debugger/tinyApp/outs/objectFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/objectFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/objectFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/objectFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.out
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.out
diff --git a/idea/testData/debugger/tinyApp/outs/fwBackingField.out b/idea/testData/debugger/tinyApp/src/stepping/stepOut/fwBackingField.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/fwBackingField.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/fwBackingField.out
diff --git a/idea/testData/debugger/tinyApp/outs/inapplicableFieldWatchpoints.out b/idea/testData/debugger/tinyApp/src/stepping/stepOut/inapplicableFieldWatchpoints.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inapplicableFieldWatchpoints.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/inapplicableFieldWatchpoints.out
diff --git a/idea/testData/debugger/tinyApp/outs/souSuspendFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepOut/souSuspendFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/souSuspendFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/souSuspendFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutInlineFunction.out b/idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlineFunction.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOutInlineFunction.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlineFunction.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgument.out b/idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgument.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgument.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgument.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgumentOneLine.out b/idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgumentOneLine.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgumentOneLine.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgumentOneLine.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineArgumentDeepest.out b/idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineArgumentDeepest.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineArgumentDeepest.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineArgumentDeepest.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctions.out b/idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineFunctions.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctions.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineFunctions.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctionsDeepest.out b/idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineFunctionsDeepest.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctionsDeepest.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineFunctionsDeepest.out
diff --git a/idea/testData/debugger/tinyApp/outs/asIterableInFor.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/asIterableInFor.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/asIterableInFor.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/asIterableInFor.out
diff --git a/idea/testData/debugger/tinyApp/outs/ifCapturedVariableKt9118.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/ifCapturedVariableKt9118.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/ifCapturedVariableKt9118.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/ifCapturedVariableKt9118.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineCallInForRangeExpression.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineCallInForRangeExpression.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineCallInForRangeExpression.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineCallInForRangeExpression.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineFunctionSameLines.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineFunctionSameLines.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineFunctionSameLines.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineFunctionSameLines.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInClassDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineInClassDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInIfFalse.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInIfFalse.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineInIfFalse.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInIfFalse.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInIfFalseDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInIfFalseDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineInIfFalseDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInIfFalseDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInIfTrue.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInIfTrue.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineInIfTrue.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInIfTrue.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInIfTrueDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInIfTrueDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineInIfTrueDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInIfTrueDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInObjectDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/inlineInObjectDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInInline.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/noParameterLambdaArgumentCallInInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInInline.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/noParameterLambdaArgumentCallInInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInLambda.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/noParameterLambdaArgumentCallInLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInLambda.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/noParameterLambdaArgumentCallInLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgument.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineAnonymousFunctionArgument.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgument.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineAnonymousFunctionArgument.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgumentDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineAnonymousFunctionArgumentDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgumentDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineAnonymousFunctionArgumentDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInline.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineCallInLastStatementInInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInline.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineCallInLastStatementInInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineCallInLastStatementInInlineDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineCallInLastStatementInInlineDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgument.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineCallInLastStatementInInlineFunctionArgument.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgument.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineCallInLastStatementInInlineFunctionArgument.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgumentDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineCallInLastStatementInInlineFunctionArgumentDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgumentDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineCallInLastStatementInInlineFunctionArgumentDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineInInline.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineCallInLastStatementInInlineInInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineInInline.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineCallInLastStatementInInlineInInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineFunDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineFor.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunOnOneLineFor.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineFor.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunOnOneLineFor.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineForDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunOnOneLineForDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineForDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunOnOneLineForDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunWithFor.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunWithFor.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineFunWithFor.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunWithFor.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementMultilineArgumentCall.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunWithLastStatementMultilineArgumentCall.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementMultilineArgumentCall.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunWithLastStatementMultilineArgumentCall.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementOneLineArgumentCall.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunWithLastStatementOneLineArgumentCall.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementOneLineArgumentCall.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineFunWithLastStatementOneLineArgumentCall.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaFalse.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineIfConditionLambdaFalse.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaFalse.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineIfConditionLambdaFalse.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaTrue.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineIfConditionLambdaTrue.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaTrue.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineIfConditionLambdaTrue.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineIterableFunDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineIterableFunDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineIterableFunDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineIterableFunDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineLibFunDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineLibFunDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineLibFunDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineLibFunDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineOperatorIterator.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineOperatorIterator.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineOperatorIterator.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineOperatorIterator.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineWhileCondition.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineWhileCondition.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineWhileCondition.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineWhileCondition.out
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineWhileConditionDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineWhileConditionDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soInlineWhileConditionDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soInlineWhileConditionDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/soReifiedInlineIfConditionFalse.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soReifiedInlineIfConditionFalse.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soReifiedInlineIfConditionFalse.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soReifiedInlineIfConditionFalse.out
diff --git a/idea/testData/debugger/tinyApp/outs/soSimpleInlineIfCondition.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/soSimpleInlineIfCondition.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/soSimpleInlineIfCondition.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/soSimpleInlineIfCondition.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverCatchClause.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverCatchClause.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverCatchClause.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverCatchClause.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverDeclarationInInlineFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverDeclarationInInlineFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverDeclarationInInlineFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverDeclarationInInlineFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverFalseConditionInLastIfInWhile.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverFalseConditionInLastIfInWhile.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverFalseConditionInLastIfInWhile.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverFalseConditionInLastIfInWhile.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverForWithInline.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverForWithInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverForWithInline.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverForWithInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverIfWithInline.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverIfWithInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverIfWithInline.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverIfWithInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverInlineFunWithRecursionCall.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlineFunWithRecursionCall.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverInlineFunWithRecursionCall.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlineFunWithRecursionCall.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverInlineFunctionInReturn.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlineFunctionInReturn.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverInlineFunctionInReturn.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlineFunctionInReturn.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverInlinedLambda.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverInlinedLambda.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverInlinedLambdaStdlib.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambdaStdlib.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverInlinedLambdaStdlib.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambdaStdlib.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverInsideInlineFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInsideInlineFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverInsideInlineFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInsideInlineFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverReifiedParam.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverReifiedParam.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverReifiedParam.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverReifiedParam.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverSimpleFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverSimpleFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverSimpleFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverSimpleFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverTryCatchWithInline.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverTryCatchWithInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverTryCatchWithInline.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverTryCatchWithInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverWhenInReturn.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenInReturn.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverWhenInReturn.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenInReturn.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverWhenWithInline.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenWithInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverWhenWithInline.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenWithInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverWhileWithInline.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhileWithInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stepOverWhileWithInline.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhileWithInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInline.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInline.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInCrossinlineInSuspend.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInCrossinlineInSuspend.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInCrossinlineInSuspend.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInCrossinlineInSuspend.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInExtensionInlineCall.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInExtensionInlineCall.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInExtensionInlineCall.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInExtensionInlineCall.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInField.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInField.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlineCallInField.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInField.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInClassWithNonDefaultPrimary.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInClassWithNonDefaultPrimary.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInClassWithNonDefaultPrimary.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInClassWithNonDefaultPrimary.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInDelegate.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInDelegate.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInDelegate.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInDelegate.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInLocalClass.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInLocalClass.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInLocalClass.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInLocalClass.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallLocalFunLambda.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallLocalFunLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlineCallLocalFunLambda.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallLocalFunLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineFunDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineFunDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlineFunDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineFunDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileWithLambdaArgumentDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileWithLambdaArgumentDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileWithLambdaArgumentDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileWithLambdaArgumentDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineUnderOtherCall.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineUnderOtherCall.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlineUnderOtherCall.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineUnderOtherCall.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineUnderSamConversion.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineUnderSamConversion.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlineUnderSamConversion.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineUnderSamConversion.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFun.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlinedInSpecialNamedFun.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFun.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlinedInSpecialNamedFun.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFunWithGet.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlinedInSpecialNamedFunWithGet.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFunWithGet.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlinedInSpecialNamedFunWithGet.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLabdaOfCrossinlineCalledInAnonymous.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLabdaOfCrossinlineCalledInAnonymous.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInLabdaOfCrossinlineCalledInAnonymous.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLabdaOfCrossinlineCalledInAnonymous.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInline.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLambdaInInlinedCallWithCrossInline.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInline.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLambdaInInlinedCallWithCrossInline.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInlineDex.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLambdaInInlinedCallWithCrossInlineDex.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInlineDex.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLambdaInInlinedCallWithCrossInlineDex.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLambdaInlineCallLambda.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLambdaInlineCallLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInLambdaInlineCallLambda.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLambdaInlineCallLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLocalFunInSecondaryConstructor.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLocalFunInSecondaryConstructor.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInLocalFunInSecondaryConstructor.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLocalFunInSecondaryConstructor.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLocalFunInlineCallLambda.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLocalFunInlineCallLambda.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInLocalFunInlineCallLambda.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInLocalFunInlineCallLambda.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInNamelessFunInInlineCall.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInNamelessFunInInlineCall.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInNamelessFunInInlineCall.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInNamelessFunInInlineCall.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithClosure.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInNonInlinedLambdaInInlineCallWithClosure.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithClosure.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInNonInlinedLambdaInInlineCallWithClosure.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithoutClosure.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInNonInlinedLambdaInInlineCallWithoutClosure.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithoutClosure.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInNonInlinedLambdaInInlineCallWithoutClosure.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallNoClosure.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInObjectLiteralInInlineCallNoClosure.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallNoClosure.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInObjectLiteralInInlineCallNoClosure.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosure.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInObjectLiteralInInlineCallWithClosure.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosure.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInObjectLiteralInInlineCallWithClosure.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosureInAnonymous.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInObjectLiteralInInlineCallWithClosureInAnonymous.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosureInAnonymous.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInObjectLiteralInInlineCallWithClosureInAnonymous.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPoints.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInSuspendFunctionWithSuspendPoints.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPoints.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInSuspendFunctionWithSuspendPoints.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInAnonymousObject.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInSuspendFunctionWithSuspendPointsInAnonymousObject.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInAnonymousObject.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInSuspendFunctionWithSuspendPointsInAnonymousObject.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithoutSuspendPoints.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInSuspendFunctionWithoutSuspendPoints.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithoutSuspendPoints.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInSuspendFunctionWithoutSuspendPoints.out
diff --git a/idea/testData/debugger/tinyApp/outs/stopInlineCallInLocalFunInSecondaryConstructor.out b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInlineCallInLocalFunInSecondaryConstructor.out
similarity index 100%
rename from idea/testData/debugger/tinyApp/outs/stopInlineCallInLocalFunInSecondaryConstructor.out
rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInlineCallInLocalFunInSecondaryConstructor.out
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
index 68341ce7d35..66e7a693d6b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
@@ -53,6 +53,7 @@ import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.MockLibraryUtil;
+import org.jetbrains.kotlin.test.TestMetadata;
 import org.jetbrains.kotlin.test.util.JetTestUtilsKt;
 import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
 import org.junit.Assert;
@@ -81,14 +82,16 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
     private static final File LOCAL_CACHE_LAST_MODIFIED_FILE = new File(LOCAL_CACHE_DIR, "lastModified.txt");
 
     private static File CUSTOM_LIBRARY_JAR;
-    private static final File CUSTOM_LIBRARY_SOURCES = new File(PluginTestCaseBase.getTestDataPathBase() + "/debugger/customLibraryForTinyApp");
+    private static final File CUSTOM_LIBRARY_SOURCES =
+            new File(PluginTestCaseBase.getTestDataPathBase() + "/debugger/customLibraryForTinyApp");
 
     protected static final String KOTLIN_LIBRARY_NAME = "KotlinLibrary";
     private static final String CUSTOM_LIBRARY_NAME = "CustomLibrary";
 
     @Override
     protected OutputChecker initOutputChecker() {
-        return new KotlinOutputChecker(getTestAppPath(), getAppOutputPath());
+        return new KotlinOutputChecker(
+                this.getClass().getAnnotation(TestMetadata.class).value(), getTestAppPath(), getAppOutputPath());
     }
 
     @NotNull
@@ -126,6 +129,14 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
         super.setUp();
     }
 
+    private static long cachedDirLastModifiedTimeStamp() {
+        File lastModifiedFile = JetTestUtilsKt.findLastModifiedFile(
+                TINY_APP_SRC,
+                file -> FilesKt.getExtension(file).equals("out") || file.isDirectory()
+        );
+        return lastModifiedFile.lastModified();
+    }
+
     private static boolean isLocalCacheOutdated() {
         if (!LOCAL_CACHE_LAST_MODIFIED_FILE.exists()) return true;
 
@@ -138,7 +149,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
         }
 
         long cachedFor = Long.parseLong(text);
-        long currentLastDate = JetTestUtilsKt.lastModificationDate(TINY_APP_SRC);
+        long currentLastDate = cachedDirLastModifiedTimeStamp();
 
         return currentLastDate != cachedFor;
     }
@@ -159,7 +170,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
                 boolean createFileResult = LOCAL_CACHE_LAST_MODIFIED_FILE.createNewFile();
                 Assert.assertTrue("Failure on " + LOCAL_CACHE_LAST_MODIFIED_FILE.getName() + " creation", createFileResult);
 
-                long lastModificationDate = JetTestUtilsKt.lastModificationDate(TINY_APP_SRC);
+                long lastModificationDate = cachedDirLastModifiedTimeStamp();
                 FileUtil.writeToFile(LOCAL_CACHE_LAST_MODIFIED_FILE, Long.toString(lastModificationDate));
             }
 
@@ -170,7 +181,12 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
         }
     }
 
-    private static void configureLibrary(@NotNull ModifiableRootModel model, @NotNull String libraryName, @NotNull File classes, @NotNull File sources) {
+    private static void configureLibrary(
+            @NotNull ModifiableRootModel model,
+            @NotNull String libraryName,
+            @NotNull File classes,
+            @NotNull File sources
+    ) {
         NewLibraryEditor customLibEditor = new NewLibraryEditor();
         customLibEditor.setName(libraryName);
 
@@ -221,13 +237,14 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
             }
 
             CUSTOM_LIBRARY_JAR = MockLibraryUtil.compileLibraryToJar(
-                            CUSTOM_LIBRARY_SOURCES.getPath(), jarDir, "debuggerCustomLibrary", false, false);
+                    CUSTOM_LIBRARY_SOURCES.getPath(), jarDir, "debuggerCustomLibrary", false, false);
 
             String sourcesDir = modulePath + File.separator + "src";
 
             MockLibraryUtil.compileKotlin(sourcesDir, outDir, CUSTOM_LIBRARY_JAR.getPath());
 
-            List<String> options = Arrays.asList("-d", outputDirPath, "-classpath", ForTestCompileRuntime.runtimeJarForTests().getPath(), "-g");
+            List<String> options =
+                    Arrays.asList("-d", outputDirPath, "-classpath", ForTestCompileRuntime.runtimeJarForTests().getPath(), "-g");
             try {
                 KotlinTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options);
             }
@@ -331,7 +348,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
         }
         catch (ComparisonFailure e) {
             KotlinTestUtils.assertEqualsToFile(
-                    new File(getTestAppPath() + File.separator + "outs" + File.separator + getTestName(true) + ".out"),
+                    new File(this.getClass().getAnnotation(TestMetadata.class).value(), getTestName(true) + ".out"),
                     e.getActual());
         }
     }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt
index d8ccbfe07bc..3c512431aac 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt
@@ -28,7 +28,9 @@ import com.intellij.openapi.vfs.CharsetToolkit
 import org.junit.Assert
 import java.io.File
 
-internal class KotlinOutputChecker(appPath: String, outputPath: String) : OutputChecker(appPath, outputPath) {
+internal class KotlinOutputChecker(
+        private val testDir: String,
+        appPath: String, outputPath: String) : OutputChecker(appPath, outputPath) {
     companion object {
         @JvmStatic
         private val LOG = Logger.getInstance(KotlinOutputChecker::class.java)
@@ -38,9 +40,9 @@ internal class KotlinOutputChecker(appPath: String, outputPath: String) : Output
         private val RUN_JAVA = "Run Java"
 
         //ERROR: JDWP Unable to get JNI 1.2 environment, jvm->GetEnv() return code = -2
-        private val JDI_BUG_OUTPUT_PATTERN_1 = Regex("ERROR\\:\\s+JDWP\\s+Unable\\s+to\\s+get\\s+JNI\\s+1\\.2\\s+environment,\\s+jvm-\\>GetEnv\\(\\)\\s+return\\s+code\\s+=\\s+-2")
+        private val JDI_BUG_OUTPUT_PATTERN_1 = Regex("ERROR:\\s+JDWP\\s+Unable\\s+to\\s+get\\s+JNI\\s+1\\.2\\s+environment,\\s+jvm->GetEnv\\(\\)\\s+return\\s+code\\s+=\\s+-2")
         //JDWP exit error AGENT_ERROR_NO_JNI_ENV(183):  [../../../src/share/back/util.c:820]
-        private val JDI_BUG_OUTPUT_PATTERN_2 = Regex("JDWP\\s+exit\\s+error\\s+AGENT_ERROR_NO_JNI_ENV.*\\]")
+        private val JDI_BUG_OUTPUT_PATTERN_2 = Regex("JDWP\\s+exit\\s+error\\s+AGENT_ERROR_NO_JNI_ENV.*]")
     }
 
     // Copied from the base OutputChecker.checkValid(). Need to intercept call to base preprocessBuffer() method
@@ -51,19 +53,17 @@ internal class KotlinOutputChecker(appPath: String, outputPath: String) : Output
 
         val actual = preprocessBuffer(buildOutputString())
 
-        val outs = File(myAppPath + File.separator + "outs")
-        assert(outs.exists() || outs.mkdirs()) { outs }
-
-        var outFile = File(outs, myTestName + ".out")
+        val outDir = File(testDir)
+        var outFile = File(outDir, myTestName + ".out")
         if (!outFile.exists()) {
             if (SystemInfo.isWindows) {
-                val winOut = File(outs, myTestName + ".win.out")
+                val winOut = File(outDir, myTestName + ".win.out")
                 if (winOut.exists()) {
                     outFile = winOut
                 }
             }
             else if (SystemInfo.isUnix) {
-                val unixOut = File(outs, myTestName + ".unx.out")
+                val unixOut = File(outDir, myTestName + ".unx.out")
                 if (unixOut.exists()) {
                     outFile = unixOut
                 }