diff --git a/integration-tests/src/test/scala/chiselTest/LFSRSpec.scala b/integration-tests/src/test/scala-2/chiselTest/LFSRSpec.scala
similarity index 100%
rename from integration-tests/src/test/scala/chiselTest/LFSRSpec.scala
rename to integration-tests/src/test/scala-2/chiselTest/LFSRSpec.scala
diff --git a/integration-tests/src/test/scala/chiselTest/MixedVecIntegrationSpec.scala b/integration-tests/src/test/scala-2/chiselTest/MixedVecIntegrationSpec.scala
similarity index 100%
rename from integration-tests/src/test/scala/chiselTest/MixedVecIntegrationSpec.scala
rename to integration-tests/src/test/scala-2/chiselTest/MixedVecIntegrationSpec.scala
diff --git a/integration-tests/src/test/scala/chiselTest/QueueFlushSpec.scala b/integration-tests/src/test/scala-2/chiselTest/QueueFlushSpec.scala
similarity index 100%
rename from integration-tests/src/test/scala/chiselTest/QueueFlushSpec.scala
rename to integration-tests/src/test/scala-2/chiselTest/QueueFlushSpec.scala
diff --git a/integration-tests/src/test/scala/chiselTest/QueueSpec.scala b/integration-tests/src/test/scala-2/chiselTest/QueueSpec.scala
similarity index 100%
rename from integration-tests/src/test/scala/chiselTest/QueueSpec.scala
rename to integration-tests/src/test/scala-2/chiselTest/QueueSpec.scala
diff --git a/integration-tests/src/test/scala/chiselTest/ShiftRegisterMemSpec.scala b/integration-tests/src/test/scala-2/chiselTest/ShiftRegisterMemSpec.scala
similarity index 100%
rename from integration-tests/src/test/scala/chiselTest/ShiftRegisterMemSpec.scala
rename to integration-tests/src/test/scala-2/chiselTest/ShiftRegisterMemSpec.scala
diff --git a/integration-tests/src/test/scala/chiselTest/VecIntegrationSpec.scala b/integration-tests/src/test/scala-2/chiselTest/VecIntegrationSpec.scala
similarity index 100%
rename from integration-tests/src/test/scala/chiselTest/VecIntegrationSpec.scala
rename to integration-tests/src/test/scala-2/chiselTest/VecIntegrationSpec.scala
diff --git a/integration-tests/src/test/scala/chiselTest/util/SparseVecSpec.scala b/integration-tests/src/test/scala-2/chiselTest/util/SparseVecSpec.scala
similarity index 100%
rename from integration-tests/src/test/scala/chiselTest/util/SparseVecSpec.scala
rename to integration-tests/src/test/scala-2/chiselTest/util/SparseVecSpec.scala
diff --git a/integration-tests/src/test/scala/chiselTest/util/experimental/PlaSpec.scala b/integration-tests/src/test/scala-2/chiselTest/util/experimental/PlaSpec.scala
similarity index 100%
rename from integration-tests/src/test/scala/chiselTest/util/experimental/PlaSpec.scala
rename to integration-tests/src/test/scala-2/chiselTest/util/experimental/PlaSpec.scala
diff --git a/integration-tests/src/test/scala/chiselTest/util/experimental/TapSpec.scala b/integration-tests/src/test/scala-2/chiselTest/util/experimental/TapSpec.scala
similarity index 100%
rename from integration-tests/src/test/scala/chiselTest/util/experimental/TapSpec.scala
rename to integration-tests/src/test/scala-2/chiselTest/util/experimental/TapSpec.scala
diff --git a/src/test/scala/chisel3/TypeEquivalenceSpec.scala b/src/test/scala-2/chisel3/TypeEquivalenceSpec.scala
similarity index 100%
rename from src/test/scala/chisel3/TypeEquivalenceSpec.scala
rename to src/test/scala-2/chisel3/TypeEquivalenceSpec.scala
diff --git a/src/test/scala/chisel3/experimental/dataview/ReifySpec.scala b/src/test/scala-2/chisel3/experimental/dataview/ReifySpec.scala
similarity index 100%
rename from src/test/scala/chisel3/experimental/dataview/ReifySpec.scala
rename to src/test/scala-2/chisel3/experimental/dataview/ReifySpec.scala
diff --git a/src/test/scala/chisel3/internal/IdentifierSpec.scala b/src/test/scala-2/chisel3/internal/IdentifierSpec.scala
similarity index 100%
rename from src/test/scala/chisel3/internal/IdentifierSpec.scala
rename to src/test/scala-2/chisel3/internal/IdentifierSpec.scala
diff --git a/src/test/scala/chisel3/internal/NameCollisionSpec.scala b/src/test/scala-2/chisel3/internal/NameCollisionSpec.scala
similarity index 100%
rename from src/test/scala/chisel3/internal/NameCollisionSpec.scala
rename to src/test/scala-2/chisel3/internal/NameCollisionSpec.scala
diff --git a/src/test/scala/chisel3/internal/NamespaceSpec.scala b/src/test/scala-2/chisel3/internal/NamespaceSpec.scala
similarity index 100%
rename from src/test/scala/chisel3/internal/NamespaceSpec.scala
rename to src/test/scala-2/chisel3/internal/NamespaceSpec.scala
diff --git a/src/test/scala/chisel3/stage/ChiselOptionsViewSpec.scala b/src/test/scala-2/chisel3/stage/ChiselOptionsViewSpec.scala
similarity index 100%
rename from src/test/scala/chisel3/stage/ChiselOptionsViewSpec.scala
rename to src/test/scala-2/chisel3/stage/ChiselOptionsViewSpec.scala
diff --git a/src/test/scala/chisel3/testers/TestUtils.scala b/src/test/scala-2/chisel3/testers/TestUtils.scala
similarity index 100%
rename from src/test/scala/chisel3/testers/TestUtils.scala
rename to src/test/scala-2/chisel3/testers/TestUtils.scala
diff --git a/src/test/scala/chisel3/util/BitPatSpec.scala b/src/test/scala-2/chisel3/util/BitPatSpec.scala
similarity index 100%
rename from src/test/scala/chisel3/util/BitPatSpec.scala
rename to src/test/scala-2/chisel3/util/BitPatSpec.scala
diff --git a/src/test/scala/chisel3/util/experimental/decode/TruthTableSpec.scala b/src/test/scala-2/chisel3/util/experimental/decode/TruthTableSpec.scala
similarity index 100%
rename from src/test/scala/chisel3/util/experimental/decode/TruthTableSpec.scala
rename to src/test/scala-2/chisel3/util/experimental/decode/TruthTableSpec.scala
diff --git a/src/test/scala/chiselTests/AdderTree.scala b/src/test/scala-2/chiselTests/AdderTree.scala
similarity index 100%
rename from src/test/scala/chiselTests/AdderTree.scala
rename to src/test/scala-2/chiselTests/AdderTree.scala
diff --git a/src/test/scala/chiselTests/AnalogIntegrationSpec.scala b/src/test/scala-2/chiselTests/AnalogIntegrationSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/AnalogIntegrationSpec.scala
rename to src/test/scala-2/chiselTests/AnalogIntegrationSpec.scala
diff --git a/src/test/scala/chiselTests/AnalogSpec.scala b/src/test/scala-2/chiselTests/AnalogSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/AnalogSpec.scala
rename to src/test/scala-2/chiselTests/AnalogSpec.scala
diff --git a/src/test/scala/chiselTests/AnnotatingDiamondSpec.scala b/src/test/scala-2/chiselTests/AnnotatingDiamondSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/AnnotatingDiamondSpec.scala
rename to src/test/scala-2/chiselTests/AnnotatingDiamondSpec.scala
diff --git a/src/test/scala/chiselTests/AnnotationNoDedup.scala b/src/test/scala-2/chiselTests/AnnotationNoDedup.scala
similarity index 100%
rename from src/test/scala/chiselTests/AnnotationNoDedup.scala
rename to src/test/scala-2/chiselTests/AnnotationNoDedup.scala
diff --git a/src/test/scala/chiselTests/AsTypeOfTester.scala b/src/test/scala-2/chiselTests/AsTypeOfTester.scala
similarity index 100%
rename from src/test/scala/chiselTests/AsTypeOfTester.scala
rename to src/test/scala-2/chiselTests/AsTypeOfTester.scala
diff --git a/src/test/scala/chiselTests/Assert.scala b/src/test/scala-2/chiselTests/Assert.scala
similarity index 100%
rename from src/test/scala/chiselTests/Assert.scala
rename to src/test/scala-2/chiselTests/Assert.scala
diff --git a/src/test/scala/chiselTests/AsyncResetSpec.scala b/src/test/scala-2/chiselTests/AsyncResetSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/AsyncResetSpec.scala
rename to src/test/scala-2/chiselTests/AsyncResetSpec.scala
diff --git a/src/test/scala/chiselTests/AutoClonetypeSpec.scala b/src/test/scala-2/chiselTests/AutoClonetypeSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/AutoClonetypeSpec.scala
rename to src/test/scala-2/chiselTests/AutoClonetypeSpec.scala
diff --git a/src/test/scala/chiselTests/AutoNestedCloneSpec.scala b/src/test/scala-2/chiselTests/AutoNestedCloneSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/AutoNestedCloneSpec.scala
rename to src/test/scala-2/chiselTests/AutoNestedCloneSpec.scala
diff --git a/src/test/scala/chiselTests/BetterNamingTests.scala b/src/test/scala-2/chiselTests/BetterNamingTests.scala
similarity index 100%
rename from src/test/scala/chiselTests/BetterNamingTests.scala
rename to src/test/scala-2/chiselTests/BetterNamingTests.scala
diff --git a/src/test/scala/chiselTests/BitwiseOps.scala b/src/test/scala-2/chiselTests/BitwiseOps.scala
similarity index 100%
rename from src/test/scala/chiselTests/BitwiseOps.scala
rename to src/test/scala-2/chiselTests/BitwiseOps.scala
diff --git a/src/test/scala/chiselTests/BlackBox.scala b/src/test/scala-2/chiselTests/BlackBox.scala
similarity index 100%
rename from src/test/scala/chiselTests/BlackBox.scala
rename to src/test/scala-2/chiselTests/BlackBox.scala
diff --git a/src/test/scala/chiselTests/BlackBoxImpl.scala b/src/test/scala-2/chiselTests/BlackBoxImpl.scala
similarity index 100%
rename from src/test/scala/chiselTests/BlackBoxImpl.scala
rename to src/test/scala-2/chiselTests/BlackBoxImpl.scala
diff --git a/src/test/scala/chiselTests/BoringUtilsSpec.scala b/src/test/scala-2/chiselTests/BoringUtilsSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/BoringUtilsSpec.scala
rename to src/test/scala-2/chiselTests/BoringUtilsSpec.scala
diff --git a/src/test/scala/chiselTests/BoringUtilsTapSpec.scala b/src/test/scala-2/chiselTests/BoringUtilsTapSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/BoringUtilsTapSpec.scala
rename to src/test/scala-2/chiselTests/BoringUtilsTapSpec.scala
diff --git a/src/test/scala/chiselTests/BulkConnectSpec.scala b/src/test/scala-2/chiselTests/BulkConnectSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/BulkConnectSpec.scala
rename to src/test/scala-2/chiselTests/BulkConnectSpec.scala
diff --git a/src/test/scala/chiselTests/BundleElementsSpec.scala b/src/test/scala-2/chiselTests/BundleElementsSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/BundleElementsSpec.scala
rename to src/test/scala-2/chiselTests/BundleElementsSpec.scala
diff --git a/src/test/scala/chiselTests/BundleLiteralSpec.scala b/src/test/scala-2/chiselTests/BundleLiteralSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/BundleLiteralSpec.scala
rename to src/test/scala-2/chiselTests/BundleLiteralSpec.scala
diff --git a/src/test/scala/chiselTests/BundleSpec.scala b/src/test/scala-2/chiselTests/BundleSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/BundleSpec.scala
rename to src/test/scala-2/chiselTests/BundleSpec.scala
diff --git a/src/test/scala/chiselTests/BundleWire.scala b/src/test/scala-2/chiselTests/BundleWire.scala
similarity index 100%
rename from src/test/scala/chiselTests/BundleWire.scala
rename to src/test/scala-2/chiselTests/BundleWire.scala
diff --git a/src/test/scala/chiselTests/ChiselEnum.scala b/src/test/scala-2/chiselTests/ChiselEnum.scala
similarity index 100%
rename from src/test/scala/chiselTests/ChiselEnum.scala
rename to src/test/scala-2/chiselTests/ChiselEnum.scala
diff --git a/src/test/scala/chiselTests/ChiselSpec.scala b/src/test/scala-2/chiselTests/ChiselSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ChiselSpec.scala
rename to src/test/scala-2/chiselTests/ChiselSpec.scala
diff --git a/src/test/scala/chiselTests/ChiselTestUtilitiesSpec.scala b/src/test/scala-2/chiselTests/ChiselTestUtilitiesSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ChiselTestUtilitiesSpec.scala
rename to src/test/scala-2/chiselTests/ChiselTestUtilitiesSpec.scala
diff --git a/src/test/scala/chiselTests/ClockSpec.scala b/src/test/scala-2/chiselTests/ClockSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ClockSpec.scala
rename to src/test/scala-2/chiselTests/ClockSpec.scala
diff --git a/src/test/scala/chiselTests/CloneModuleSpec.scala b/src/test/scala-2/chiselTests/CloneModuleSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/CloneModuleSpec.scala
rename to src/test/scala-2/chiselTests/CloneModuleSpec.scala
diff --git a/src/test/scala/chiselTests/ComplexAssign.scala b/src/test/scala-2/chiselTests/ComplexAssign.scala
similarity index 100%
rename from src/test/scala/chiselTests/ComplexAssign.scala
rename to src/test/scala-2/chiselTests/ComplexAssign.scala
diff --git a/src/test/scala/chiselTests/ConnectSpec.scala b/src/test/scala-2/chiselTests/ConnectSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ConnectSpec.scala
rename to src/test/scala-2/chiselTests/ConnectSpec.scala
diff --git a/src/test/scala/chiselTests/ConnectableSpec.scala b/src/test/scala-2/chiselTests/ConnectableSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ConnectableSpec.scala
rename to src/test/scala-2/chiselTests/ConnectableSpec.scala
diff --git a/src/test/scala/chiselTests/ConstSpec.scala b/src/test/scala-2/chiselTests/ConstSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ConstSpec.scala
rename to src/test/scala-2/chiselTests/ConstSpec.scala
diff --git a/src/test/scala/chiselTests/Counter.scala b/src/test/scala-2/chiselTests/Counter.scala
similarity index 100%
rename from src/test/scala/chiselTests/Counter.scala
rename to src/test/scala-2/chiselTests/Counter.scala
diff --git a/src/test/scala/chiselTests/CustomBundle.scala b/src/test/scala-2/chiselTests/CustomBundle.scala
similarity index 100%
rename from src/test/scala/chiselTests/CustomBundle.scala
rename to src/test/scala-2/chiselTests/CustomBundle.scala
diff --git a/src/test/scala/chiselTests/DPISpec.scala b/src/test/scala-2/chiselTests/DPISpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/DPISpec.scala
rename to src/test/scala-2/chiselTests/DPISpec.scala
diff --git a/src/test/scala/chiselTests/DataEqualitySpec.scala b/src/test/scala-2/chiselTests/DataEqualitySpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/DataEqualitySpec.scala
rename to src/test/scala-2/chiselTests/DataEqualitySpec.scala
diff --git a/src/test/scala/chiselTests/DataPrint.scala b/src/test/scala-2/chiselTests/DataPrint.scala
similarity index 100%
rename from src/test/scala/chiselTests/DataPrint.scala
rename to src/test/scala-2/chiselTests/DataPrint.scala
diff --git a/src/test/scala/chiselTests/Decoder.scala b/src/test/scala-2/chiselTests/Decoder.scala
similarity index 100%
rename from src/test/scala/chiselTests/Decoder.scala
rename to src/test/scala-2/chiselTests/Decoder.scala
diff --git a/src/test/scala/chiselTests/DecoupledSpec.scala b/src/test/scala-2/chiselTests/DecoupledSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/DecoupledSpec.scala
rename to src/test/scala-2/chiselTests/DecoupledSpec.scala
diff --git a/src/test/scala/chiselTests/DedupSpec.scala b/src/test/scala-2/chiselTests/DedupSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/DedupSpec.scala
rename to src/test/scala-2/chiselTests/DedupSpec.scala
diff --git a/src/test/scala/chiselTests/Direction.scala b/src/test/scala-2/chiselTests/Direction.scala
similarity index 100%
rename from src/test/scala/chiselTests/Direction.scala
rename to src/test/scala-2/chiselTests/Direction.scala
diff --git a/src/test/scala/chiselTests/DisableSpec.scala b/src/test/scala-2/chiselTests/DisableSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/DisableSpec.scala
rename to src/test/scala-2/chiselTests/DisableSpec.scala
diff --git a/src/test/scala/chiselTests/DontTouchSpec.scala b/src/test/scala-2/chiselTests/DontTouchSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/DontTouchSpec.scala
rename to src/test/scala-2/chiselTests/DontTouchSpec.scala
diff --git a/src/test/scala/chiselTests/EnableShiftRegister.scala b/src/test/scala-2/chiselTests/EnableShiftRegister.scala
similarity index 100%
rename from src/test/scala/chiselTests/EnableShiftRegister.scala
rename to src/test/scala-2/chiselTests/EnableShiftRegister.scala
diff --git a/src/test/scala/chiselTests/EnumSpec.scala b/src/test/scala-2/chiselTests/EnumSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/EnumSpec.scala
rename to src/test/scala-2/chiselTests/EnumSpec.scala
diff --git a/src/test/scala/chiselTests/ExtModule.scala b/src/test/scala-2/chiselTests/ExtModule.scala
similarity index 100%
rename from src/test/scala/chiselTests/ExtModule.scala
rename to src/test/scala-2/chiselTests/ExtModule.scala
diff --git a/src/test/scala/chiselTests/ExtModuleImpl.scala b/src/test/scala-2/chiselTests/ExtModuleImpl.scala
similarity index 100%
rename from src/test/scala/chiselTests/ExtModuleImpl.scala
rename to src/test/scala-2/chiselTests/ExtModuleImpl.scala
diff --git a/src/test/scala/chiselTests/FixedIOModuleSpec.scala b/src/test/scala-2/chiselTests/FixedIOModuleSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/FixedIOModuleSpec.scala
rename to src/test/scala-2/chiselTests/FixedIOModuleSpec.scala
diff --git a/src/test/scala/chiselTests/GCD.scala b/src/test/scala-2/chiselTests/GCD.scala
similarity index 100%
rename from src/test/scala/chiselTests/GCD.scala
rename to src/test/scala-2/chiselTests/GCD.scala
diff --git a/src/test/scala/chiselTests/Harness.scala b/src/test/scala-2/chiselTests/Harness.scala
similarity index 100%
rename from src/test/scala/chiselTests/Harness.scala
rename to src/test/scala-2/chiselTests/Harness.scala
diff --git a/src/test/scala/chiselTests/IOCompatibility.scala b/src/test/scala-2/chiselTests/IOCompatibility.scala
similarity index 100%
rename from src/test/scala/chiselTests/IOCompatibility.scala
rename to src/test/scala-2/chiselTests/IOCompatibility.scala
diff --git a/src/test/scala/chiselTests/IllegalRefSpec.scala b/src/test/scala-2/chiselTests/IllegalRefSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/IllegalRefSpec.scala
rename to src/test/scala-2/chiselTests/IllegalRefSpec.scala
diff --git a/src/test/scala/chiselTests/ImplicitConversionsSpec.scala b/src/test/scala-2/chiselTests/ImplicitConversionsSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ImplicitConversionsSpec.scala
rename to src/test/scala-2/chiselTests/ImplicitConversionsSpec.scala
diff --git a/src/test/scala/chiselTests/InlineSpec.scala b/src/test/scala-2/chiselTests/InlineSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/InlineSpec.scala
rename to src/test/scala-2/chiselTests/InlineSpec.scala
diff --git a/src/test/scala/chiselTests/InstanceNameSpec.scala b/src/test/scala-2/chiselTests/InstanceNameSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/InstanceNameSpec.scala
rename to src/test/scala-2/chiselTests/InstanceNameSpec.scala
diff --git a/src/test/scala/chiselTests/IntegerMathSpec.scala b/src/test/scala-2/chiselTests/IntegerMathSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/IntegerMathSpec.scala
rename to src/test/scala-2/chiselTests/IntegerMathSpec.scala
diff --git a/src/test/scala/chiselTests/IntrinsicModule.scala b/src/test/scala-2/chiselTests/IntrinsicModule.scala
similarity index 100%
rename from src/test/scala/chiselTests/IntrinsicModule.scala
rename to src/test/scala-2/chiselTests/IntrinsicModule.scala
diff --git a/src/test/scala/chiselTests/IntrinsicSpec.scala b/src/test/scala-2/chiselTests/IntrinsicSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/IntrinsicSpec.scala
rename to src/test/scala-2/chiselTests/IntrinsicSpec.scala
diff --git a/src/test/scala/chiselTests/InvalidateAPISpec.scala b/src/test/scala-2/chiselTests/InvalidateAPISpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/InvalidateAPISpec.scala
rename to src/test/scala-2/chiselTests/InvalidateAPISpec.scala
diff --git a/src/test/scala/chiselTests/LTLSpec.scala b/src/test/scala-2/chiselTests/LTLSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/LTLSpec.scala
rename to src/test/scala-2/chiselTests/LTLSpec.scala
diff --git a/src/test/scala/chiselTests/LayerSpec.scala b/src/test/scala-2/chiselTests/LayerSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/LayerSpec.scala
rename to src/test/scala-2/chiselTests/LayerSpec.scala
diff --git a/src/test/scala/chiselTests/LazyCloneSpec.scala b/src/test/scala-2/chiselTests/LazyCloneSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/LazyCloneSpec.scala
rename to src/test/scala-2/chiselTests/LazyCloneSpec.scala
diff --git a/src/test/scala/chiselTests/LiteralExtractorSpec.scala b/src/test/scala-2/chiselTests/LiteralExtractorSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/LiteralExtractorSpec.scala
rename to src/test/scala-2/chiselTests/LiteralExtractorSpec.scala
diff --git a/src/test/scala/chiselTests/LiteralToTargetSpec.scala b/src/test/scala-2/chiselTests/LiteralToTargetSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/LiteralToTargetSpec.scala
rename to src/test/scala-2/chiselTests/LiteralToTargetSpec.scala
diff --git a/src/test/scala/chiselTests/LoadMemoryFromFileSpec.scala b/src/test/scala-2/chiselTests/LoadMemoryFromFileSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/LoadMemoryFromFileSpec.scala
rename to src/test/scala-2/chiselTests/LoadMemoryFromFileSpec.scala
diff --git a/src/test/scala/chiselTests/Math.scala b/src/test/scala-2/chiselTests/Math.scala
similarity index 100%
rename from src/test/scala/chiselTests/Math.scala
rename to src/test/scala-2/chiselTests/Math.scala
diff --git a/src/test/scala/chiselTests/Mem.scala b/src/test/scala-2/chiselTests/Mem.scala
similarity index 100%
rename from src/test/scala/chiselTests/Mem.scala
rename to src/test/scala-2/chiselTests/Mem.scala
diff --git a/src/test/scala/chiselTests/MemorySearch.scala b/src/test/scala-2/chiselTests/MemorySearch.scala
similarity index 100%
rename from src/test/scala/chiselTests/MemorySearch.scala
rename to src/test/scala-2/chiselTests/MemorySearch.scala
diff --git a/src/test/scala/chiselTests/MixedVecSpec.scala b/src/test/scala-2/chiselTests/MixedVecSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/MixedVecSpec.scala
rename to src/test/scala-2/chiselTests/MixedVecSpec.scala
diff --git a/src/test/scala/chiselTests/ModuleChoiceSpec.scala b/src/test/scala-2/chiselTests/ModuleChoiceSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ModuleChoiceSpec.scala
rename to src/test/scala-2/chiselTests/ModuleChoiceSpec.scala
diff --git a/src/test/scala/chiselTests/ModulePrefixSpec.scala b/src/test/scala-2/chiselTests/ModulePrefixSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ModulePrefixSpec.scala
rename to src/test/scala-2/chiselTests/ModulePrefixSpec.scala
diff --git a/src/test/scala/chiselTests/ModuleSpec.scala b/src/test/scala-2/chiselTests/ModuleSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ModuleSpec.scala
rename to src/test/scala-2/chiselTests/ModuleSpec.scala
diff --git a/src/test/scala/chiselTests/MulLookup.scala b/src/test/scala-2/chiselTests/MulLookup.scala
similarity index 100%
rename from src/test/scala/chiselTests/MulLookup.scala
rename to src/test/scala-2/chiselTests/MulLookup.scala
diff --git a/src/test/scala/chiselTests/MultiAssign.scala b/src/test/scala-2/chiselTests/MultiAssign.scala
similarity index 100%
rename from src/test/scala/chiselTests/MultiAssign.scala
rename to src/test/scala-2/chiselTests/MultiAssign.scala
diff --git a/src/test/scala/chiselTests/MultiClockSpec.scala b/src/test/scala-2/chiselTests/MultiClockSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/MultiClockSpec.scala
rename to src/test/scala-2/chiselTests/MultiClockSpec.scala
diff --git a/src/test/scala/chiselTests/MuxSpec.scala b/src/test/scala-2/chiselTests/MuxSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/MuxSpec.scala
rename to src/test/scala-2/chiselTests/MuxSpec.scala
diff --git a/src/test/scala/chiselTests/NamedModuleTester.scala b/src/test/scala-2/chiselTests/NamedModuleTester.scala
similarity index 100%
rename from src/test/scala/chiselTests/NamedModuleTester.scala
rename to src/test/scala-2/chiselTests/NamedModuleTester.scala
diff --git a/src/test/scala/chiselTests/NewAnnotationsSpec.scala b/src/test/scala-2/chiselTests/NewAnnotationsSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/NewAnnotationsSpec.scala
rename to src/test/scala-2/chiselTests/NewAnnotationsSpec.scala
diff --git a/src/test/scala/chiselTests/OneHotMuxSpec.scala b/src/test/scala-2/chiselTests/OneHotMuxSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/OneHotMuxSpec.scala
rename to src/test/scala-2/chiselTests/OneHotMuxSpec.scala
diff --git a/src/test/scala/chiselTests/OptionBundle.scala b/src/test/scala-2/chiselTests/OptionBundle.scala
similarity index 100%
rename from src/test/scala/chiselTests/OptionBundle.scala
rename to src/test/scala-2/chiselTests/OptionBundle.scala
diff --git a/src/test/scala/chiselTests/Padding.scala b/src/test/scala-2/chiselTests/Padding.scala
similarity index 100%
rename from src/test/scala/chiselTests/Padding.scala
rename to src/test/scala-2/chiselTests/Padding.scala
diff --git a/src/test/scala/chiselTests/ParameterizedModule.scala b/src/test/scala-2/chiselTests/ParameterizedModule.scala
similarity index 100%
rename from src/test/scala/chiselTests/ParameterizedModule.scala
rename to src/test/scala-2/chiselTests/ParameterizedModule.scala
diff --git a/src/test/scala/chiselTests/PopCount.scala b/src/test/scala-2/chiselTests/PopCount.scala
similarity index 100%
rename from src/test/scala/chiselTests/PopCount.scala
rename to src/test/scala-2/chiselTests/PopCount.scala
diff --git a/src/test/scala/chiselTests/PortSpec.scala b/src/test/scala-2/chiselTests/PortSpec.scala
similarity index 91%
rename from src/test/scala/chiselTests/PortSpec.scala
rename to src/test/scala-2/chiselTests/PortSpec.scala
index 89d9c2f1324..f4d25ed50ff 100644
--- a/src/test/scala/chiselTests/PortSpec.scala
+++ b/src/test/scala-2/chiselTests/PortSpec.scala
@@ -23,8 +23,8 @@ class PortSpec extends ChiselFreeSpec {
     chirrtl should include("input reset : UInt<1>")
     // other ports get source locators
     chirrtl should include(
-      "output in : { flip foo : UInt<1>, flip bar : UInt<8>} @[src/test/scala/chiselTests/PortSpec.scala"
+      "output in : { flip foo : UInt<1>, flip bar : UInt<8>} @[src/test/scala-2/chiselTests/PortSpec.scala"
     )
-    chirrtl should include("output out : UInt<1> @[src/test/scala/chiselTests/PortSpec.scala")
+    chirrtl should include("output out : UInt<1> @[src/test/scala-2/chiselTests/PortSpec.scala")
   }
 }
diff --git a/src/test/scala/chiselTests/PrintableSpec.scala b/src/test/scala-2/chiselTests/PrintableSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/PrintableSpec.scala
rename to src/test/scala-2/chiselTests/PrintableSpec.scala
diff --git a/src/test/scala/chiselTests/Printf.scala b/src/test/scala-2/chiselTests/Printf.scala
similarity index 100%
rename from src/test/scala/chiselTests/Printf.scala
rename to src/test/scala-2/chiselTests/Printf.scala
diff --git a/src/test/scala/chiselTests/ProbeSpec.scala b/src/test/scala-2/chiselTests/ProbeSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ProbeSpec.scala
rename to src/test/scala-2/chiselTests/ProbeSpec.scala
diff --git a/src/test/scala/chiselTests/PublicModuleSpec.scala b/src/test/scala-2/chiselTests/PublicModuleSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/PublicModuleSpec.scala
rename to src/test/scala-2/chiselTests/PublicModuleSpec.scala
diff --git a/src/test/scala/chiselTests/RawModuleSpec.scala b/src/test/scala-2/chiselTests/RawModuleSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/RawModuleSpec.scala
rename to src/test/scala-2/chiselTests/RawModuleSpec.scala
diff --git a/src/test/scala/chiselTests/ReadOnlySpec.scala b/src/test/scala-2/chiselTests/ReadOnlySpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ReadOnlySpec.scala
rename to src/test/scala-2/chiselTests/ReadOnlySpec.scala
diff --git a/src/test/scala/chiselTests/RebindingSpec.scala b/src/test/scala-2/chiselTests/RebindingSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/RebindingSpec.scala
rename to src/test/scala-2/chiselTests/RebindingSpec.scala
diff --git a/src/test/scala/chiselTests/RecordSpec.scala b/src/test/scala-2/chiselTests/RecordSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/RecordSpec.scala
rename to src/test/scala-2/chiselTests/RecordSpec.scala
diff --git a/src/test/scala/chiselTests/ReduceTreeSpec.scala b/src/test/scala-2/chiselTests/ReduceTreeSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ReduceTreeSpec.scala
rename to src/test/scala-2/chiselTests/ReduceTreeSpec.scala
diff --git a/src/test/scala/chiselTests/Reg.scala b/src/test/scala-2/chiselTests/Reg.scala
similarity index 100%
rename from src/test/scala/chiselTests/Reg.scala
rename to src/test/scala-2/chiselTests/Reg.scala
diff --git a/src/test/scala/chiselTests/ResetSpec.scala b/src/test/scala-2/chiselTests/ResetSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ResetSpec.scala
rename to src/test/scala-2/chiselTests/ResetSpec.scala
diff --git a/src/test/scala/chiselTests/Risc.scala b/src/test/scala-2/chiselTests/Risc.scala
similarity index 100%
rename from src/test/scala/chiselTests/Risc.scala
rename to src/test/scala-2/chiselTests/Risc.scala
diff --git a/src/test/scala/chiselTests/SIntOps.scala b/src/test/scala-2/chiselTests/SIntOps.scala
similarity index 100%
rename from src/test/scala/chiselTests/SIntOps.scala
rename to src/test/scala-2/chiselTests/SIntOps.scala
diff --git a/src/test/scala/chiselTests/SourceLocatorSpec.scala b/src/test/scala-2/chiselTests/SourceLocatorSpec.scala
similarity index 96%
rename from src/test/scala/chiselTests/SourceLocatorSpec.scala
rename to src/test/scala-2/chiselTests/SourceLocatorSpec.scala
index 0370f9a7437..41d2b6d472c 100644
--- a/src/test/scala/chiselTests/SourceLocatorSpec.scala
+++ b/src/test/scala-2/chiselTests/SourceLocatorSpec.scala
@@ -9,7 +9,7 @@ import chisel3.experimental.hierarchy.Definition
 import firrtl.ir.FileInfo
 
 object SourceLocatorSpec {
-  val thisFile = "src/test/scala/chiselTests/SourceLocatorSpec.scala"
+  val thisFile = "src/test/scala-2/chiselTests/SourceLocatorSpec.scala"
 
   class RawModuleChild extends RawModule
   class ModuleChild extends Module
@@ -46,7 +46,7 @@ class SourceLocatorSpec extends ChiselFunSpec with Utils {
         val w = WireInit(UInt(1.W), 0.U)
       }
       val chirrtl = circt.stage.ChiselStage.emitCHIRRTL(new Top)
-      chirrtl should include("@[src/test/scala/chiselTests/SourceLocatorSpec.scala")
+      chirrtl should include("@[src/test/scala-2/chiselTests/SourceLocatorSpec.scala")
     }
   }
 
diff --git a/src/test/scala/chiselTests/Stack.scala b/src/test/scala-2/chiselTests/Stack.scala
similarity index 100%
rename from src/test/scala/chiselTests/Stack.scala
rename to src/test/scala-2/chiselTests/Stack.scala
diff --git a/src/test/scala/chiselTests/Stop.scala b/src/test/scala-2/chiselTests/Stop.scala
similarity index 100%
rename from src/test/scala/chiselTests/Stop.scala
rename to src/test/scala-2/chiselTests/Stop.scala
diff --git a/src/test/scala/chiselTests/SwitchSpec.scala b/src/test/scala-2/chiselTests/SwitchSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/SwitchSpec.scala
rename to src/test/scala-2/chiselTests/SwitchSpec.scala
diff --git a/src/test/scala/chiselTests/Tbl.scala b/src/test/scala-2/chiselTests/Tbl.scala
similarity index 100%
rename from src/test/scala/chiselTests/Tbl.scala
rename to src/test/scala-2/chiselTests/Tbl.scala
diff --git a/src/test/scala/chiselTests/TesterDriverSpec.scala b/src/test/scala-2/chiselTests/TesterDriverSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/TesterDriverSpec.scala
rename to src/test/scala-2/chiselTests/TesterDriverSpec.scala
diff --git a/src/test/scala/chiselTests/ToTargetSpec.scala b/src/test/scala-2/chiselTests/ToTargetSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ToTargetSpec.scala
rename to src/test/scala-2/chiselTests/ToTargetSpec.scala
diff --git a/src/test/scala/chiselTests/TypeAliasSpec.scala b/src/test/scala-2/chiselTests/TypeAliasSpec.scala
similarity index 99%
rename from src/test/scala/chiselTests/TypeAliasSpec.scala
rename to src/test/scala-2/chiselTests/TypeAliasSpec.scala
index 1473045024c..6b2506cc033 100644
--- a/src/test/scala/chiselTests/TypeAliasSpec.scala
+++ b/src/test/scala-2/chiselTests/TypeAliasSpec.scala
@@ -245,7 +245,7 @@ class TypeAliasSpec extends ChiselFlatSpec with Utils {
       "Attempted to redeclare an existing type alias 'DifferentBundle' with a new Record structure"
     )
     msg should include("The alias was previously defined as:")
-    msg should include("@[src/test/scala/chiselTests/TypeAliasSpec.scala")
+    msg should include("@[src/test/scala-2/chiselTests/TypeAliasSpec.scala")
   }
 
   "Bundles with unsanitary names" should "properly sanitize" in {
diff --git a/src/test/scala/chiselTests/UIntOps.scala b/src/test/scala-2/chiselTests/UIntOps.scala
similarity index 100%
rename from src/test/scala/chiselTests/UIntOps.scala
rename to src/test/scala-2/chiselTests/UIntOps.scala
diff --git a/src/test/scala/chiselTests/Util.scala b/src/test/scala-2/chiselTests/Util.scala
similarity index 100%
rename from src/test/scala/chiselTests/Util.scala
rename to src/test/scala-2/chiselTests/Util.scala
diff --git a/src/test/scala/chiselTests/ValidSpec.scala b/src/test/scala-2/chiselTests/ValidSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/ValidSpec.scala
rename to src/test/scala-2/chiselTests/ValidSpec.scala
diff --git a/src/test/scala/chiselTests/Vec.scala b/src/test/scala-2/chiselTests/Vec.scala
similarity index 100%
rename from src/test/scala/chiselTests/Vec.scala
rename to src/test/scala-2/chiselTests/Vec.scala
diff --git a/src/test/scala/chiselTests/VecLiteralSpec.scala b/src/test/scala-2/chiselTests/VecLiteralSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/VecLiteralSpec.scala
rename to src/test/scala-2/chiselTests/VecLiteralSpec.scala
diff --git a/src/test/scala/chiselTests/VecToTargetSpec.scala b/src/test/scala-2/chiselTests/VecToTargetSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/VecToTargetSpec.scala
rename to src/test/scala-2/chiselTests/VecToTargetSpec.scala
diff --git a/src/test/scala/chiselTests/VectorPacketIO.scala b/src/test/scala-2/chiselTests/VectorPacketIO.scala
similarity index 100%
rename from src/test/scala/chiselTests/VectorPacketIO.scala
rename to src/test/scala-2/chiselTests/VectorPacketIO.scala
diff --git a/src/test/scala/chiselTests/VerificationSpec.scala b/src/test/scala-2/chiselTests/VerificationSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/VerificationSpec.scala
rename to src/test/scala-2/chiselTests/VerificationSpec.scala
diff --git a/src/test/scala/chiselTests/WarningSpec.scala b/src/test/scala-2/chiselTests/WarningSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/WarningSpec.scala
rename to src/test/scala-2/chiselTests/WarningSpec.scala
diff --git a/src/test/scala/chiselTests/WhenSpec.scala b/src/test/scala-2/chiselTests/WhenSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/WhenSpec.scala
rename to src/test/scala-2/chiselTests/WhenSpec.scala
diff --git a/src/test/scala/chiselTests/WidthSpec.scala b/src/test/scala-2/chiselTests/WidthSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/WidthSpec.scala
rename to src/test/scala-2/chiselTests/WidthSpec.scala
diff --git a/src/test/scala/chiselTests/WireSpec.scala b/src/test/scala-2/chiselTests/WireSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/WireSpec.scala
rename to src/test/scala-2/chiselTests/WireSpec.scala
diff --git a/src/test/scala/chiselTests/aop/SelectSpec.scala b/src/test/scala-2/chiselTests/aop/SelectSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/aop/SelectSpec.scala
rename to src/test/scala-2/chiselTests/aop/SelectSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/AutoBlackBoxSpec.scala b/src/test/scala-2/chiselTests/experimental/AutoBlackBoxSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/AutoBlackBoxSpec.scala
rename to src/test/scala-2/chiselTests/experimental/AutoBlackBoxSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/AutoTypenameSpec.scala b/src/test/scala-2/chiselTests/experimental/AutoTypenameSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/AutoTypenameSpec.scala
rename to src/test/scala-2/chiselTests/experimental/AutoTypenameSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/CIRCTSRAMInterfaceSpec.scala b/src/test/scala-2/chiselTests/experimental/CIRCTSRAMInterfaceSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/CIRCTSRAMInterfaceSpec.scala
rename to src/test/scala-2/chiselTests/experimental/CIRCTSRAMInterfaceSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/DataView.scala b/src/test/scala-2/chiselTests/experimental/DataView.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/DataView.scala
rename to src/test/scala-2/chiselTests/experimental/DataView.scala
diff --git a/src/test/scala/chiselTests/experimental/DataViewIntegrationSpec.scala b/src/test/scala-2/chiselTests/experimental/DataViewIntegrationSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/DataViewIntegrationSpec.scala
rename to src/test/scala-2/chiselTests/experimental/DataViewIntegrationSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/DataViewTargetSpec.scala b/src/test/scala-2/chiselTests/experimental/DataViewTargetSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/DataViewTargetSpec.scala
rename to src/test/scala-2/chiselTests/experimental/DataViewTargetSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/FlatIOSpec.scala b/src/test/scala-2/chiselTests/experimental/FlatIOSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/FlatIOSpec.scala
rename to src/test/scala-2/chiselTests/experimental/FlatIOSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/ForceNames.scala b/src/test/scala-2/chiselTests/experimental/ForceNames.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/ForceNames.scala
rename to src/test/scala-2/chiselTests/experimental/ForceNames.scala
diff --git a/src/test/scala/chiselTests/experimental/ModuleDataProductSpec.scala b/src/test/scala-2/chiselTests/experimental/ModuleDataProductSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/ModuleDataProductSpec.scala
rename to src/test/scala-2/chiselTests/experimental/ModuleDataProductSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/OpaqueTypeSpec.scala b/src/test/scala-2/chiselTests/experimental/OpaqueTypeSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/OpaqueTypeSpec.scala
rename to src/test/scala-2/chiselTests/experimental/OpaqueTypeSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/ProgrammaticPortsSpec.scala b/src/test/scala-2/chiselTests/experimental/ProgrammaticPortsSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/ProgrammaticPortsSpec.scala
rename to src/test/scala-2/chiselTests/experimental/ProgrammaticPortsSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/SerializableModuleElaboratorSpec.scala b/src/test/scala-2/chiselTests/experimental/SerializableModuleElaboratorSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/SerializableModuleElaboratorSpec.scala
rename to src/test/scala-2/chiselTests/experimental/SerializableModuleElaboratorSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/SerializableModuleGeneratorSpec.scala b/src/test/scala-2/chiselTests/experimental/SerializableModuleGeneratorSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/SerializableModuleGeneratorSpec.scala
rename to src/test/scala-2/chiselTests/experimental/SerializableModuleGeneratorSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/TraceSpec.scala b/src/test/scala-2/chiselTests/experimental/TraceSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/TraceSpec.scala
rename to src/test/scala-2/chiselTests/experimental/TraceSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/Tuple.scala b/src/test/scala-2/chiselTests/experimental/Tuple.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/Tuple.scala
rename to src/test/scala-2/chiselTests/experimental/Tuple.scala
diff --git a/src/test/scala/chiselTests/experimental/hierarchy/Annotations.scala b/src/test/scala-2/chiselTests/experimental/hierarchy/Annotations.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/hierarchy/Annotations.scala
rename to src/test/scala-2/chiselTests/experimental/hierarchy/Annotations.scala
diff --git a/src/test/scala/chiselTests/experimental/hierarchy/DefinitionSpec.scala b/src/test/scala-2/chiselTests/experimental/hierarchy/DefinitionSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/hierarchy/DefinitionSpec.scala
rename to src/test/scala-2/chiselTests/experimental/hierarchy/DefinitionSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/hierarchy/Examples.scala b/src/test/scala-2/chiselTests/experimental/hierarchy/Examples.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/hierarchy/Examples.scala
rename to src/test/scala-2/chiselTests/experimental/hierarchy/Examples.scala
diff --git a/src/test/scala/chiselTests/experimental/hierarchy/InstanceSpec.scala b/src/test/scala-2/chiselTests/experimental/hierarchy/InstanceSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/hierarchy/InstanceSpec.scala
rename to src/test/scala-2/chiselTests/experimental/hierarchy/InstanceSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/hierarchy/InstantiateSpec.scala b/src/test/scala-2/chiselTests/experimental/hierarchy/InstantiateSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/hierarchy/InstantiateSpec.scala
rename to src/test/scala-2/chiselTests/experimental/hierarchy/InstantiateSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/hierarchy/SeparateElaborationSpec.scala b/src/test/scala-2/chiselTests/experimental/hierarchy/SeparateElaborationSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/hierarchy/SeparateElaborationSpec.scala
rename to src/test/scala-2/chiselTests/experimental/hierarchy/SeparateElaborationSpec.scala
diff --git a/src/test/scala/chiselTests/experimental/hierarchy/Utils.scala b/src/test/scala-2/chiselTests/experimental/hierarchy/Utils.scala
similarity index 100%
rename from src/test/scala/chiselTests/experimental/hierarchy/Utils.scala
rename to src/test/scala-2/chiselTests/experimental/hierarchy/Utils.scala
diff --git a/src/test/scala/chiselTests/interface/Drivers.scala b/src/test/scala-2/chiselTests/interface/Drivers.scala
similarity index 100%
rename from src/test/scala/chiselTests/interface/Drivers.scala
rename to src/test/scala-2/chiselTests/interface/Drivers.scala
diff --git a/src/test/scala/chiselTests/interface/InterfaceSpec.scala b/src/test/scala-2/chiselTests/interface/InterfaceSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/interface/InterfaceSpec.scala
rename to src/test/scala-2/chiselTests/interface/InterfaceSpec.scala
diff --git a/src/test/scala/chiselTests/interface/ParametricInterfaceSpec.scala b/src/test/scala-2/chiselTests/interface/ParametricInterfaceSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/interface/ParametricInterfaceSpec.scala
rename to src/test/scala-2/chiselTests/interface/ParametricInterfaceSpec.scala
diff --git a/src/test/scala/chiselTests/interface/TappedInterfaceSpec.scala b/src/test/scala-2/chiselTests/interface/TappedInterfaceSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/interface/TappedInterfaceSpec.scala
rename to src/test/scala-2/chiselTests/interface/TappedInterfaceSpec.scala
diff --git a/src/test/scala/chiselTests/naming/IdentifierProposerSpec.scala b/src/test/scala-2/chiselTests/naming/IdentifierProposerSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/naming/IdentifierProposerSpec.scala
rename to src/test/scala-2/chiselTests/naming/IdentifierProposerSpec.scala
diff --git a/src/test/scala/chiselTests/naming/NamePluginSpec.scala b/src/test/scala-2/chiselTests/naming/NamePluginSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/naming/NamePluginSpec.scala
rename to src/test/scala-2/chiselTests/naming/NamePluginSpec.scala
diff --git a/src/test/scala/chiselTests/naming/PrefixSpec.scala b/src/test/scala-2/chiselTests/naming/PrefixSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/naming/PrefixSpec.scala
rename to src/test/scala-2/chiselTests/naming/PrefixSpec.scala
diff --git a/src/test/scala/chiselTests/naming/TypenameSpec.scala b/src/test/scala-2/chiselTests/naming/TypenameSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/naming/TypenameSpec.scala
rename to src/test/scala-2/chiselTests/naming/TypenameSpec.scala
diff --git a/src/test/scala/chiselTests/properties/ClassSpec.scala b/src/test/scala-2/chiselTests/properties/ClassSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/properties/ClassSpec.scala
rename to src/test/scala-2/chiselTests/properties/ClassSpec.scala
diff --git a/src/test/scala/chiselTests/properties/ObjectSpec.scala b/src/test/scala-2/chiselTests/properties/ObjectSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/properties/ObjectSpec.scala
rename to src/test/scala-2/chiselTests/properties/ObjectSpec.scala
diff --git a/src/test/scala/chiselTests/properties/PropertySpec.scala b/src/test/scala-2/chiselTests/properties/PropertySpec.scala
similarity index 99%
rename from src/test/scala/chiselTests/properties/PropertySpec.scala
rename to src/test/scala-2/chiselTests/properties/PropertySpec.scala
index 347d9ee5814..1e262637e82 100644
--- a/src/test/scala/chiselTests/properties/PropertySpec.scala
+++ b/src/test/scala-2/chiselTests/properties/PropertySpec.scala
@@ -787,7 +787,7 @@ class PropertySpec extends ChiselFlatSpec with FileCheck {
     }))
 
     e.getMessage should include(
-      "Property expressions are currently only supported in RawModules @[src/test/scala/chiselTests/properties/PropertySpec.scala"
+      "Property expressions are currently only supported in RawModules @[src/test/scala-2/chiselTests/properties/PropertySpec.scala"
     )
   }
 
@@ -876,7 +876,7 @@ class PropertySpec extends ChiselFlatSpec with FileCheck {
     }))
 
     e.getMessage should include(
-      "Property expressions are currently only supported in RawModules @[src/test/scala/chiselTests/properties/PropertySpec.scala"
+      "Property expressions are currently only supported in RawModules @[src/test/scala-2/chiselTests/properties/PropertySpec.scala"
     )
   }
 
diff --git a/src/test/scala/chiselTests/reflect/CheckTypeEquivalenceSpec.scala b/src/test/scala-2/chiselTests/reflect/CheckTypeEquivalenceSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/reflect/CheckTypeEquivalenceSpec.scala
rename to src/test/scala-2/chiselTests/reflect/CheckTypeEquivalenceSpec.scala
diff --git a/src/test/scala/chiselTests/reflect/DataMirrorSpec.scala b/src/test/scala-2/chiselTests/reflect/DataMirrorSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/reflect/DataMirrorSpec.scala
rename to src/test/scala-2/chiselTests/reflect/DataMirrorSpec.scala
diff --git a/src/test/scala/chiselTests/simulator/EphemeraSimulatorSpec.scala b/src/test/scala-2/chiselTests/simulator/EphemeraSimulatorSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/simulator/EphemeraSimulatorSpec.scala
rename to src/test/scala-2/chiselTests/simulator/EphemeraSimulatorSpec.scala
diff --git a/src/test/scala/chiselTests/simulator/GCD.scala b/src/test/scala-2/chiselTests/simulator/GCD.scala
similarity index 100%
rename from src/test/scala/chiselTests/simulator/GCD.scala
rename to src/test/scala-2/chiselTests/simulator/GCD.scala
diff --git a/src/test/scala/chiselTests/simulator/LayerControlSpec.scala b/src/test/scala-2/chiselTests/simulator/LayerControlSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/simulator/LayerControlSpec.scala
rename to src/test/scala-2/chiselTests/simulator/LayerControlSpec.scala
diff --git a/src/test/scala/chiselTests/simulator/OptionalIOModule.scala b/src/test/scala-2/chiselTests/simulator/OptionalIOModule.scala
similarity index 100%
rename from src/test/scala/chiselTests/simulator/OptionalIOModule.scala
rename to src/test/scala-2/chiselTests/simulator/OptionalIOModule.scala
diff --git a/src/test/scala/chiselTests/simulator/SimulatorSpec.scala b/src/test/scala-2/chiselTests/simulator/SimulatorSpec.scala
similarity index 99%
rename from src/test/scala/chiselTests/simulator/SimulatorSpec.scala
rename to src/test/scala-2/chiselTests/simulator/SimulatorSpec.scala
index e0d5db4cdb6..9a81360e0af 100644
--- a/src/test/scala/chiselTests/simulator/SimulatorSpec.scala
+++ b/src/test/scala-2/chiselTests/simulator/SimulatorSpec.scala
@@ -91,7 +91,7 @@ class SimulatorSpec extends AnyFunSpec with Matchers {
       }
       thrown.getMessage must include("Observed value '12' != 5.")
       (thrown.getMessage must include).regex(
-        """ @\[src/test/scala/chiselTests/simulator/SimulatorSpec\.scala:\d+:\d+\]"""
+        """ @\[src/test/scala-2/chiselTests/simulator/SimulatorSpec\.scala:\d+:\d+\]"""
       )
       thrown.getMessage must include("gcd.io.result.expect(5)")
       thrown.getMessage must include("                    ^")
diff --git a/src/test/scala/chiselTests/stage/ChiselAnnotationsSpec.scala b/src/test/scala-2/chiselTests/stage/ChiselAnnotationsSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/stage/ChiselAnnotationsSpec.scala
rename to src/test/scala-2/chiselTests/stage/ChiselAnnotationsSpec.scala
diff --git a/src/test/scala/chiselTests/stage/WarningConfigurationSpec.scala b/src/test/scala-2/chiselTests/stage/WarningConfigurationSpec.scala
similarity index 99%
rename from src/test/scala/chiselTests/stage/WarningConfigurationSpec.scala
rename to src/test/scala-2/chiselTests/stage/WarningConfigurationSpec.scala
index 60eee48bffa..09458ade949 100644
--- a/src/test/scala/chiselTests/stage/WarningConfigurationSpec.scala
+++ b/src/test/scala-2/chiselTests/stage/WarningConfigurationSpec.scala
@@ -163,7 +163,7 @@ class WarningConfigurationSpec extends AnyFunSpec with Matchers with chiselTests
 
       info("including when rooted")
       val args3 =
-        Array("--warn-conf", "src=src/test/scala/**/WarningConfigurationSpec.scala:s,any:e", "--throw-on-first-error")
+        Array("--warn-conf", "src=src/test/scala-2/**/WarningConfigurationSpec.scala:s,any:e", "--throw-on-first-error")
       ChiselStage.emitCHIRRTL(new ModuleWithWarning, args3)
     }
 
diff --git a/src/test/scala/chiselTests/stage/phases/AddImplicitOutputAnnotationFileSpec.scala b/src/test/scala-2/chiselTests/stage/phases/AddImplicitOutputAnnotationFileSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/stage/phases/AddImplicitOutputAnnotationFileSpec.scala
rename to src/test/scala-2/chiselTests/stage/phases/AddImplicitOutputAnnotationFileSpec.scala
diff --git a/src/test/scala/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala b/src/test/scala-2/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala
rename to src/test/scala-2/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala
diff --git a/src/test/scala/chiselTests/stage/phases/AddSerializationAnnotationsSpec.scala b/src/test/scala-2/chiselTests/stage/phases/AddSerializationAnnotationsSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/stage/phases/AddSerializationAnnotationsSpec.scala
rename to src/test/scala-2/chiselTests/stage/phases/AddSerializationAnnotationsSpec.scala
diff --git a/src/test/scala/chiselTests/stage/phases/ChecksSpec.scala b/src/test/scala-2/chiselTests/stage/phases/ChecksSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/stage/phases/ChecksSpec.scala
rename to src/test/scala-2/chiselTests/stage/phases/ChecksSpec.scala
diff --git a/src/test/scala/chiselTests/stage/phases/ConvertSpec.scala b/src/test/scala-2/chiselTests/stage/phases/ConvertSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/stage/phases/ConvertSpec.scala
rename to src/test/scala-2/chiselTests/stage/phases/ConvertSpec.scala
diff --git a/src/test/scala/chiselTests/stage/phases/ElaborateSpec.scala b/src/test/scala-2/chiselTests/stage/phases/ElaborateSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/stage/phases/ElaborateSpec.scala
rename to src/test/scala-2/chiselTests/stage/phases/ElaborateSpec.scala
diff --git a/src/test/scala/chiselTests/stage/phases/EmitterSpec.scala b/src/test/scala-2/chiselTests/stage/phases/EmitterSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/stage/phases/EmitterSpec.scala
rename to src/test/scala-2/chiselTests/stage/phases/EmitterSpec.scala
diff --git a/src/test/scala/chiselTests/util/AttributeAnnotationSpec.scala b/src/test/scala-2/chiselTests/util/AttributeAnnotationSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/AttributeAnnotationSpec.scala
rename to src/test/scala-2/chiselTests/util/AttributeAnnotationSpec.scala
diff --git a/src/test/scala/chiselTests/util/BitSetSpec.scala b/src/test/scala-2/chiselTests/util/BitSetSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/BitSetSpec.scala
rename to src/test/scala-2/chiselTests/util/BitSetSpec.scala
diff --git a/src/test/scala/chiselTests/util/BitwiseSpec.scala b/src/test/scala-2/chiselTests/util/BitwiseSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/BitwiseSpec.scala
rename to src/test/scala-2/chiselTests/util/BitwiseSpec.scala
diff --git a/src/test/scala/chiselTests/util/CatSpec.scala b/src/test/scala-2/chiselTests/util/CatSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/CatSpec.scala
rename to src/test/scala-2/chiselTests/util/CatSpec.scala
diff --git a/src/test/scala/chiselTests/util/PipeSpec.scala b/src/test/scala-2/chiselTests/util/PipeSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/PipeSpec.scala
rename to src/test/scala-2/chiselTests/util/PipeSpec.scala
diff --git a/src/test/scala/chiselTests/util/PriorityMuxSpec.scala b/src/test/scala-2/chiselTests/util/PriorityMuxSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/PriorityMuxSpec.scala
rename to src/test/scala-2/chiselTests/util/PriorityMuxSpec.scala
diff --git a/src/test/scala/chiselTests/util/RegSpec.scala b/src/test/scala-2/chiselTests/util/RegSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/RegSpec.scala
rename to src/test/scala-2/chiselTests/util/RegSpec.scala
diff --git a/src/test/scala/chiselTests/util/SRAMSpec.scala b/src/test/scala-2/chiselTests/util/SRAMSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/SRAMSpec.scala
rename to src/test/scala-2/chiselTests/util/SRAMSpec.scala
diff --git a/src/test/scala/chiselTests/util/circt/ClockGate.scala b/src/test/scala-2/chiselTests/util/circt/ClockGate.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/circt/ClockGate.scala
rename to src/test/scala-2/chiselTests/util/circt/ClockGate.scala
diff --git a/src/test/scala/chiselTests/util/circt/IsXSpec.scala b/src/test/scala-2/chiselTests/util/circt/IsXSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/circt/IsXSpec.scala
rename to src/test/scala-2/chiselTests/util/circt/IsXSpec.scala
diff --git a/src/test/scala/chiselTests/util/circt/PlusArgsTestSpec.scala b/src/test/scala-2/chiselTests/util/circt/PlusArgsTestSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/circt/PlusArgsTestSpec.scala
rename to src/test/scala-2/chiselTests/util/circt/PlusArgsTestSpec.scala
diff --git a/src/test/scala/chiselTests/util/circt/PlusArgsValueSpec.scala b/src/test/scala-2/chiselTests/util/circt/PlusArgsValueSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/circt/PlusArgsValueSpec.scala
rename to src/test/scala-2/chiselTests/util/circt/PlusArgsValueSpec.scala
diff --git a/src/test/scala/chiselTests/util/circt/SizeOfSpec.scala b/src/test/scala-2/chiselTests/util/circt/SizeOfSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/circt/SizeOfSpec.scala
rename to src/test/scala-2/chiselTests/util/circt/SizeOfSpec.scala
diff --git a/src/test/scala/chiselTests/util/circt/Synthesis.scala b/src/test/scala-2/chiselTests/util/circt/Synthesis.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/circt/Synthesis.scala
rename to src/test/scala-2/chiselTests/util/circt/Synthesis.scala
diff --git a/src/test/scala/chiselTests/util/experimental/DecoderTableSpec.scala b/src/test/scala-2/chiselTests/util/experimental/DecoderTableSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/experimental/DecoderTableSpec.scala
rename to src/test/scala-2/chiselTests/util/experimental/DecoderTableSpec.scala
diff --git a/src/test/scala/chiselTests/util/random/PRNGSpec.scala b/src/test/scala-2/chiselTests/util/random/PRNGSpec.scala
similarity index 100%
rename from src/test/scala/chiselTests/util/random/PRNGSpec.scala
rename to src/test/scala-2/chiselTests/util/random/PRNGSpec.scala
diff --git a/src/test/scala/circtTests/ConventionSpec.scala b/src/test/scala-2/circtTests/ConventionSpec.scala
similarity index 100%
rename from src/test/scala/circtTests/ConventionSpec.scala
rename to src/test/scala-2/circtTests/ConventionSpec.scala
diff --git a/src/test/scala/circtTests/OutputDirAnnotationSpec.scala b/src/test/scala-2/circtTests/OutputDirAnnotationSpec.scala
similarity index 100%
rename from src/test/scala/circtTests/OutputDirAnnotationSpec.scala
rename to src/test/scala-2/circtTests/OutputDirAnnotationSpec.scala
diff --git a/src/test/scala/circtTests/stage/ChiselMainSpec.scala b/src/test/scala-2/circtTests/stage/ChiselMainSpec.scala
similarity index 100%
rename from src/test/scala/circtTests/stage/ChiselMainSpec.scala
rename to src/test/scala-2/circtTests/stage/ChiselMainSpec.scala
diff --git a/src/test/scala/circtTests/stage/ChiselStageSpec.scala b/src/test/scala-2/circtTests/stage/ChiselStageSpec.scala
similarity index 99%
rename from src/test/scala/circtTests/stage/ChiselStageSpec.scala
rename to src/test/scala-2/circtTests/stage/ChiselStageSpec.scala
index 74a92522003..4d21e4d9514 100644
--- a/src/test/scala/circtTests/stage/ChiselStageSpec.scala
+++ b/src/test/scala-2/circtTests/stage/ChiselStageSpec.scala
@@ -593,7 +593,7 @@ class ChiselStageSpec extends AnyFunSpec with Matchers with chiselTests.Utils {
       val lines = stdout.split("\n")
       // Fuzzy includes aren't ideal but there is ANSI color in these strings that is hard to match
       lines(0) should include(
-        "src/test/scala/circtTests/stage/ChiselStageSpec.scala 97:9: Negative shift amounts are illegal (got -1)"
+        "src/test/scala-2/circtTests/stage/ChiselStageSpec.scala 97:9: Negative shift amounts are illegal (got -1)"
       )
       lines(1) should include("    3.U >> -1")
       lines(2) should include("        ^")
@@ -614,7 +614,7 @@ class ChiselStageSpec extends AnyFunSpec with Matchers with chiselTests.Utils {
       // Fuzzy includes aren't ideal but there is ANSI color in these strings that is hard to match
       lines.size should equal(2)
       lines(0) should include(
-        "src/test/scala/circtTests/stage/ChiselStageSpec.scala 97:9: Negative shift amounts are illegal (got -1)"
+        "src/test/scala-2/circtTests/stage/ChiselStageSpec.scala 97:9: Negative shift amounts are illegal (got -1)"
       )
       (lines(1) should not).include("3.U >> -1")
     }
diff --git a/src/test/scala/circtTests/stage/phases/AddImplicitOutputFileSpec.scala b/src/test/scala-2/circtTests/stage/phases/AddImplicitOutputFileSpec.scala
similarity index 100%
rename from src/test/scala/circtTests/stage/phases/AddImplicitOutputFileSpec.scala
rename to src/test/scala-2/circtTests/stage/phases/AddImplicitOutputFileSpec.scala
diff --git a/src/test/scala/cookbook/Bundle2UInt.scala b/src/test/scala-2/cookbook/Bundle2UInt.scala
similarity index 100%
rename from src/test/scala/cookbook/Bundle2UInt.scala
rename to src/test/scala-2/cookbook/Bundle2UInt.scala
diff --git a/src/test/scala/cookbook/CookbookSpec.scala b/src/test/scala-2/cookbook/CookbookSpec.scala
similarity index 100%
rename from src/test/scala/cookbook/CookbookSpec.scala
rename to src/test/scala-2/cookbook/CookbookSpec.scala
diff --git a/src/test/scala/cookbook/FSM.scala b/src/test/scala-2/cookbook/FSM.scala
similarity index 100%
rename from src/test/scala/cookbook/FSM.scala
rename to src/test/scala-2/cookbook/FSM.scala
diff --git a/src/test/scala/cookbook/RegOfVec.scala b/src/test/scala-2/cookbook/RegOfVec.scala
similarity index 100%
rename from src/test/scala/cookbook/RegOfVec.scala
rename to src/test/scala-2/cookbook/RegOfVec.scala
diff --git a/src/test/scala/cookbook/UInt2Bundle.scala b/src/test/scala-2/cookbook/UInt2Bundle.scala
similarity index 100%
rename from src/test/scala/cookbook/UInt2Bundle.scala
rename to src/test/scala-2/cookbook/UInt2Bundle.scala
diff --git a/src/test/scala/cookbook/UInt2VecOfBool.scala b/src/test/scala-2/cookbook/UInt2VecOfBool.scala
similarity index 100%
rename from src/test/scala/cookbook/UInt2VecOfBool.scala
rename to src/test/scala-2/cookbook/UInt2VecOfBool.scala
diff --git a/src/test/scala/cookbook/VecOfBool2UInt.scala b/src/test/scala-2/cookbook/VecOfBool2UInt.scala
similarity index 100%
rename from src/test/scala/cookbook/VecOfBool2UInt.scala
rename to src/test/scala-2/cookbook/VecOfBool2UInt.scala
diff --git a/src/test/scala/examples/ImplicitStateVendingMachine.scala b/src/test/scala-2/examples/ImplicitStateVendingMachine.scala
similarity index 100%
rename from src/test/scala/examples/ImplicitStateVendingMachine.scala
rename to src/test/scala-2/examples/ImplicitStateVendingMachine.scala
diff --git a/src/test/scala/examples/SimpleVendingMachine.scala b/src/test/scala-2/examples/SimpleVendingMachine.scala
similarity index 100%
rename from src/test/scala/examples/SimpleVendingMachine.scala
rename to src/test/scala-2/examples/SimpleVendingMachine.scala
diff --git a/src/test/scala/examples/VendingMachineGenerator.scala b/src/test/scala-2/examples/VendingMachineGenerator.scala
similarity index 100%
rename from src/test/scala/examples/VendingMachineGenerator.scala
rename to src/test/scala-2/examples/VendingMachineGenerator.scala
diff --git a/src/test/scala/examples/VendingMachineUtils.scala b/src/test/scala-2/examples/VendingMachineUtils.scala
similarity index 100%
rename from src/test/scala/examples/VendingMachineUtils.scala
rename to src/test/scala-2/examples/VendingMachineUtils.scala