diff --git a/compiler/testData/codegen/java8/box/annotations/useTypeParameterAnnotationFromJava.kt b/compiler/testData/codegen/box/annotations/useTypeParameterAnnotationFromJava.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/annotations/useTypeParameterAnnotationFromJava.kt
rename to compiler/testData/codegen/box/annotations/useTypeParameterAnnotationFromJava.kt
diff --git a/compiler/testData/codegen/java8/box/annotations/useTypeUseAnnotationFromJava.kt b/compiler/testData/codegen/box/annotations/useTypeUseAnnotationFromJava.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/annotations/useTypeUseAnnotationFromJava.kt
rename to compiler/testData/codegen/box/annotations/useTypeUseAnnotationFromJava.kt
diff --git a/compiler/testData/codegen/java8/box/builtinStubMethods/immutableRemove.kt b/compiler/testData/codegen/box/builtinStubMethods/immutableRemove.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/builtinStubMethods/immutableRemove.kt
rename to compiler/testData/codegen/box/builtinStubMethods/immutableRemove.kt
diff --git a/compiler/testData/codegen/java8/box/mapGetOrDefault/noTypeSafeBridge.kt b/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/noTypeSafeBridge.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/mapGetOrDefault/noTypeSafeBridge.kt
rename to compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/noTypeSafeBridge.kt
diff --git a/compiler/testData/codegen/java8/box/mapGetOrDefault/typeSafeBridge.kt b/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridge.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/mapGetOrDefault/typeSafeBridge.kt
rename to compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridge.kt
diff --git a/compiler/testData/codegen/java8/box/mapGetOrDefault/typeSafeBridgeNotNullAny.kt b/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridgeNotNullAny.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/mapGetOrDefault/typeSafeBridgeNotNullAny.kt
rename to compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridgeNotNullAny.kt
diff --git a/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt
rename to compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt
diff --git a/compiler/testData/codegen/java8/box/mapRemove/readOnlyMap.kt b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/readOnlyMap.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/mapRemove/readOnlyMap.kt
rename to compiler/testData/codegen/box/builtinStubMethods/mapRemove/readOnlyMap.kt
diff --git a/compiler/testData/codegen/java8/box/mapRemove/typeSafeBridge.kt b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/typeSafeBridge.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/mapRemove/typeSafeBridge.kt
rename to compiler/testData/codegen/box/builtinStubMethods/mapRemove/typeSafeBridge.kt
diff --git a/compiler/testData/codegen/java8/box/mapRemove/typeSafeBridgeNotNullAny.kt b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/typeSafeBridgeNotNullAny.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/mapRemove/typeSafeBridgeNotNullAny.kt
rename to compiler/testData/codegen/box/builtinStubMethods/mapRemove/typeSafeBridgeNotNullAny.kt
diff --git a/compiler/testData/codegen/java8/box/async.kt b/compiler/testData/codegen/box/coroutines/async.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/async.kt
rename to compiler/testData/codegen/box/coroutines/async.kt
diff --git a/compiler/testData/codegen/java8/box/asyncException.kt b/compiler/testData/codegen/box/coroutines/asyncException.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/asyncException.kt
rename to compiler/testData/codegen/box/coroutines/asyncException.kt
diff --git a/compiler/testData/codegen/java8/box/delegationBy/byMiddleInterface.kt b/compiler/testData/codegen/box/delegation/byMiddleInterface.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/delegationBy/byMiddleInterface.kt
rename to compiler/testData/codegen/box/delegation/byMiddleInterface.kt
diff --git a/compiler/testData/codegen/java8/box/delegationBy/defaultOverride.kt b/compiler/testData/codegen/box/delegation/defaultOverride.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/delegationBy/defaultOverride.kt
rename to compiler/testData/codegen/box/delegation/defaultOverride.kt
diff --git a/compiler/testData/codegen/java8/box/delegationBy/delegationToMap.kt b/compiler/testData/codegen/box/delegation/delegationToMap.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/delegationBy/delegationToMap.kt
rename to compiler/testData/codegen/box/delegation/delegationToMap.kt
diff --git a/compiler/testData/codegen/java8/box/delegationBy/diamond.kt b/compiler/testData/codegen/box/delegation/diamond.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/delegationBy/diamond.kt
rename to compiler/testData/codegen/box/delegation/diamond.kt
diff --git a/compiler/testData/codegen/java8/box/delegationBy/diamond2.kt b/compiler/testData/codegen/box/delegation/diamond2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/delegationBy/diamond2.kt
rename to compiler/testData/codegen/box/delegation/diamond2.kt
diff --git a/compiler/testData/codegen/java8/box/delegationBy/inClassDeclaration.kt b/compiler/testData/codegen/box/delegation/inClassDeclaration.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/delegationBy/inClassDeclaration.kt
rename to compiler/testData/codegen/box/delegation/inClassDeclaration.kt
diff --git a/compiler/testData/codegen/java8/box/delegationBy/mixed.kt b/compiler/testData/codegen/box/delegation/mixed.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/delegationBy/mixed.kt
rename to compiler/testData/codegen/box/delegation/mixed.kt
diff --git a/compiler/testData/codegen/java8/box/delegationBy/simple.kt b/compiler/testData/codegen/box/delegation/simple.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/delegationBy/simple.kt
rename to compiler/testData/codegen/box/delegation/simple.kt
diff --git a/compiler/testData/codegen/java8/box/delegationBy/simple1.0.kt b/compiler/testData/codegen/box/delegation/simple1.0.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/delegationBy/simple1.0.kt
rename to compiler/testData/codegen/box/delegation/simple1.0.kt
diff --git a/compiler/testData/codegen/java8/box/functionAssertion.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/functionAssertion.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/functionAssertion.kt
rename to compiler/testData/codegen/box/javaInterop/notNullAssertions/functionAssertion.kt
diff --git a/compiler/testData/codegen/java8/box/removeIf.kt b/compiler/testData/codegen/box/jdk/removeIf.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/removeIf.kt
rename to compiler/testData/codegen/box/jdk/removeIf.kt
diff --git a/compiler/testData/codegen/java8/box/stream.kt b/compiler/testData/codegen/box/jdk/stream.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/stream.kt
rename to compiler/testData/codegen/box/jdk/stream.kt
diff --git a/compiler/testData/codegen/java8/box/streamBackwardCompatibility.kt b/compiler/testData/codegen/box/jdk/streamBackwardCompatibility.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/streamBackwardCompatibility.kt
rename to compiler/testData/codegen/box/jdk/streamBackwardCompatibility.kt
diff --git a/compiler/testData/codegen/java8/box/useStream.kt b/compiler/testData/codegen/box/jdk/useStream.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/useStream.kt
rename to compiler/testData/codegen/box/jdk/useStream.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/bridgeInClass.kt b/compiler/testData/codegen/box/jvm8/bridgeInClass.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/bridgeInClass.kt
rename to compiler/testData/codegen/box/jvm8/bridgeInClass.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/bridgeInInterface.kt b/compiler/testData/codegen/box/jvm8/bridgeInInterface.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/bridgeInInterface.kt
rename to compiler/testData/codegen/box/jvm8/bridgeInInterface.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/capturedSuperCall.kt b/compiler/testData/codegen/box/jvm8/capturedSuperCall.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/capturedSuperCall.kt
rename to compiler/testData/codegen/box/jvm8/capturedSuperCall.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaultArgs.kt b/compiler/testData/codegen/box/jvm8/defaultArgs.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaultArgs.kt
rename to compiler/testData/codegen/box/jvm8/defaultArgs.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt b/compiler/testData/codegen/box/jvm8/defaults/accessor.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt
rename to compiler/testData/codegen/box/jvm8/defaults/accessor.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt b/compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt
rename to compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt b/compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt
rename to compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt
rename to compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt
rename to compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt
rename to compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
rename to compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
rename to compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt
rename to compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt b/compiler/testData/codegen/box/jvm8/defaults/callableReference.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt
rename to compiler/testData/codegen/box/jvm8/defaults/callableReference.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt b/compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt
rename to compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridge.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridge.kt
rename to compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridge2.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridge2.kt
rename to compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridge3.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridge3.kt
rename to compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridgeWithProperties.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridgeWithProperties.kt
rename to compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt
rename to compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt
rename to compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/defaultArgs.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/defaultArgs.kt
rename to compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt
rename to compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/propertyAnnotation.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/propertyAnnotation.kt
rename to compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/simpleFunction.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/compatibility/simpleFunction.kt
rename to compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt b/compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt
rename to compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt b/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt
rename to compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt
rename to compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt b/compiler/testData/codegen/box/jvm8/defaults/diamond.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt
rename to compiler/testData/codegen/box/jvm8/defaults/diamond.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt b/compiler/testData/codegen/box/jvm8/defaults/inline.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt
rename to compiler/testData/codegen/box/jvm8/defaults/inline.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt
rename to compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt b/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt
rename to compiler/testData/codegen/box/jvm8/defaults/kt11969.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt b/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt
rename to compiler/testData/codegen/box/jvm8/defaults/kt14243.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt b/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt
rename to compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt b/compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt
rename to compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
rename to compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
rename to compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
rename to compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt b/compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt
rename to compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt b/compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt
rename to compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt b/compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
rename to compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt b/compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt
rename to compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt b/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt
rename to compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt b/compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt
rename to compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt
rename to compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt b/compiler/testData/codegen/box/jvm8/defaults/superCall.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt
rename to compiler/testData/codegen/box/jvm8/defaults/superCall.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/inlineFromAnotherFile.kt b/compiler/testData/codegen/box/jvm8/inlineFromAnotherFile.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/inlineFromAnotherFile.kt
rename to compiler/testData/codegen/box/jvm8/inlineFromAnotherFile.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/inlineFromStdlib.kt b/compiler/testData/codegen/box/jvm8/inlineFromStdlib.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/inlineFromStdlib.kt
rename to compiler/testData/codegen/box/jvm8/inlineFromStdlib.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/interfaceFlag/superCall.kt b/compiler/testData/codegen/box/jvm8/interfaceFlag/superCall.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/interfaceFlag/superCall.kt
rename to compiler/testData/codegen/box/jvm8/interfaceFlag/superCall.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/interfaceFlag/superCallIndirect.kt b/compiler/testData/codegen/box/jvm8/interfaceFlag/superCallIndirect.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/interfaceFlag/superCallIndirect.kt
rename to compiler/testData/codegen/box/jvm8/interfaceFlag/superCallIndirect.kt
diff --git a/compiler/testData/codegen/java8/box/capturedSuperCall.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/capturedSuperCall.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/capturedSuperCall.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/capturedSuperCall.kt
diff --git a/compiler/testData/codegen/java8/box/defaultMethodCallFromInterface.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodCallFromInterface.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/defaultMethodCallFromInterface.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodCallFromInterface.kt
diff --git a/compiler/testData/codegen/java8/box/defaultMethodCallViaClass.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodCallViaClass.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/defaultMethodCallViaClass.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodCallViaClass.kt
diff --git a/compiler/testData/codegen/java8/box/defaultMethodCallViaInterface.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodCallViaInterface.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/defaultMethodCallViaInterface.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodCallViaInterface.kt
diff --git a/compiler/testData/codegen/java8/box/defaultMethodOverride.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodOverride.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/defaultMethodOverride.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodOverride.kt
diff --git a/compiler/testData/codegen/java8/box/dontDelegateToDefaultMethods.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/dontDelegateToDefaultMethods.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/dontDelegateToDefaultMethods.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/dontDelegateToDefaultMethods.kt
diff --git a/compiler/testData/codegen/java8/box/inheritKotlin.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/inheritKotlin.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/inheritKotlin.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/inheritKotlin.kt
diff --git a/compiler/testData/codegen/java8/box/invokeDefaultViaSuper.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/invokeDefaultViaSuper.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper.kt
diff --git a/compiler/testData/codegen/java8/box/invokeDefaultViaSuper_16.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper_16.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/invokeDefaultViaSuper_16.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper_16.kt
diff --git a/compiler/testData/codegen/java8/box/longChainOfKotlinExtendsFromJavaWithDefault.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/longChainOfKotlinExtendsFromJavaWithDefault.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/longChainOfKotlinExtendsFromJavaWithDefault.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/longChainOfKotlinExtendsFromJavaWithDefault.kt
diff --git a/compiler/testData/codegen/java8/box/samOnInterfaceWithDefaultMethod.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/samOnInterfaceWithDefaultMethod.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/samOnInterfaceWithDefaultMethod.kt
rename to compiler/testData/codegen/box/jvm8/javaDefaults/samOnInterfaceWithDefaultMethod.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt11969.kt b/compiler/testData/codegen/box/jvm8/kt11969.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt11969.kt
rename to compiler/testData/codegen/box/jvm8/kt11969.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt14243.kt b/compiler/testData/codegen/box/jvm8/kt14243.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt14243.kt
rename to compiler/testData/codegen/box/jvm8/kt14243.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt14243_2.kt b/compiler/testData/codegen/box/jvm8/kt14243_2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt14243_2.kt
rename to compiler/testData/codegen/box/jvm8/kt14243_2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt14243_prop.kt b/compiler/testData/codegen/box/jvm8/kt14243_prop.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt14243_prop.kt
rename to compiler/testData/codegen/box/jvm8/kt14243_prop.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt16581.kt b/compiler/testData/codegen/box/jvm8/kt16581.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt16581.kt
rename to compiler/testData/codegen/box/jvm8/kt16581.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt16581_2.kt b/compiler/testData/codegen/box/jvm8/kt16581_2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt16581_2.kt
rename to compiler/testData/codegen/box/jvm8/kt16581_2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt16588.kt b/compiler/testData/codegen/box/jvm8/kt16588.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt16588.kt
rename to compiler/testData/codegen/box/jvm8/kt16588.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt6301.kt b/compiler/testData/codegen/box/jvm8/kt6301.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt6301.kt
rename to compiler/testData/codegen/box/jvm8/kt6301.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt6301_2.kt b/compiler/testData/codegen/box/jvm8/kt6301_2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt6301_2.kt
rename to compiler/testData/codegen/box/jvm8/kt6301_2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/oneImplementation.kt b/compiler/testData/codegen/box/jvm8/oneImplementation.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/oneImplementation.kt
rename to compiler/testData/codegen/box/jvm8/oneImplementation.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/oneImplementation2.kt b/compiler/testData/codegen/box/jvm8/oneImplementation2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/oneImplementation2.kt
rename to compiler/testData/codegen/box/jvm8/oneImplementation2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/simpleCall.kt b/compiler/testData/codegen/box/jvm8/simpleCall.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/simpleCall.kt
rename to compiler/testData/codegen/box/jvm8/simpleCall.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/simpleProperty.kt b/compiler/testData/codegen/box/jvm8/simpleProperty.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/simpleProperty.kt
rename to compiler/testData/codegen/box/jvm8/simpleProperty.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/optimizations/hashCode.kt b/compiler/testData/codegen/box/optimizations/hashCode.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/optimizations/hashCode.kt
rename to compiler/testData/codegen/box/optimizations/hashCode.kt
diff --git a/compiler/testData/codegen/java8/box/parametersMetadata/defaultImpls.kt b/compiler/testData/codegen/box/parametersMetadata/defaultImpls.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/parametersMetadata/defaultImpls.kt
rename to compiler/testData/codegen/box/parametersMetadata/defaultImpls.kt
diff --git a/compiler/testData/codegen/java8/box/parametersMetadata/delegation.kt b/compiler/testData/codegen/box/parametersMetadata/delegation.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/parametersMetadata/delegation.kt
rename to compiler/testData/codegen/box/parametersMetadata/delegation.kt
diff --git a/compiler/testData/codegen/java8/box/parametersMetadata/enum.kt b/compiler/testData/codegen/box/parametersMetadata/enum.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/parametersMetadata/enum.kt
rename to compiler/testData/codegen/box/parametersMetadata/enum.kt
diff --git a/compiler/testData/codegen/java8/box/parametersMetadata/extensionFunction.kt b/compiler/testData/codegen/box/parametersMetadata/extensionFunction.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/parametersMetadata/extensionFunction.kt
rename to compiler/testData/codegen/box/parametersMetadata/extensionFunction.kt
diff --git a/compiler/testData/codegen/java8/box/parametersMetadata/function.kt b/compiler/testData/codegen/box/parametersMetadata/function.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/parametersMetadata/function.kt
rename to compiler/testData/codegen/box/parametersMetadata/function.kt
diff --git a/compiler/testData/codegen/java8/box/parametersMetadata/innerClass.kt b/compiler/testData/codegen/box/parametersMetadata/innerClass.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/parametersMetadata/innerClass.kt
rename to compiler/testData/codegen/box/parametersMetadata/innerClass.kt
diff --git a/compiler/testData/codegen/java8/box/parametersMetadata/superParams.kt b/compiler/testData/codegen/box/parametersMetadata/superParams.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/parametersMetadata/superParams.kt
rename to compiler/testData/codegen/box/parametersMetadata/superParams.kt
diff --git a/compiler/testData/codegen/java8/box/reflection/parameters/realParameterNames.kt b/compiler/testData/codegen/box/reflection/parameters/realParameterNames.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/reflection/parameters/realParameterNames.kt
rename to compiler/testData/codegen/box/reflection/parameters/realParameterNames.kt
diff --git a/compiler/testData/codegen/java8/box/reflection/parameters/synthesizedParameterNames.kt b/compiler/testData/codegen/box/reflection/parameters/synthesizedParameterNames.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/reflection/parameters/synthesizedParameterNames.kt
rename to compiler/testData/codegen/box/reflection/parameters/synthesizedParameterNames.kt