Move classmerging tests into their own module.

Bug: b/518716827
Change-Id: Idffa1e080d1314b09ce726411254c7ff9a940d48

d8_r8/test_modules/tests_java_8/classmerging/build.gradle.kts

diff --git a/d8_r8/test_modules/tests_java_8/classmerging/build.gradle.kts b/d8_r8/test_modules/tests_java_8/classmerging/build.gradle.kts
new file mode 100644
index 0000000..3c8b7e6
--- /dev/null
+++ b/d8_r8/test_modules/tests_java_8/classmerging/build.gradle.kts
@@ -0,0 +1,10 @@
+// Copyright (c) 2026, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+// The majority of the build setup is done by tests_java_8.
+java {
+  sourceSets.test.configure {
+    java.srcDir(getRoot().resolveAll("src", "test", "java8", "classmerging"))
+  }
+}

settings.gradle.kts

diff --git a/settings.gradle.kts b/settings.gradle.kts
index ef63af1..9ab6001 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -50,6 +50,7 @@
 includeTestProject(":testbase")
 includeTestProject(":tests_bootstrap")
 includeTestProject(":tests_java_8")
+includeTestProject(":tests_java_8:classmerging")
 includeTestProject(":tests_java_8:ir")
 includeTestProject(":tests_java_8:shaking")
 includeTestProject(":tests_java_8:desugar")

src/test/java8/classmerging/com/android/tools/r8/classmerging/KeepAnnoOnMovedStaticInterfaceMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/KeepAnnoOnMovedStaticInterfaceMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/KeepAnnoOnMovedStaticInterfaceMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/KeepAnnoOnMovedStaticInterfaceMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/KeepAnnoOnMovedStaticInterfaceMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/KeptTargetsIncompleteDiamondTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/KeptTargetsIncompleteDiamondTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/KeptTargetsIncompleteDiamondTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/KeptTargetsIncompleteDiamondTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/KeptTargetsIncompleteDiamondTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/StatefulSingletonClassesMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/StatefulSingletonClassesMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/StatefulSingletonClassesMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/StatefulSingletonClassesMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/StatefulSingletonClassesMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/StatelessSingletonClassesMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/StatelessSingletonClassesMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/StatelessSingletonClassesMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/StatelessSingletonClassesMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/StatelessSingletonClassesMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingNonTrivialTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingNonTrivialTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingNonTrivialTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingNonTrivialTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingNonTrivialTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AbstractMethodWithSuperMethodMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodWithSuperMethodMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AbstractMethodWithSuperMethodMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodWithSuperMethodMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AbstractMethodWithSuperMethodMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/B420228751AltTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/B420228751AltTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/B420228751AltTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/B420228751AltTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/B420228751AltTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/B420228751Test.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/B420228751Test.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/B420228751Test.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/B420228751Test.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/B420228751Test.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClInitMergeSuperTypeApiLevelTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClInitMergeSuperTypeApiLevelTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClInitMergeSuperTypeApiLevelTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClInitMergeSuperTypeApiLevelTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClInitMergeSuperTypeApiLevelTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassWithInstanceFieldsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassWithInstanceFieldsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassWithInstanceFieldsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassWithInstanceFieldsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassWithInstanceFieldsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectCheckCastTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectCheckCastTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectCheckCastTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectCheckCastTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectCheckCastTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectInstanceOfTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectInstanceOfTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectInstanceOfTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectInstanceOfTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectInstanceOfTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByIndirectCheckCastToInterfaceTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByIndirectCheckCastToInterfaceTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByIndirectCheckCastToInterfaceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByIndirectCheckCastToInterfaceTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByIndirectCheckCastToInterfaceTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistuingishedByIndirectInstanceOfInterfaceCheckCast.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistuingishedByIndirectInstanceOfInterfaceCheckCast.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistuingishedByIndirectInstanceOfInterfaceCheckCast.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistuingishedByIndirectInstanceOfInterfaceCheckCast.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesDistuingishedByIndirectInstanceOfInterfaceCheckCast.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentFieldsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentFieldsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentFieldsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentFieldsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentFieldsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentInterfacesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentInterfacesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentInterfacesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentInterfacesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentInterfacesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentVisibilityFieldsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentVisibilityFieldsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentVisibilityFieldsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentVisibilityFieldsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentVisibilityFieldsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithFeatureSplitTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithFeatureSplitTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithFeatureSplitTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithFeatureSplitTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithFeatureSplitTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithIdenticalInterfacesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithIdenticalInterfacesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithIdenticalInterfacesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithIdenticalInterfacesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithIdenticalInterfacesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithNativeMethodsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithNativeMethodsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithNativeMethodsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithNativeMethodsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithNativeMethodsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithOverlappingVisibilitiesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithOverlappingVisibilitiesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithOverlappingVisibilitiesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithOverlappingVisibilitiesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithOverlappingVisibilitiesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithStaticFields.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithStaticFields.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithStaticFields.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithStaticFields.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClassesWithStaticFields.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitCycleAnalysisWithNativeCallTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitCycleAnalysisWithNativeCallTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitCycleAnalysisWithNativeCallTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitCycleAnalysisWithNativeCallTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitCycleAnalysisWithNativeCallTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingClassInitializedBySuperTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingClassInitializedBySuperTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingClassInitializedBySuperTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingClassInitializedBySuperTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingClassInitializedBySuperTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMultipleGroupsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMultipleGroupsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMultipleGroupsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMultipleGroupsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMultipleGroupsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMutuallyDependentClassesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMutuallyDependentClassesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMutuallyDependentClassesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMutuallyDependentClassesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMutuallyDependentClassesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingSingletonClassesInstantiatedByCompanionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingSingletonClassesInstantiatedByCompanionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingSingletonClassesInstantiatedByCompanionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingSingletonClassesInstantiatedByCompanionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingSingletonClassesInstantiatedByCompanionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/CompanionClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/CompanionClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/CompanionClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/CompanionClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/CompanionClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/CompatKeepConstructorLiveTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/CompatKeepConstructorLiveTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/CompatKeepConstructorLiveTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/CompatKeepConstructorLiveTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/CompatKeepConstructorLiveTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConditionalMethodRulesAndHorizontalMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/horizontalclassmerging/ConditionalMethodRulesAndHorizontalMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConditionalMethodRulesAndHorizontalMergingTest.java
similarity index 88%
rename from src/test/java/com/android/tools/r8/horizontalclassmerging/ConditionalMethodRulesAndHorizontalMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConditionalMethodRulesAndHorizontalMergingTest.java
index 38aea2d..eeefc68 100644
--- a/src/test/java/com/android/tools/r8/horizontalclassmerging/ConditionalMethodRulesAndHorizontalMergingTest.java
+++ b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConditionalMethodRulesAndHorizontalMergingTest.java
@@ -1,15 +1,15 @@
 // Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.horizontalclassmerging;
+package com.android.tools.r8.classmerging.horizontal;
 
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.horizontalclassmerging.ConditionalMethodRulesAndHorizontalMergingTest.Example1.BaseClass;
-import com.android.tools.r8.horizontalclassmerging.ConditionalMethodRulesAndHorizontalMergingTest.Example1.MyHiddenMethodCaller;
-import com.android.tools.r8.horizontalclassmerging.ConditionalMethodRulesAndHorizontalMergingTest.Example2.MyFieldValuePrinter;
-import com.android.tools.r8.horizontalclassmerging.ConditionalMethodRulesAndHorizontalMergingTest.Example2.PrintableFieldInterface;
+import com.android.tools.r8.classmerging.horizontal.ConditionalMethodRulesAndHorizontalMergingTest.Example1.BaseClass;
+import com.android.tools.r8.classmerging.horizontal.ConditionalMethodRulesAndHorizontalMergingTest.Example1.MyHiddenMethodCaller;
+import com.android.tools.r8.classmerging.horizontal.ConditionalMethodRulesAndHorizontalMergingTest.Example2.MyFieldValuePrinter;
+import com.android.tools.r8.classmerging.horizontal.ConditionalMethodRulesAndHorizontalMergingTest.Example2.PrintableFieldInterface;
 import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.internal.StringUtils;
 import com.google.common.collect.ImmutableList;

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstClassAfterVerticalClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstClassAfterVerticalClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstClassAfterVerticalClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ConstClassAfterVerticalClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstClassAfterVerticalClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorCantInlineTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorCantInlineTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorCantInlineTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorCantInlineTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorCantInlineTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingAfterUnusedArgumentRemovalTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingAfterUnusedArgumentRemovalTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingAfterUnusedArgumentRemovalTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingAfterUnusedArgumentRemovalTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingAfterUnusedArgumentRemovalTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingOverlapTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingOverlapTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingOverlapTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingOverlapTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingOverlapTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingPreoptimizedTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingPreoptimizedTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingPreoptimizedTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingPreoptimizedTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingPreoptimizedTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTrivialOverlapTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTrivialOverlapTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTrivialOverlapTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTrivialOverlapTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTrivialOverlapTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithArgumentsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithArgumentsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithArgumentsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithArgumentsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithArgumentsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithDifferentProfileFlagsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithDifferentProfileFlagsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithDifferentProfileFlagsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithDifferentProfileFlagsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithDifferentProfileFlagsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionAfterClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionAfterClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionAfterClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionAfterClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionAfterClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionInSubclassAfterClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionInSubclassAfterClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionInSubclassAfterClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionInSubclassAfterClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionInSubclassAfterClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionWithClassMethodAfterClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionWithClassMethodAfterClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionWithClassMethodAfterClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionWithClassMethodAfterClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionWithClassMethodAfterClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DistinguishExceptionClassesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/DistinguishExceptionClassesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DistinguishExceptionClassesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/DistinguishExceptionClassesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/DistinguishExceptionClassesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EmptyClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EmptyClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EmptyClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EmptyClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EmptyClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAfterUnusedArgumentRemovalMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAfterUnusedArgumentRemovalMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAfterUnusedArgumentRemovalMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAfterUnusedArgumentRemovalMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAfterUnusedArgumentRemovalMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentAndAssignmentOrderMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentAndAssignmentOrderMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentAndAssignmentOrderMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentAndAssignmentOrderMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentAndAssignmentOrderMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentOrderMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentOrderMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentOrderMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentOrderMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentOrderMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentAssignmentOrderMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentAssignmentOrderMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentAssignmentOrderMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentAssignmentOrderMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentAssignmentOrderMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndExtraNullsMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndExtraNullsMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndExtraNullsMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndExtraNullsMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndExtraNullsMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithDifferentProfileFlagsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithDifferentProfileFlagsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithDifferentProfileFlagsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithDifferentProfileFlagsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithDifferentProfileFlagsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithInterfaceValueToParentTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithInterfaceValueToParentTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithInterfaceValueToParentTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithInterfaceValueToParentTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithInterfaceValueToParentTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithPrimitiveAndReferencesParametersTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithPrimitiveAndReferencesParametersTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithPrimitiveAndReferencesParametersTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithPrimitiveAndReferencesParametersTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithPrimitiveAndReferencesParametersTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdAfterUnusedArgumentRemovalMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdAfterUnusedArgumentRemovalMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdAfterUnusedArgumentRemovalMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdAfterUnusedArgumentRemovalMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdAfterUnusedArgumentRemovalMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentInstanceInitializerMergingWithApiUnsafeParameterTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentInstanceInitializerMergingWithApiUnsafeParameterTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentInstanceInitializerMergingWithApiUnsafeParameterTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentInstanceInitializerMergingWithApiUnsafeParameterTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/EquivalentInstanceInitializerMergingWithApiUnsafeParameterTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/FieldTypeMergedTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/FieldTypeMergedTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/FieldTypeMergedTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/FieldTypeMergedTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/FieldTypeMergedTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/FieldsWithDifferentAccessFlagsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/FieldsWithDifferentAccessFlagsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/FieldsWithDifferentAccessFlagsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/FieldsWithDifferentAccessFlagsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/FieldsWithDifferentAccessFlagsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/GenericStaticFieldTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/GenericStaticFieldTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/GenericStaticFieldTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/GenericStaticFieldTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/GenericStaticFieldTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergerSafeCheckCastPromotionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergerSafeCheckCastPromotionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergerSafeCheckCastPromotionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergerSafeCheckCastPromotionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergerSafeCheckCastPromotionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingAfterConstructorShrinkingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingAfterConstructorShrinkingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingAfterConstructorShrinkingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingAfterConstructorShrinkingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingAfterConstructorShrinkingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingAfterConstructorShrinkingWithRepackagingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingAfterConstructorShrinkingWithRepackagingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingAfterConstructorShrinkingWithRepackagingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingAfterConstructorShrinkingWithRepackagingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingAfterConstructorShrinkingWithRepackagingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithClInitOnCCTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithClInitOnCCTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithClInitOnCCTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithClInitOnCCTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithClInitOnCCTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithCompanionClassesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithCompanionClassesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithCompanionClassesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithCompanionClassesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithCompanionClassesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingOfInitArgumentTypesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingOfInitArgumentTypesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingOfInitArgumentTypesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingOfInitArgumentTypesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingOfInitArgumentTypesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingVirtualMethodMergingWithLibraryTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingVirtualMethodMergingWithLibraryTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingVirtualMethodMergingWithLibraryTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingVirtualMethodMergingWithLibraryTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingVirtualMethodMergingWithLibraryTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalMissingLookupTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalMissingLookupTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalMissingLookupTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalMissingLookupTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/HorizontalMissingLookupTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/IdenticalFieldMembersTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/IdenticalFieldMembersTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/IdenticalFieldMembersTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/IdenticalFieldMembersTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/IdenticalFieldMembersTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ImplicitClassInitializationSynchronizationTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ImplicitClassInitializationSynchronizationTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ImplicitClassInitializationSynchronizationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ImplicitClassInitializationSynchronizationTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ImplicitClassInitializationSynchronizationTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InaccessibleFieldTypeMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InaccessibleFieldTypeMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InaccessibleFieldTypeMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/InaccessibleFieldTypeMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InaccessibleFieldTypeMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InheritInterfaceWithDefaultTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritInterfaceWithDefaultTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InheritInterfaceWithDefaultTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/InheritInterfaceWithDefaultTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InheritInterfaceWithDefaultTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InheritOverrideInterfaceTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritOverrideInterfaceTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InheritOverrideInterfaceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/InheritOverrideInterfaceTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InheritOverrideInterfaceTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InheritsFromLibraryClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritsFromLibraryClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InheritsFromLibraryClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/InheritsFromLibraryClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InheritsFromLibraryClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InitClassToPackagePrivateFieldWithCrossPackageMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InitClassToPackagePrivateFieldWithCrossPackageMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InitClassToPackagePrivateFieldWithCrossPackageMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/InitClassToPackagePrivateFieldWithCrossPackageMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InitClassToPackagePrivateFieldWithCrossPackageMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InstanceFieldMergingWithPackagePrivateFieldTypeTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InstanceFieldMergingWithPackagePrivateFieldTypeTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InstanceFieldMergingWithPackagePrivateFieldTypeTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/InstanceFieldMergingWithPackagePrivateFieldTypeTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InstanceFieldMergingWithPackagePrivateFieldTypeTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InstantiatedAndUninstantiatedClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InstantiatedAndUninstantiatedClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InstantiatedAndUninstantiatedClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/InstantiatedAndUninstantiatedClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InstantiatedAndUninstantiatedClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/JavaLambdaMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/JavaLambdaMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/JavaLambdaMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/JavaLambdaMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/JavaLambdaMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/LargeConstructorsMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/LargeConstructorsMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/LargeConstructorsMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/LargeConstructorsMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/LargeConstructorsMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeFieldNameConflictTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeFieldNameConflictTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeFieldNameConflictTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergeFieldNameConflictTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeFieldNameConflictTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeMethodNameConflictTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeMethodNameConflictTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeMethodNameConflictTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergeMethodNameConflictTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeMethodNameConflictTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeNonFinalAndFinalClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeNonFinalAndFinalClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeNonFinalAndFinalClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergeNonFinalAndFinalClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeNonFinalAndFinalClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergePackagePrivateWithPublicClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergePackagePrivateWithPublicClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergePackagePrivateWithPublicClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergePackagePrivateWithPublicClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergePackagePrivateWithPublicClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeWithRepackageNameCollissionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeWithRepackageNameCollissionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeWithRepackageNameCollissionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergeWithRepackageNameCollissionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergeWithRepackageNameCollissionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedConstructorForwardingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorForwardingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedConstructorForwardingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorForwardingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedConstructorForwardingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedConstructorStackTraceTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorStackTraceTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedConstructorStackTraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorStackTraceTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedConstructorStackTraceTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStackTraceTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStackTraceTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStackTraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStackTraceTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStackTraceTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStaticizerTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStaticizerTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStaticizerTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStaticizerTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStaticizerTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergingProducesFieldCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergingProducesFieldCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergingProducesFieldCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergingProducesFieldCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergingProducesFieldCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergingWithSafeCheckCastTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergingWithSafeCheckCastTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergingWithSafeCheckCastTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MergingWithSafeCheckCastTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MergingWithSafeCheckCastTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MinimizeFieldCastsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MinimizeFieldCastsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MinimizeFieldCastsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/MinimizeFieldCastsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/MinimizeFieldCastsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NoAbstractClassesWithNonAbstractClassesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NoAbstractClassesWithNonAbstractClassesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NoAbstractClassesWithNonAbstractClassesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NoAbstractClassesWithNonAbstractClassesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NoAbstractClassesWithNonAbstractClassesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NoClassesOrMembersWithAnnotationsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NoClassesOrMembersWithAnnotationsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NoClassesOrMembersWithAnnotationsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NoClassesOrMembersWithAnnotationsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NoClassesOrMembersWithAnnotationsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NoHorizontalClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NoHorizontalClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NoHorizontalClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NoHorizontalClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NoHorizontalClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodNonTrivialMergeTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodNonTrivialMergeTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodNonTrivialMergeTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodNonTrivialMergeTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodNonTrivialMergeTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterAbstractClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterAbstractClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterAbstractClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterAbstractClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterAbstractClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessOnMergedClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessOnMergedClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessOnMergedClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessOnMergedClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessOnMergedClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonReboundFieldReferenceCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldReferenceCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonReboundFieldReferenceCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldReferenceCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonReboundFieldReferenceCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonTrivialClassInitializationAfterMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonTrivialClassInitializationAfterMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonTrivialClassInitializationAfterMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/NonTrivialClassInitializationAfterMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/NonTrivialClassInitializationAfterMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/OverlappingConstructorsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/OverlappingConstructorsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/OverlappingConstructorsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/OverlappingConstructorsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/OverlappingConstructorsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PackagePrivateMemberAccessTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMemberAccessTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PackagePrivateMemberAccessTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMemberAccessTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PackagePrivateMemberAccessTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PackagePrivateMembersAccessedTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMembersAccessedTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PackagePrivateMembersAccessedTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMembersAccessedTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PackagePrivateMembersAccessedTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PinnedClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PinnedClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PinnedClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexListTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexListTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexListTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexListTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexListTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexTracingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexTracingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexTracingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexTracingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexTracingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PrivateAndInterfaceMethodCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndInterfaceMethodCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PrivateAndInterfaceMethodCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndInterfaceMethodCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PrivateAndInterfaceMethodCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PrivateAndStaticMethodCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndStaticMethodCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PrivateAndStaticMethodCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndStaticMethodCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/PrivateAndStaticMethodCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ProtectApiSurfaceHorizontalClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ProtectApiSurfaceHorizontalClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ProtectApiSurfaceHorizontalClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ProtectApiSurfaceHorizontalClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ProtectApiSurfaceHorizontalClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/RelaxedInstanceFieldCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/RelaxedInstanceFieldCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/RelaxedInstanceFieldCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/RelaxedInstanceFieldCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/RelaxedInstanceFieldCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/RemapFieldTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/RemapFieldTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/RemapFieldTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/RemapFieldTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/RemapFieldTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/RemapMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/RemapMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/RemapMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/RemapMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/RemapMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ReserveInterfaceMethodSignaturesInFixupTest.java

diff --git a/src/test/java/com/android/tools/r8/horizontalclassmerging/ReserveInterfaceMethodSignaturesInFixupTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ReserveInterfaceMethodSignaturesInFixupTest.java
similarity index 97%
rename from src/test/java/com/android/tools/r8/horizontalclassmerging/ReserveInterfaceMethodSignaturesInFixupTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ReserveInterfaceMethodSignaturesInFixupTest.java
index 7a29a69..d2f6f90 100644
--- a/src/test/java/com/android/tools/r8/horizontalclassmerging/ReserveInterfaceMethodSignaturesInFixupTest.java
+++ b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ReserveInterfaceMethodSignaturesInFixupTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.horizontalclassmerging;
+package com.android.tools.r8.classmerging.horizontal;
 
 import com.android.tools.r8.NeverInline;
 import com.android.tools.r8.NoHorizontalClassMerging;

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/StaticAndInterfaceMethodCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndInterfaceMethodCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/StaticAndInterfaceMethodCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndInterfaceMethodCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/StaticAndInterfaceMethodCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/StaticAndVirtualMethodCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndVirtualMethodCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/StaticAndVirtualMethodCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndVirtualMethodCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/StaticAndVirtualMethodCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/StrictMethodMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/StrictMethodMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/StrictMethodMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/StrictMethodMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/StrictMethodMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SuperConstructorCallsVirtualMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SuperConstructorCallsVirtualMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SuperConstructorCallsVirtualMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/SuperConstructorCallsVirtualMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SuperConstructorCallsVirtualMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SynchronizedMethodMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedMethodMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SynchronizedMethodMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedMethodMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SynchronizedMethodMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SyntheticConstructorArgumentsMerged.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticConstructorArgumentsMerged.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SyntheticConstructorArgumentsMerged.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticConstructorArgumentsMerged.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SyntheticConstructorArgumentsMerged.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SyntheticLambdaWithMissingInterfaceMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticLambdaWithMissingInterfaceMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SyntheticLambdaWithMissingInterfaceMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticLambdaWithMissingInterfaceMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/SyntheticLambdaWithMissingInterfaceMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerConstructorCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerConstructorCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerConstructorCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerConstructorCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerConstructorCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/UndoConstructorInliningProfileFlagsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/UndoConstructorInliningProfileFlagsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/UndoConstructorInliningProfileFlagsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/UndoConstructorInliningProfileFlagsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/UndoConstructorInliningProfileFlagsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/UndoConstructorInliningWithSubclassesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/UndoConstructorInliningWithSubclassesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/UndoConstructorInliningWithSubclassesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/UndoConstructorInliningWithSubclassesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/UndoConstructorInliningWithSubclassesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/UnresolvableMethodWithClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/UnresolvableMethodWithClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/UnresolvableMethodWithClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/UnresolvableMethodWithClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/UnresolvableMethodWithClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticalMergingPreoptimizedTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticalMergingPreoptimizedTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticalMergingPreoptimizedTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/VerticalMergingPreoptimizedTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticalMergingPreoptimizedTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByCheckCastTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByCheckCastTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByCheckCastTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByCheckCastTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByCheckCastTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByInstanceOfTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByInstanceOfTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByInstanceOfTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByInstanceOfTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByInstanceOfTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfFinalAndNonFinalMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfFinalAndNonFinalMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfFinalAndNonFinalMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfFinalAndNonFinalMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfFinalAndNonFinalMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfPublicizedMethodsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfPublicizedMethodsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfPublicizedMethodsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfPublicizedMethodsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfPublicizedMethodsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingWithAbsentMethodAndSuperClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingWithAbsentMethodAndSuperClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingWithAbsentMethodAndSuperClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingWithAbsentMethodAndSuperClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingWithAbsentMethodAndSuperClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/NotOverlappingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/NotOverlappingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/NotOverlappingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/NotOverlappingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/NotOverlappingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideMergeAbsentTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideMergeAbsentTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideMergeAbsentTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideMergeAbsentTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideMergeAbsentTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideParentCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideParentCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideParentCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideParentCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideParentCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/SuperMethodMergedTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/SuperMethodMergedTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/SuperMethodMergedTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/SuperMethodMergedTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/dispatch/SuperMethodMergedTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleCrossGroupMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleCrossGroupMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleCrossGroupMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleCrossGroupMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleCrossGroupMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfaceChainMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfaceChainMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfaceChainMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfaceChainMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfaceChainMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalOverrideAfterInterfaceMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalOverrideAfterInterfaceMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalOverrideAfterInterfaceMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalOverrideAfterInterfaceMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalOverrideAfterInterfaceMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalSiblingAfterInterfaceMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalSiblingAfterInterfaceMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalSiblingAfterInterfaceMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalSiblingAfterInterfaceMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalSiblingAfterInterfaceMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/A.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/A.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/A.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/A.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/A.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/B.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/B.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/B.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/B.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/B.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/C.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/C.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/C.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/C.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/C.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/D.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/D.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/D.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/D.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/D.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/InaccessibleFieldTypeMergingTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/InaccessibleFieldTypeMergingTestClasses.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/InaccessibleFieldTypeMergingTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/InaccessibleFieldTypeMergingTestClasses.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/InaccessibleFieldTypeMergingTestClasses.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/InterfacesVisibilityTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/InterfacesVisibilityTestClasses.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/InterfacesVisibilityTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/InterfacesVisibilityTestClasses.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/InterfacesVisibilityTestClasses.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/PackagePrivateClass.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/PackagePrivateClass.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/PackagePrivateClass.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/PackagePrivateClass.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/PackagePrivateClass.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/PackagePrivateClassRunner.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/PackagePrivateClassRunner.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/PackagePrivateClassRunner.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/PackagePrivateClassRunner.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontal/testclasses/PackagePrivateClassRunner.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerShouldMergeSynchronizedMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerShouldMergeSynchronizedMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerShouldMergeSynchronizedMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerShouldMergeSynchronizedMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerShouldMergeSynchronizedMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerSynchronizedMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerSynchronizedMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerSynchronizedMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerSynchronizedMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerSynchronizedMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/AnnotationToNonAnnotationClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/AnnotationToNonAnnotationClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/AnnotationToNonAnnotationClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/AnnotationToNonAnnotationClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/AnnotationToNonAnnotationClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/B141942381.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/B141942381.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/B141942381.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/B141942381.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/B141942381.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ClassesHaveBeenMergedTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ClassesHaveBeenMergedTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ClassesHaveBeenMergedTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/ClassesHaveBeenMergedTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ClassesHaveBeenMergedTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ConflictWasDetectedTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ConflictWasDetectedTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ConflictWasDetectedTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/ConflictWasDetectedTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ConflictWasDetectedTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ExceptionTablesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ExceptionTablesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ExceptionTablesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/ExceptionTablesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ExceptionTablesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithMultiPackageAccessesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithMultiPackageAccessesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithMultiPackageAccessesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithMultiPackageAccessesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithMultiPackageAccessesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithRetargetedLibMemberTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithRetargetedLibMemberTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithRetargetedLibMemberTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithRetargetedLibMemberTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithRetargetedLibMemberTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ForceInliningWithStaticInterfaceMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ForceInliningWithStaticInterfaceMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ForceInliningWithStaticInterfaceMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/ForceInliningWithStaticInterfaceMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ForceInliningWithStaticInterfaceMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/IncorrectRewritingOfInvokeSuperTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/IncorrectRewritingOfInvokeSuperTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/IncorrectRewritingOfInvokeSuperTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/IncorrectRewritingOfInvokeSuperTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/IncorrectRewritingOfInvokeSuperTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InterfaceAccessibleAfterVerticalClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/InterfaceAccessibleAfterVerticalClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InterfaceAccessibleAfterVerticalClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/InterfaceAccessibleAfterVerticalClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InterfaceAccessibleAfterVerticalClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InterfaceWithGetProxyClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/InterfaceWithGetProxyClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InterfaceWithGetProxyClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/InterfaceWithGetProxyClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InterfaceWithGetProxyClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InterfaceWithNewProxyInstanceTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/InterfaceWithNewProxyInstanceTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InterfaceWithNewProxyInstanceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/InterfaceWithNewProxyInstanceTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InterfaceWithNewProxyInstanceTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InvokeStaticToInterfaceVerticalClassMergerTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/InvokeStaticToInterfaceVerticalClassMergerTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InvokeStaticToInterfaceVerticalClassMergerTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/InvokeStaticToInterfaceVerticalClassMergerTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/InvokeStaticToInterfaceVerticalClassMergerTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/LambdaRewritingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/LambdaRewritingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/LambdaRewritingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/LambdaRewritingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/LambdaRewritingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/MergeSynthesizingContextIntoSyntheticLambdaTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/MergeSynthesizingContextIntoSyntheticLambdaTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/MergeSynthesizingContextIntoSyntheticLambdaTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/MergeSynthesizingContextIntoSyntheticLambdaTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/MergeSynthesizingContextIntoSyntheticLambdaTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/MethodCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/MethodCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/MethodCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/MethodCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/MethodCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NestedDefaultInterfaceMethodsTestDump.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/NestedDefaultInterfaceMethodsTestDump.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NestedDefaultInterfaceMethodsTestDump.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/NestedDefaultInterfaceMethodsTestDump.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NestedDefaultInterfaceMethodsTestDump.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NoIllegalClassAccessWithAccessModificationsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/NoIllegalClassAccessWithAccessModificationsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NoIllegalClassAccessWithAccessModificationsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/NoIllegalClassAccessWithAccessModificationsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NoIllegalClassAccessWithAccessModificationsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ShadowedNonReboundFieldVerticalClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ShadowedNonReboundFieldVerticalClassMergingTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ShadowedNonReboundFieldVerticalClassMergingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/ShadowedNonReboundFieldVerticalClassMergingTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/ShadowedNonReboundFieldVerticalClassMergingTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/StaticInitializerTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/StaticInitializerTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/StaticInitializerTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/StaticInitializerTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/StaticInitializerTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/SyntheticBridgeSignaturesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/SyntheticBridgeSignaturesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/SyntheticBridgeSignaturesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/SyntheticBridgeSignaturesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/SyntheticBridgeSignaturesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerCollisionWithOverridesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerCollisionWithOverridesTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerCollisionWithOverridesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerCollisionWithOverridesTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerCollisionWithOverridesTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerDebugTestRunner.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerDebugTestRunner.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerDebugTestRunner.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerDebugTestRunner.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerDebugTestRunner.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerIndirectReflectiveNameTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerIndirectReflectiveNameTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerIndirectReflectiveNameTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerIndirectReflectiveNameTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerIndirectReflectiveNameTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInitTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInitTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInitTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInitTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInitTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInvokeInterfaceToVirtualInSuperClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInvokeInterfaceToVirtualInSuperClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInvokeInterfaceToVirtualInSuperClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInvokeInterfaceToVirtualInSuperClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInvokeInterfaceToVirtualInSuperClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInvokeVirtualToInterfaceTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInvokeVirtualToInterfaceTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInvokeVirtualToInterfaceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInvokeVirtualToInterfaceTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerInvokeVirtualToInterfaceTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerPinnedMethodCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerPinnedMethodCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerPinnedMethodCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerPinnedMethodCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerPinnedMethodCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerPinnedMethodInterfaceCollisionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerPinnedMethodInterfaceCollisionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerPinnedMethodInterfaceCollisionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerPinnedMethodInterfaceCollisionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerPinnedMethodInterfaceCollisionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerReflectiveNameTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerReflectiveNameTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerReflectiveNameTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerReflectiveNameTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerReflectiveNameTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerShouldMergeSynchronizedMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerShouldMergeSynchronizedMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerShouldMergeSynchronizedMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerShouldMergeSynchronizedMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerShouldMergeSynchronizedMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperCallInStaticTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperCallInStaticTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperCallInStaticTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperCallInStaticTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperCallInStaticTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperToLibraryTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperToLibraryTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperToLibraryTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperToLibraryTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperToLibraryTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockWithArraysTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockWithArraysTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockWithArraysTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockWithArraysTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockWithArraysTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedMethodTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedMethodTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedMethodTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTestBase.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTestBase.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTestBase.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTestBase.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTestBase.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerVirtualToLibraryTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerVirtualToLibraryTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerVirtualToLibraryTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerVirtualToLibraryTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergerVirtualToLibraryTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingInvokeSuperToNestMemberTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingInvokeSuperToNestMemberTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingInvokeSuperToNestMemberTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingInvokeSuperToNestMemberTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingInvokeSuperToNestMemberTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingNestHostIntoNestHostTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingNestHostIntoNestHostTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingNestHostIntoNestHostTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingNestHostIntoNestHostTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingNestHostIntoNestHostTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithGetNameTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithGetNameTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithGetNameTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithGetNameTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithGetNameTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingSuperClassTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingSuperClassTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingSuperClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingSuperClassTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingSuperClassTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsSubstitutionTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsSubstitutionTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsSubstitutionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsSubstitutionTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsSubstitutionTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/ForceInlineConstructorWithMultiPackageAccessesTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/ForceInlineConstructorWithMultiPackageAccessesTestClasses.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/ForceInlineConstructorWithMultiPackageAccessesTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/ForceInlineConstructorWithMultiPackageAccessesTestClasses.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/ForceInlineConstructorWithMultiPackageAccessesTestClasses.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/InterfaceAccessibleAfterVerticalClassMergingTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/InterfaceAccessibleAfterVerticalClassMergingTestClasses.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/InterfaceAccessibleAfterVerticalClassMergingTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/InterfaceAccessibleAfterVerticalClassMergingTestClasses.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/InterfaceAccessibleAfterVerticalClassMergingTestClasses.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/NoIllegalClassAccessWithAccessModificationsTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NoIllegalClassAccessWithAccessModificationsTestClasses.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/NoIllegalClassAccessWithAccessModificationsTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NoIllegalClassAccessWithAccessModificationsTestClasses.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/NoIllegalClassAccessWithAccessModificationsTestClasses.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java

src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/VerticalClassMergingWithNonVisibleAnnotationTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/VerticalClassMergingWithNonVisibleAnnotationTestClasses.java b/src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/VerticalClassMergingWithNonVisibleAnnotationTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/VerticalClassMergingWithNonVisibleAnnotationTestClasses.java
rename to src/test/java8/classmerging/com/android/tools/r8/classmerging/vertical/testclasses/VerticalClassMergingWithNonVisibleAnnotationTestClasses.java