From 523a604ec0d77984219c1deb87101747f6dc2f91 Mon Sep 17 00:00:00 2001
From: cheeseng <cheeseng@amaseng.com>
Date: Sat, 7 Feb 2015 00:20:07 +0800
Subject: [PATCH] Initial version of separating out scalactic.

---
 .../scala/org/scalatest/SharedHelpers.scala   |   0
 project/GenMatchers.scala                     |   2 +-
 project/GenVersions.scala                     |   4 +-
 project/scalatest.scala                       | 137 ++++++++++--------
 .../org/scalactic/AccumulationSpec.scala      |   0
 .../scala/org/scalactic/CatcherSpec.scala     |   0
 .../test/scala/org/scalactic/ChainSpec.scala  |   0
 ...ionCheckedMapEqualityConstraintsSpec.scala |   0
 ...ionCheckedSeqEqualityConstraintsSpec.scala |   0
 ...ionCheckedSetEqualityConstraintsSpec.scala |   0
 ...edTraversableEqualityConstraintsSpec.scala |   0
 ...ionCheckedTripleEqualsExplicitlySpec.scala |   0
 .../ConversionCheckedTripleEqualsSpec.scala   |   0
 .../scala/org/scalactic/DecidersSpec.scala    |   0
 .../org/scalactic/DefaultEqualitySpec.scala   |   0
 .../scala/org/scalactic/EitherSugarSpec.scala |   0
 .../scala/org/scalactic/EqualitySpec.scala    |   0
 .../test/scala/org/scalactic/EverySpec.scala  |   0
 .../org/scalactic/ExplicitlySpecHelpers.scala |   0
 .../scala/org/scalactic/NormMethodsSpec.scala |   0
 .../org/scalactic/NormalizationSpec.scala     |   0
 .../scalactic/NormalizingEqualitySpec.scala   |   0
 .../NumericEqualityConstraintsSpec.scala      |   0
 .../scala/org/scalactic/OptionSugarSpec.scala |   0
 .../test/scala/org/scalactic/OrSpec.scala     |   0
 .../scala/org/scalactic/PrettifierSpec.scala  |   0
 .../org/scalactic/PrettyMethodsSpec.scala     |   0
 .../org/scalactic/RequirementsSpec.scala      |   0
 .../scala/org/scalactic/SnapshotsSpec.scala   |   0
 .../test/scala/org/scalactic/SpreadSpec.scala |   0
 .../scalactic/StringNormalizationsSpec.scala  |   0
 .../scala/org/scalactic/TimesOnIntSpec.scala  |   2 -
 .../scala/org/scalactic/ToleranceSpec.scala   |   0
 .../org/scalactic/TolerantEqualitySpec.scala  |   0
 .../scalactic/TolerantEquivalenceSpec.scala   |   0
 .../TraversableConstraintsSpec.scala          |   0
 .../org/scalactic/TripleEqualsSpec.for210     |   0
 .../org/scalactic/TripleEqualsSpec.scala      |   0
 .../scala/org/scalactic/TrySugarSpec.scala    |   0
 ...ypeCheckedMapEqualityConstraintsSpec.scala |   0
 ...ypeCheckedSeqEqualityConstraintsSpec.scala |   0
 ...ypeCheckedSetEqualityConstraintsSpec.scala |   0
 ...edTraversableEqualityConstraintsSpec.scala |   0
 ...ypeCheckedTripleEqualsExplicitlySpec.scala |   0
 .../test/scala/org/scalactic/UnitSpec.scala   |   0
 .../scala/org/scalactic/ValidationSpec.scala  |   0
 .../org/scalactic/ScalacticBundle.properties  |   0
 .../scalactic/AbstractStringUniformity.scala  |   0
 .../scala/org/scalactic/Accumulation.scala    |   0
 .../src}/main/scala/org/scalactic/Bool.scala  |   0
 .../scala/org/scalactic/BooleanMacro.scala    |   0
 .../main/scala/org/scalactic/Catcher.scala    |   0
 .../src}/main/scala/org/scalactic/Chain.scala |   0
 .../ComposedNormalizingEquality.scala         |   0
 .../ComposedNormalizingEquivalence.scala      |   0
 .../main/scala/org/scalactic/Constraint.scala |   0
 .../ConversionCheckedTripleEquals.scala       |   0
 .../scala/org/scalactic/DefaultEquality.scala |   0
 .../scala/org/scalactic/EitherSugar.scala     |   0
 .../main/scala/org/scalactic/Equality.scala   |   0
 .../scala/org/scalactic/Equivalence.scala     |   0
 .../src}/main/scala/org/scalactic/Every.scala |   0
 .../main/scala/org/scalactic/Explicitly.scala |   0
 .../scala/org/scalactic/FailureMessages.scala |   0
 ...wPriorityConversionCheckedConstraint.scala |   0
 .../LowPriorityTypeCheckedConstraint.scala    |   0
 .../org/scalactic/MacroOwnerRepair.scala      |   0
 .../scalactic/MapEqualityConstraints.scala    |   0
 .../scala/org/scalactic/NormMethods.scala     |   0
 .../scala/org/scalactic/Normalization.scala   |   0
 .../org/scalactic/NormalizingEquality.scala   |   0
 .../scalactic/NormalizingEquivalence.scala    |   0
 .../NumericEqualityConstraints.scala          |   0
 .../scala/org/scalactic/OptionSugar.scala     |   0
 .../src}/main/scala/org/scalactic/Or.scala    |   0
 .../main/scala/org/scalactic/Prettifier.scala |   0
 .../scala/org/scalactic/PrettyMethods.scala   |   0
 .../scala/org/scalactic/Requirements.scala    |   0
 .../main/scala/org/scalactic/Resources.scala  |   0
 .../scalactic/SeqEqualityConstraints.scala    |   0
 .../scalactic/SetEqualityConstraints.scala    |   0
 .../main/scala/org/scalactic/Snapshots.scala  |   0
 .../org/scalactic/StringNormalizations.scala  |   0
 .../main/scala/org/scalactic/TimesOnInt.scala |   0
 .../main/scala/org/scalactic/Tolerance.scala  |   0
 .../org/scalactic/TolerantNumerics.scala      |   0
 .../TraversableEqualityConstraints.scala      |   0
 .../scala/org/scalactic/TripleEquals.scala    |   0
 .../org/scalactic/TripleEqualsSupport.scala   |   0
 .../main/scala/org/scalactic/TrySugar.scala   |   0
 .../scalactic/TypeCheckedTripleEquals.scala   |   0
 .../main/scala/org/scalactic/Uniformity.scala |   0
 .../main/scala/org/scalactic/Validation.scala |   0
 .../main/scala/org/scalactic/package.scala    |   0
 .../scala/org/scalatest/osgi/OsgiSuite.scala  |   0
 .../test/java/org/scalatest/FastAsLight.java  |   0
 .../test/java/org/scalatest/HasField.java     |   0
 .../org/scalatest/HasFieldAndGetMethod.java   |   0
 .../java/org/scalatest/HasFieldAndMethod.java |   0
 .../scalatest/HasFieldMethodAndGetMethod.java |   0
 .../PackageAccessConstructorSuite.java        |   0
 .../java/org/scalatest/SlowAsMolasses.java    |   0
 .../java/org/scalatest/WeakAsAKitten.java     |   0
 .../org/scalatest/junit/JBitterSuite.java     |   0
 .../java/org/scalatest/junit/JHappySuite.java |   0
 .../org/scalatest/junit/JUnit3TestCase.java   |   0
 .../org/scalatest/junit/JUnit3TestSuite.java  |   0
 .../scalatest/tools/PackageAccessSuite.java   |   0
 .../scala/org/scalatest/AMatcherSpec.scala    |   0
 .../scala/org/scalatest/AlerterSpec.scala     |   0
 .../AllOfContainMatcherDeciderSpec.scala      |   0
 .../AllOfContainMatcherEqualitySpec.scala     |   0
 .../scalatest/AllOfContainMatcherSpec.scala   |   0
 .../scala/org/scalatest/AllSuiteProp.scala    |   0
 .../scala/org/scalatest/AnMatcherSpec.scala   |   0
 .../org/scalatest/AnyValMatchersSpec.scala    |   0
 .../org/scalatest/AppendedCluesSpec.scala     |   0
 .../test/scala/org/scalatest/ArgsSpec.scala   |   0
 .../scala/org/scalatest/AssertionsSpec.scala  |   0
 .../BeforeAndAfterAllConfigMapSpec.scala      |   0
 .../org/scalatest/BeforeAndAfterAllProp.scala |   0
 .../org/scalatest/BeforeAndAfterAllSpec.scala |   0
 .../scalatest/BeforeAndAfterConfigSuite.scala |   0
 .../BeforeAndAfterEachTestDataSuite.scala     |   0
 .../org/scalatest/BeforeAndAfterSuite.scala   |   0
 .../org/scalatest/BeforeNAfterSuite.scala     |   0
 .../test/scala/org/scalatest/BigSuite.scala   |   0
 .../scala/org/scalatest/BigSuiteSuite.scala   |   0
 .../org/scalatest/BookPropertyMatchers.scala  |   0
 .../scalatest/CancelAfterFailureSpec.scala    |   0
 .../org/scalatest/CatchReporterProp.scala     |   0
 .../org/scalatest/CatchReporterSpec.scala     |   0
 .../scala/org/scalatest/CheckpointsSpec.scala |   0
 .../org/scalatest/ClassTaggingProp.scala      |   0
 .../test/scala/org/scalatest/ClueSpec.scala   |   0
 .../scala/org/scalatest/ConfigMapSpec.scala   |   0
 .../scalatest/ConfigMapWrapperSuiteSpec.scala |   0
 .../ContainMatcherAndOrDeciderSpec.scala      |   0
 .../ContainMatcherAndOrEqualitySpec.scala     |   0
 ...tainMatcherAndOrExplicitEqualitySpec.scala |   0
 .../scalatest/ContainMatcherAndOrSpec.scala   |   0
 .../ConversionCheckedAssertionsSpec.scala     |   0
 .../org/scalatest/CustomMatcherSpec.scala     |   0
 .../scalatest/DiagrammedAssertionsSpec.scala  |   0
 .../org/scalatest/DispatchReporterSpec.scala  |   0
 .../scala/org/scalatest/DocSpecSpec.scala     |   0
 .../test/scala/org/scalatest/EasySuite.scala  |   0
 .../org/scalatest/EitherValuesSpec.scala      |   0
 .../test/scala/org/scalatest/EmptyMocks.scala |   0
 .../org/scalatest/EncodedOrderingSpec.scala   |   0
 .../test/scala/org/scalatest/EngineSpec.scala |   0
 .../test/scala/org/scalatest/EntrySpec.scala  |   0
 .../scala/org/scalatest/EventHelpers.scala    |   0
 .../org/scalatest/EveryLoneElementSpec.scala  |   0
 ...veryShouldContainAllOfLogicalAndSpec.scala |   0
 ...EveryShouldContainAllOfLogicalOrSpec.scala |   0
 .../EveryShouldContainAllOfSpec.scala         |   0
 ...uldContainAtLeastOneOfLogicalAndSpec.scala |   0
 ...ouldContainAtLeastOneOfLogicalOrSpec.scala |   0
 .../EveryShouldContainAtLeastOneOfSpec.scala  |   0
 ...ouldContainAtMostOneOfLogicalAndSpec.scala |   0
 ...houldContainAtMostOneOfLogicalOrSpec.scala |   0
 .../EveryShouldContainAtMostOneOfSpec.scala   |   0
 ...ryShouldContainInOrderLogicalAndSpec.scala |   0
 ...eryShouldContainInOrderLogicalOrSpec.scala |   0
 ...ouldContainInOrderOnlyLogicalAndSpec.scala |   0
 ...houldContainInOrderOnlyLogicalOrSpec.scala |   0
 .../EveryShouldContainInOrderOnlySpec.scala   |   0
 .../EveryShouldContainInOrderSpec.scala       |   0
 ...eryShouldContainNoneOfLogicalAndSpec.scala |   0
 ...veryShouldContainNoneOfLogicalOrSpec.scala |   0
 .../EveryShouldContainNoneOfSpec.scala        |   0
 ...veryShouldContainOneOfLogicalAndSpec.scala |   0
 ...EveryShouldContainOneOfLogicalOrSpec.scala |   0
 .../EveryShouldContainOneOfSpec.scala         |   0
 ...EveryShouldContainOnlyLogicalAndSpec.scala |   0
 .../EveryShouldContainOnlyLogicalOrSpec.scala |   0
 .../EveryShouldContainOnlySpec.scala          |   0
 .../scalatest/EveryShouldContainSpec.scala    |   0
 ...ntainTheSameElementsAsLogicalAndSpec.scala |   0
 ...ontainTheSameElementsAsLogicalOrSpec.scala |   0
 ...ryShouldContainTheSameElementsAsSpec.scala |   0
 ...eSameElementsInOrderAsLogicalAndSpec.scala |   0
 ...heSameElementsInOrderAsLogicalOrSpec.scala |   0
 ...dContainTheSameElementsInOrderAsSpec.scala |   0
 .../ExampleBeforeAfterParallelSpec.scala      |   0
 .../org/scalatest/ExampleParallelSpec.scala   |   0
 .../org/scalatest/ExampleStackSpec.scala      |   0
 .../scalatest/ExampleSuiteTimeoutSpec.scala   |   0
 .../ExampleTimeoutParallelSpec.scala          |   0
 .../scala/org/scalatest/ExamplesSuite.scala   |   0
 .../org/scalatest/FailureMessagesSuite.scala  |   0
 .../scala/org/scalatest/FeatureSpecSpec.scala |   0
 .../test/scala/org/scalatest/FileMocks.scala  |   0
 .../test/scala/org/scalatest/FilterProp.scala |   0
 .../test/scala/org/scalatest/FilterSpec.scala |   0
 .../FlatSpecImportedMatchersSpec.scala        |   0
 .../FlatSpecMixedInMatchersSpec.scala         |   0
 .../scala/org/scalatest/FlatSpecSpec.scala    |   0
 .../scala/org/scalatest/FreeSpecSpec.scala    |   0
 .../test/scala/org/scalatest/FruitMocks.scala |   0
 .../scala/org/scalatest/FunSpecSpec.scala     |   0
 .../scala/org/scalatest/FunSpecSuite.scala    |   0
 .../scala/org/scalatest/FunSuiteSpec.scala    |   0
 .../scala/org/scalatest/FunSuiteSuite.scala   |   0
 .../org/scalatest/FunctionSuiteExamples.scala |   0
 .../org/scalatest/FunctionSuiteProp.scala     |   0
 .../org/scalatest/GivenWhenThenSpec.scala     |   0
 .../InOrderContainMatcherDeciderSpec.scala    |   0
 .../InOrderContainMatcherEqualitySpec.scala   |   0
 .../scalatest/InOrderContainMatcherSpec.scala |   0
 ...InOrderOnlyContainMatcherDeciderSpec.scala |   0
 ...nOrderOnlyContainMatcherEqualitySpec.scala |   0
 .../InOrderOnlyContainMatcherSpec.scala       |   0
 .../scala/org/scalatest/InformerSpec.scala    |   0
 .../org/scalatest/InheritedTagProp.scala      |   0
 .../scala/org/scalatest/InsideMixinSpec.scala |   0
 .../test/scala/org/scalatest/InsideSpec.scala |   0
 ...spectorShorthandsRegexWithGroupsSpec.scala |   0
 .../scalatest/InspectorShorthandsSpec.scala   |   0
 .../org/scalatest/InspectorsForMapSpec.scala  |   0
 .../scala/org/scalatest/InspectorsSpec.scala  |   0
 .../org/scalatest/ListLoneElementSpec.scala   |   0
 .../ListShouldBeEmptyLogicalAndSpec.scala     |   0
 .../ListShouldBeEmptyLogicalOrSpec.scala      |   0
 .../org/scalatest/ListShouldBeEmptySpec.scala |   0
 ...ListShouldContainAllOfLogicalAndSpec.scala |   0
 .../ListShouldContainAllOfLogicalOrSpec.scala |   0
 .../ListShouldContainAllOfSpec.scala          |   0
 ...uldContainAtLeastOneOfLogicalAndSpec.scala |   0
 ...ouldContainAtLeastOneOfLogicalOrSpec.scala |   0
 .../ListShouldContainAtLeastOneOfSpec.scala   |   0
 ...ouldContainAtMostOneOfLogicalAndSpec.scala |   0
 ...houldContainAtMostOneOfLogicalOrSpec.scala |   0
 .../ListShouldContainAtMostOneOfSpec.scala    |   0
 ...stShouldContainInOrderLogicalAndSpec.scala |   0
 ...istShouldContainInOrderLogicalOrSpec.scala |   0
 ...ouldContainInOrderOnlyLogicalAndSpec.scala |   0
 ...houldContainInOrderOnlyLogicalOrSpec.scala |   0
 .../ListShouldContainInOrderOnlySpec.scala    |   0
 .../ListShouldContainInOrderSpec.scala        |   0
 ...istShouldContainNoneOfLogicalAndSpec.scala |   0
 ...ListShouldContainNoneOfLogicalOrSpec.scala |   0
 .../ListShouldContainNoneOfSpec.scala         |   0
 ...ListShouldContainOneOfLogicalAndSpec.scala |   0
 .../ListShouldContainOneOfLogicalOrSpec.scala |   0
 .../ListShouldContainOneOfSpec.scala          |   0
 .../ListShouldContainOnlyLogicalAndSpec.scala |   0
 .../ListShouldContainOnlyLogicalOrSpec.scala  |   0
 .../scalatest/ListShouldContainOnlySpec.scala |   0
 .../org/scalatest/ListShouldContainSpec.scala |   0
 ...ntainTheSameElementsAsLogicalAndSpec.scala |   0
 ...ontainTheSameElementsAsLogicalOrSpec.scala |   0
 ...stShouldContainTheSameElementsAsSpec.scala |   0
 ...eSameElementsInOrderAsLogicalAndSpec.scala |   0
 ...heSameElementsInOrderAsLogicalOrSpec.scala |   0
 ...dContainTheSameElementsInOrderAsSpec.scala |   0
 .../scalatest/MapShouldBeDefinedAtSpec.scala  |   0
 .../scala/org/scalatest/MatcherGenSpec.scala  |   0
 .../scala/org/scalatest/MatchersSpec.scala    |   0
 .../org/scalatest/MethodSuiteExamples.scala   |   0
 .../scala/org/scalatest/MethodSuiteProp.scala |   0
 .../NonImplicitAssertionsSuite.scala          |   0
 .../NoneOfContainMatcherDeciderSpec.scala     |   0
 .../NoneOfContainMatcherEqualitySpec.scala    |   0
 .../scalatest/NoneOfContainMatcherSpec.scala  |   0
 .../scala/org/scalatest/NotifierSpec.scala    |   0
 .../test/scala/org/scalatest/OldDocSpec.scala |   0
 .../scalatest/OneInstancePerTestSpec.scala    |   0
 .../OneOfContainMatcherDeciderSpec.scala      |   0
 .../OneOfContainMatcherEqualitySpec.scala     |   0
 .../scalatest/OneOfContainMatcherSpec.scala   |   0
 .../OnlyContainMatcherDeciderSpec.scala       |   0
 .../OnlyContainMatcherEqualitySpec.scala      |   0
 .../scalatest/OnlyContainMatcherSpec.scala    |   0
 .../scala/org/scalatest/OperatorNames.scala   |   0
 ...tionShouldContainOneOfLogicalAndSpec.scala |   0
 ...ptionShouldContainOneOfLogicalOrSpec.scala |   0
 .../OptionShouldContainOneOfSpec.scala        |   0
 .../scalatest/OptionShouldContainSpec.scala   |   0
 .../org/scalatest/OptionValuesSpec.scala      |   0
 .../scala/org/scalatest/OutcomeSpec.scala     |   0
 .../ParallelTestExecutionInfoExamples.scala   |   0
 .../ParallelTestExecutionOrderExamples.scala  |   0
 ...elTestExecutionParallelSuiteExamples.scala |   0
 .../scalatest/ParallelTestExecutionProp.scala |   0
 .../scalatest/ParallelTestExecutionSpec.scala |   0
 ...lelTestExecutionSuiteTimeoutExamples.scala |   0
 ...llelTestExecutionTestTimeoutExamples.scala |   0
 .../scalatest/PartialFunctionValuesSpec.scala |   0
 .../scala/org/scalatest/PrettyAstSpec.scala   |   0
 .../scalatest/PrivateMethodTesterSpec.scala   |   0
 .../scala/org/scalatest/PropSpecSpec.scala    |   0
 .../org/scalatest/PropertyFunSuite.scala      |   0
 .../org/scalatest/RandomTestOrderSpec.scala   |   0
 .../scala/org/scalatest/RetriesSpec.scala     |   0
 .../ReturnsNormallyThrowsAssertion.scala      |   0
 .../org/scalatest/RunInSpurtsSpec1.scala      |   0
 .../org/scalatest/RunInSpurtsSpec2.scala      |   0
 .../scala/org/scalatest/RunningTestSpec.scala |   0
 .../org/scalatest/SavesConfigMapSuite.scala   |   0
 .../SequentialNestedSuiteExecutionSpec.scala  |   0
 .../SeveredStackTracesFailureSpec.scala       |   0
 .../scalatest/SeveredStackTracesSpec.scala    |   0
 .../test/scala/org/scalatest/ShellSuite.scala |   0
 .../ShorthandShouldBeThrownBySpec.scala       |   0
 .../ShorthandShouldNotBeThrownBySpec.scala    |   0
 .../scalatest/ShouldBeAMatcherAndOrSpec.scala |   0
 .../org/scalatest/ShouldBeASymbolSpec.scala   |   0
 .../org/scalatest/ShouldBeATypeSpec.scala     |   0
 .../ShouldBeAnMatcherAndOrSpec.scala          |   0
 .../org/scalatest/ShouldBeAnSymbolSpec.scala  |   0
 .../org/scalatest/ShouldBeAnTypeSpec.scala    |   0
 .../scala/org/scalatest/ShouldBeAnySpec.scala |   0
 .../ShouldBeDefinedAtForAllSpec.scala         |   0
 .../org/scalatest/ShouldBeDefinedAtSpec.scala |   0
 .../ShouldBeDefinedExplicitSpec.scala         |   0
 .../ShouldBeDefinedImplicitSpec.scala         |   0
 ...houldBeDefinedLogicalAndExplicitSpec.scala |   0
 ...houldBeDefinedLogicalAndImplicitSpec.scala |   0
 .../ShouldBeDefinedLogicalAndSpec.scala       |   0
 ...ShouldBeDefinedLogicalOrExplicitSpec.scala |   0
 ...ShouldBeDefinedLogicalOrImplicitSpec.scala |   0
 .../ShouldBeDefinedLogicalOrSpec.scala        |   0
 .../org/scalatest/ShouldBeDefinedSpec.scala   |   0
 ...uldBeDefinedStructuralLogicalAndSpec.scala |   0
 ...ouldBeDefinedStructuralLogicalOrSpec.scala |   0
 .../ShouldBeDefinedStructuralSpec.scala       |   0
 .../scalatest/ShouldBeEmptyExplicitSpec.scala |   0
 .../scalatest/ShouldBeEmptyImplicitSpec.scala |   0
 .../ShouldBeEmptyLogicalAndExplicitSpec.scala |   0
 .../ShouldBeEmptyLogicalAndImplicitSpec.scala |   0
 .../ShouldBeEmptyLogicalOrExplicitSpec.scala  |   0
 .../ShouldBeEmptyLogicalOrImplicitSpec.scala  |   0
 ...houldBeEmptyStructuralLogicalAndSpec.scala |   0
 ...ShouldBeEmptyStructuralLogicalOrSpec.scala |   0
 .../ShouldBeEmptyStructuralSpec.scala         |   0
 .../org/scalatest/ShouldBeMatcherSpec.scala   |   0
 .../org/scalatest/ShouldBeNullSpec.scala      |   0
 .../ShouldBePropertyMatcherSpec.scala         |   0
 .../ShouldBeReadableExplicitSpec.scala        |   0
 .../ShouldBeReadableImplicitSpec.scala        |   0
 ...ouldBeReadableLogicalAndExplicitSpec.scala |   0
 ...ouldBeReadableLogicalAndImplicitSpec.scala |   0
 .../ShouldBeReadableLogicalAndSpec.scala      |   0
 ...houldBeReadableLogicalOrExplicitSpec.scala |   0
 ...houldBeReadableLogicalOrImplicitSpec.scala |   0
 .../ShouldBeReadableLogicalOrSpec.scala       |   0
 .../org/scalatest/ShouldBeReadableSpec.scala  |   0
 ...ldBeReadableStructuralLogicalAndSpec.scala |   0
 ...uldBeReadableStructuralLogicalOrSpec.scala |   0
 .../ShouldBeReadableStructuralSpec.scala      |   0
 .../ShouldBeShorthandForAllSpec.scala         |   0
 .../org/scalatest/ShouldBeShorthandSpec.scala |   0
 .../ShouldBeSortedLogicalAndSpec.scala        |   0
 .../ShouldBeSortedLogicalOrSpec.scala         |   0
 .../org/scalatest/ShouldBeSortedSpec.scala    |   0
 .../org/scalatest/ShouldBeSymbolSpec.scala    |   0
 .../org/scalatest/ShouldBeThrownBySpec.scala  |   0
 .../ShouldBeWritableExplicitSpec.scala        |   0
 .../ShouldBeWritableImplicitSpec.scala        |   0
 ...ouldBeWritableLogicalAndExplicitSpec.scala |   0
 ...ouldBeWritableLogicalAndImplicitSpec.scala |   0
 .../ShouldBeWritableLogicalAndSpec.scala      |   0
 ...houldBeWritableLogicalOrExplicitSpec.scala |   0
 ...houldBeWritableLogicalOrImplicitSpec.scala |   0
 .../ShouldBeWritableLogicalOrSpec.scala       |   0
 .../org/scalatest/ShouldBeWritableSpec.scala  |   0
 ...ldBeWritableStructuralLogicalAndSpec.scala |   0
 ...uldBeWritableStructuralLogicalOrSpec.scala |   0
 .../ShouldBeWritableStructuralSpec.scala      |   0
 .../org/scalatest/ShouldBehaveLikeSpec.scala  |   0
 .../ShouldCollectedTripleEqualsSpec.scala     |   0
 ...ldCollectedTripleEqualsToleranceSpec.scala |   0
 .../org/scalatest/ShouldCompileSpec.scala     |   0
 .../ShouldContainElementNewSpec.scala         |   0
 .../scalatest/ShouldContainElementSpec.scala  |   0
 .../org/scalatest/ShouldContainKeySpec.scala  |   0
 .../scalatest/ShouldContainValueSpec.scala    |   0
 ...rsionCheckedTripleEqualsEqualitySpec.scala |   0
 .../scalatest/ShouldEndWithRegexSpec.scala    |   0
 .../ShouldEndWithSubstringSpec.scala          |   0
 .../scalatest/ShouldEqualEqualitySpec.scala   |   0
 .../scalatest/ShouldEqualExplicitlySpec.scala |   0
 .../org/scalatest/ShouldEqualNullSpec.scala   |   0
 .../scala/org/scalatest/ShouldEqualSpec.scala |   0
 .../ShouldEqualTokenToleranceSpec.scala       |   0
 .../scalatest/ShouldEqualToleranceSpec.scala  |   0
 .../scalatest/ShouldExistExplicitSpec.scala   |   0
 .../scalatest/ShouldExistImplicitSpec.scala   |   0
 .../ShouldExistLogicalAndExplicitSpec.scala   |   0
 .../ShouldExistLogicalAndImplicitSpec.scala   |   0
 .../scalatest/ShouldExistLogicalAndSpec.scala |   0
 .../ShouldExistLogicalOrExplicitSpec.scala    |   0
 .../ShouldExistLogicalOrImplicitSpec.scala    |   0
 .../scalatest/ShouldExistLogicalOrSpec.scala  |   0
 .../scala/org/scalatest/ShouldExistSpec.scala |   0
 .../ShouldFileBePropertyMatcherSpec.scala     |   0
 .../org/scalatest/ShouldFullyMatchSpec.scala  |   0
 .../scalatest/ShouldHavePropertiesSpec.scala  |   0
 .../scalatest/ShouldIncludeRegexSpec.scala    |   0
 .../ShouldIncludeSubstringSpec.scala          |   0
 .../org/scalatest/ShouldLengthSizeSpec.scala  |   0
 .../org/scalatest/ShouldLengthSpec.scala      |   0
 .../ShouldLogicalMatcherExprSpec.scala        |   0
 .../scalatest/ShouldMatchPatternSpec.scala    |   0
 .../org/scalatest/ShouldMatcherSpec.scala     |   0
 .../org/scalatest/ShouldMessageSpec.scala     |   0
 .../scalatest/ShouldNotBeThrownBySpec.scala   |   0
 .../org/scalatest/ShouldNotCompileSpec.scala  |   0
 .../ShouldNotShorthandForAllSpec.scala        |   0
 .../scalatest/ShouldNotShorthandSpec.scala    |   0
 .../scalatest/ShouldNotTypeCheckSpec.scala    |   0
 .../org/scalatest/ShouldOrderedSpec.scala     |   0
 .../org/scalatest/ShouldPlusOrMinusSpec.scala |   0
 .../scalatest/ShouldSameInstanceAsSpec.scala  |   0
 .../scala/org/scalatest/ShouldSizeSpec.scala  |   0
 .../scalatest/ShouldStartWithRegexSpec.scala  |   0
 .../ShouldStartWithSubstringSpec.scala        |   0
 .../ShouldStructuralLengthSpec.scala          |   0
 .../scalatest/ShouldStructuralSizeSpec.scala  |   0
 .../scala/org/scalatest/ShouldThrowSpec.scala |   0
 .../ShouldTripleEqualsEqualitySpec.scala      |   0
 .../scalatest/ShouldTripleEqualsSpec.scala    |   0
 .../ShouldTripleEqualsToleranceSpec.scala     |   0
 ...dTypeCheckedTripleEqualsEqualitySpec.scala |   0
 .../org/scalatest/SlowpokeDetectorSpec.scala  |   0
 .../test/scala/org/scalatest/SpecSpec.scala   |   0
 .../org/scalatest/StatefulStatusSpec.scala    |   0
 .../test/scala/org/scalatest/StatusProp.scala |   0
 .../test/scala/org/scalatest/StatusSpec.scala |   0
 .../StepwiseNestedSuiteExecutionSpec.scala    |   0
 .../org/scalatest/StopOnFailureProp.scala     |   0
 .../org/scalatest/StopOnFailureSpec.scala     |   0
 .../StreamlinedXmlEqualitySpec.scala          |   0
 .../StreamlinedXmlNormMethodsSpec.scala       |   0
 .../org/scalatest/StreamlinedXmlSpec.scala    |   0
 .../scala/org/scalatest/StringFixture.scala   |   0
 .../org/scalatest/StringLoneElementSpec.scala |   0
 .../scala/org/scalatest/StubReporter.scala    |   0
 .../SuiteCompletedStatusReporter.scala        |   0
 .../scala/org/scalatest/SuiteExamples.scala   |   0
 .../test/scala/org/scalatest/SuiteProp.scala  |   0
 .../test/scala/org/scalatest/SuiteSpec.scala  |   0
 .../test/scala/org/scalatest/SuiteSuite.scala |   0
 .../test/scala/org/scalatest/SuitesSpec.scala |   0
 .../scala/org/scalatest/TagGroupsSpec.scala   |   0
 .../org/scalatest/TaggingScopesSpec.scala     |   0
 .../org/scalatest/TestColonEscapeProp.scala   |   0
 .../scala/org/scalatest/TestDataProp.scala    |   0
 .../scala/org/scalatest/TestNameProp.scala    |   0
 ...eElementsAsContainMatcherDeciderSpec.scala |   0
 ...ElementsAsContainMatcherEqualitySpec.scala |   0
 .../TheSameElementsAsContainMatcherSpec.scala |   0
 ...tsInOrderAsContainMatcherDeciderSpec.scala |   0
 ...sInOrderAsContainMatcherEqualitySpec.scala |   0
 ...eElementsInOrderAsContainMatcherSpec.scala |   0
 .../scala/org/scalatest/ThreadNameSpec.scala  |   0
 .../scala/org/scalatest/TryValuesSpec.scala   |   0
 .../scalatest/TypeCheckedAssertionsSpec.scala |   0
 .../test/scala/org/scalatest/UnitSpec.scala   |   0
 .../scala/org/scalatest/VariousWordSpec.scala |   0
 .../WordSpecImportedMatchersSpec.scala        |   0
 .../WordSpecMixedInMatchersSpec.scala         |   0
 .../scala/org/scalatest/WordSpecSpec.scala    |   0
 .../concurrent/AsyncAssertionsSpec.scala      |   0
 .../concurrent/ConductorFixtureSuite.scala    |   0
 .../concurrent/ConductorMethodsSuite.scala    |   0
 .../scalatest/concurrent/ConductorSuite.scala |   0
 .../org/scalatest/concurrent/DoOver.scala     |   0
 .../scalatest/concurrent/DoOverSuite.scala    |   0
 .../scalatest/concurrent/EventuallySpec.scala |   0
 .../scalatest/concurrent/FuturesSpec.scala    |   0
 .../concurrent/IntegrationPatienceSpec.scala  |   0
 .../concurrent/JavaFuturesSpec.scala          |   0
 .../PatienceConfigurationSpec.scala           |   0
 .../concurrent/ScalaFuturesSpec.scala         |   0
 .../concurrent/ScaledTimeSpansSpec.scala      |   0
 .../TestThreadsStartingCounterSpec.scala      |   0
 .../concurrent/TimeLimitedTestsSpec.scala     |   0
 .../scalatest/concurrent/TimeoutsSpec.scala   |   0
 .../scalatest/enablers/CollectingSpec.scala   |   0
 .../org/scalatest/enablers/NoParamSpec.scala  |   0
 .../org/scalatest/events/EventSpec.scala      |   0
 .../events/LocationFunctionSuiteProp.scala    |   0
 .../events/LocationMethodSuiteProp.scala      |   0
 .../org/scalatest/events/LocationSpec.scala   |   0
 .../scalatest/events/LocationSuiteProp.scala  |   0
 .../org/scalatest/events/OrdinalSpec.scala    |   0
 .../scalatest/events/ScopePendingProp.scala   |   0
 .../events/TestLocationFunctionServices.scala |   0
 .../events/TestLocationJUnit3Suite.scala      |   0
 .../events/TestLocationJUnitSuite.scala       |   0
 .../TestLocationMethodJUnit3Suite.scala       |   0
 .../events/TestLocationMethodJUnitSuite.scala |   0
 .../events/TestLocationMethodServices.scala   |   0
 .../TestLocationMethodTestNGSuite.scala       |   0
 .../events/TestLocationServices.scala         |   0
 .../events/TestLocationTestNGSuite.scala      |   0
 .../examples/ExampleCancelInNestedSuite.scala |   0
 .../events/examples/ExampleCancelSpec.scala   |   0
 ...venPropertyCheckFailedExceptionSuite.scala |   0
 .../scalatest/exceptions/PayloadSpec.scala    |   0
 .../exceptions/StackDepthExceptionSpec.scala  |   0
 ...ivenPropertyCheckFailedExceptionSpec.scala |   0
 .../TestCanceledExceptionSpec.scala           |   0
 .../exceptions/TestFailedExceptionSpec.scala  |   0
 .../TestFailedExceptionWithImportSpec.scala   |   0
 .../fixture/ConfigMapFixtureSpec.scala        |   0
 .../scalatest/fixture/FeatureSpecSpec.scala   |   0
 .../FlatSpecImportedMatchersSpec.scala        |   0
 .../fixture/FlatSpecMixedInMatchersSpec.scala |   0
 .../org/scalatest/fixture/FlatSpecSpec.scala  |   0
 .../org/scalatest/fixture/FreeSpecSpec.scala  |   0
 .../org/scalatest/fixture/FunSpecSpec.scala   |   0
 .../org/scalatest/fixture/FunSuiteSpec.scala  |   0
 .../fixture/NoArgAlternativeSpec.scala        |   0
 .../org/scalatest/fixture/NoArgSpec.scala     |   0
 .../org/scalatest/fixture/PropSpecSpec.scala  |   0
 .../org/scalatest/fixture/SpecSpec.scala      |   0
 .../org/scalatest/fixture/SuiteSpec.scala     |   0
 .../fixture/TestDataFixtureSpec.scala         |   0
 .../scalatest/fixture/UnitFixtureSpec.scala   |   0
 .../WordSpecImportedMatchersSpec.scala        |   0
 .../fixture/WordSpecMixedInMatchersSpec.scala |   0
 .../org/scalatest/fixture/WordSpecSpec.scala  |   0
 .../scalatest/jmock/SuiteExpectations.scala   |   0
 .../org/scalatest/jmock/TestReporter.scala    |   0
 .../junit/AssertionsForJUnitWordSpec.scala    |   0
 .../org/scalatest/junit/JUnit3SuiteSpec.scala |   0
 .../scalatest/junit/JUnitRunnerSuite.scala    |   0
 .../org/scalatest/junit/JUnitSuiteSpec.scala  |   0
 .../org/scalatest/junit/JUnitSuiteSuite.scala |   0
 .../junit/JUnitTestFailedErrorSpec.scala      |   0
 .../junit/JUnitWrapperSuiteSuite.scala        |   0
 .../scalatest/junit/RunNotifierSuite.scala    |   0
 .../junit/helpers/TestWasCalledSuite.scala    |   0
 .../junit4helpers/TestWasCalledSuite.scala    |   0
 .../org/scalatest/matchers/AMatcherSpec.scala |   0
 .../scalatest/matchers/AnMatcherSpec.scala    |   0
 .../scalatest/matchers/BeMatcherSpec.scala    |   0
 .../matchers/BePropertyMatcherSpec.scala      |   0
 .../matchers/BookPropertyMatchers.scala       |   0
 .../matchers/HavePropertyMatcherSpec.scala    |   0
 .../org/scalatest/matchers/LazyArgSpec.scala  |   0
 .../scalatest/matchers/MatchResultSpec.scala  |   0
 .../matchers/MatcherFactorySpec.scala         |   0
 .../matchers/MatcherProducersSpec.scala       |   0
 .../org/scalatest/matchers/MatcherSpec.scala  |   0
 .../matchers/MatcherToStringSpec.scala        |   0
 .../matchers/ShouldAndMustSpec.scala          |   0
 .../matchers/ShouldBehaveLikeSpec.scala       |   0
 .../matchers/ShouldEndWithRegexSpec.OLD       |   0
 .../matchers/ShouldHavePropertiesSpec.OLD     |   0
 .../matchers/ShouldIncludeRegexSpec.OLD       |   0
 .../scalatest/mock/EasyMockSugarSpec.scala    |   0
 .../org/scalatest/mock/JMockCycleSpec.scala   |   0
 .../test/scala/org/scalatest/mytags.scala     |   0
 .../org/scalatest/path/ExampleLikeSpecs.scala |   0
 .../org/scalatest/path/FreeSpecSpec.scala     |   0
 .../org/scalatest/path/FunSpecSpec.scala      |   0
 .../scala/org/scalatest/path/StackSpec.scala  |   0
 .../org/scalatest/prop/CheckersSuite.scala    |   0
 .../scalatest/prop/ConfigurationSuite.scala   |   0
 .../org/scalatest/prop/HelperSuite.scala      |   0
 .../prop/PropertyCheckConfigParamSuite.scala  |   0
 .../prop/PropertyCheckConfigSuite.scala       |   0
 .../org/scalatest/prop/TableStyleSpec.scala   |   0
 .../org/scalatest/selenium/DriverSpec.scala   |   0
 .../org/scalatest/selenium/JettySpec.scala    |   0
 .../scalatest/selenium/ScreenshotSpec.scala   |   0
 .../scalatest/selenium/WebBrowserSpec.scala   |   0
 .../suiteprop/FirstTestIgnoredExamples.scala  |   0
 ...InfoInsideTestFiredAfterTestExamples.scala |   0
 ...yFirstTestExecutedOnCreationExamples.scala |   0
 .../PathBeforeAndAfterExamples.scala          |   0
 .../suiteprop/PathListBufferExamples.scala    |   0
 .../suiteprop/PathSuiteExamples.scala         |   0
 .../scalatest/suiteprop/PathSuiteMatrix.scala |   0
 .../suiteprop/SecondTestIgnoredExamples.scala |   0
 .../scalatest/suiteprop/SuiteExamples.scala   |   0
 .../org/scalatest/suiteprop/SuiteMatrix.scala |   0
 .../TwoSlowAndOneWeakTestExamples.scala       |   0
 .../suiteprop/TwoSlowTestsExample.scala       |   0
 .../suiteprop/TwoTestsIgnoredExamples.scala   |   0
 .../testng/TestNGSuiteGroupsSuite.scala       |   0
 .../scalatest/testng/TestNGSuiteSuite.scala   |   0
 .../testng/TestNGWrapperSuiteSuite.scala      |   0
 .../testng/example/ExampleTestNGSuite.scala   |   0
 .../example/ExampleTestNGWrapperSuite.scala   |   0
 .../scalatest/testng/example/testngsuite.xml  |   0
 .../org/scalatest/time/DurationSpec.scala     |   0
 .../org/scalatest/time/SpanMatchers.scala     |   0
 .../scala/org/scalatest/time/SpanSpec.scala   |   0
 .../org/scalatest/time/SpanSugarSpec.scala    |   0
 .../tools/DashboardReporterSpec.scala         |   0
 .../scalatest/tools/DiscoverySuiteSuite.scala |   0
 .../scalatest/tools/FilterReporterSpec.scala  |   0
 .../org/scalatest/tools/FrameworkSuite.scala  |   0
 .../scalatest/tools/HtmlReporterSpec.scala    |   0
 .../tools/JUnitXmlReporterSuite.scala         |   0
 .../scalatest/tools/MemoryReporterSuite.scala |   0
 .../scalatest/tools/PrintReporterSuite.scala  |   0
 .../org/scalatest/tools/RunnerSpec.scala      |   2 +-
 .../tools/SbtCommandParserSpec.scala          |   0
 .../tools/ScalaTestAntTaskSpec.scala          |   0
 .../tools/ScalaTestFrameworkSuite.scala       |   0
 .../tools/ScalaTestRunnerSuite.scala          |   0
 .../org/scalatest/tools/SomeApiClass.scala    |   0
 .../scalatest/tools/SomeApiClassRunner.scala  |   0
 .../org/scalatest/tools/SomeApiSubClass.scala |   0
 .../tools/StringReporterAlertSpec.scala       |   0
 .../scalatest/tools/StringReporterSuite.scala |   0
 .../tools/StringReporterSummarySpec.scala     |   0
 .../tools/SuiteDiscoveryHelperSuite.scala     |   0
 .../tools/SuiteSortingReporterSpec.scala      |   0
 .../tools/TestSortingReporterSpec.scala       |   0
 .../tools/XmlSocketReporterSpec.scala         |   0
 .../scala/org/scalatest/tools/memoryfile.eg   |   0
 .../tools/scalasbt/AbortedSuite.scala         |   0
 .../tools/scalasbt/CPUTaggedSuite.scala       |   0
 .../tools/scalasbt/CustomTaggedSuite.scala    |   0
 .../tools/scalasbt/DiskTaggedSuite.scala      |   0
 .../tools/scalasbt/DoNotDiscoverSuite.scala   |   0
 .../tools/scalasbt/NestedConfigMapSuite.scala |   0
 .../tools/scalasbt/NetworkTaggedSuite.scala   |   0
 .../scalatest/tools/scalasbt/NotASuite.scala  |   0
 .../tools/scalasbt/SampleInheritedSuite.scala |   0
 .../tools/scalasbt/SampleSuite.scala          |   0
 .../tools/scalasbt/SlowSampleSuite.scala      |   0
 .../SuiteWithFailedCanceledTests.scala        |   0
 .../SuiteWithFailedSkippedTests.scala         |   0
 .../scalasbt/SuiteWithNestedSuites.scala      |   0
 .../org/scalatest/words/BeWordSpec.scala      |   0
 .../org/scalatest/words/BehaveWordSpec.scala  |   0
 .../org/scalatest/words/CanVerbSuite.scala    |   0
 .../org/scalatest/words/ContainWordSpec.scala |   0
 .../org/scalatest/words/DefinedWordSpec.scala |   0
 .../org/scalatest/words/EmptyWordSpec.scala   |   0
 .../org/scalatest/words/EndWithWordSpec.scala |   0
 .../org/scalatest/words/ExistWordSpec.scala   |   0
 .../scalatest/words/FullyMatchWordSpec.scala  |   0
 .../org/scalatest/words/HaveWordSpec.scala    |   0
 .../org/scalatest/words/IncludeWordSpec.scala |   0
 .../org/scalatest/words/LengthWordSpec.scala  |   0
 .../scalatest/words/MatcherWordsSpec.scala    |   0
 .../scalatest/words/NoExceptionWordSpec.scala |   0
 .../org/scalatest/words/NotWordSpec.scala     |   0
 .../scalatest/words/ReadableWordSpec.scala    |   0
 .../scalatest/words/RegexWithGroupsSpec.scala |   0
 .../words/ResultOfATypeInvocationSpec.scala   |   0
 ...sultOfAWordToAMatcherApplicationSpec.scala |   0
 ...rdToBePropertyMatcherApplicationSpec.scala |   0
 ...ResultOfAWordToSymbolApplicationSpec.scala |   0
 .../ResultOfAfterWordApplicationSpec.scala    |   0
 .../words/ResultOfAllOfApplicationSpec.scala  |   0
 .../words/ResultOfAnTypeInvocationSpec.scala  |   0
 ...ltOfAnWordToAnMatcherApplicationSpec.scala |   0
 ...rdToBePropertyMatcherApplicationSpec.scala |   0
 ...esultOfAnWordToSymbolApplicationSpec.scala |   0
 .../ResultOfAtLeastOneOfApplicationSpec.scala |   0
 .../ResultOfAtMostOneOfApplicationSpec.scala  |   0
 .../words/ResultOfBeWordForATypeSpec.scala    |   0
 .../words/ResultOfBeWordForAnTypeSpec.scala   |   0
 .../ResultOfBeWordForNoExceptionSpec.scala    |   0
 .../words/ResultOfContainWordSpec.scala       |   0
 .../words/ResultOfDefinedAtSpec.scala         |   0
 .../ResultOfGreaterThanComparisonSpec.scala   |   0
 ...OfGreaterThanOrEqualToComparisonSpec.scala |   0
 .../ResultOfInOrderApplicationSpec.scala      |   0
 .../ResultOfInOrderOnlyApplicationSpec.scala  |   0
 .../ResultOfKeyWordApplicationSpec.scala      |   0
 .../ResultOfLengthWordApplicationSpec.scala   |   0
 .../ResultOfLessThanComparisonSpec.scala      |   0
 ...ultOfLessThanOrEqualToComparisonSpec.scala |   0
 .../ResultOfMessageWordApplicationSpec.scala  |   0
 .../words/ResultOfNoneOfApplicationSpec.scala |   0
 .../words/ResultOfNotExistSpec.scala          |   0
 .../words/ResultOfNotWordForAnySpec.scala     |   0
 .../words/ResultOfOfTypeInvocationSpec.scala  |   0
 .../words/ResultOfOneOfApplicationSpec.scala  |   0
 .../words/ResultOfOnlyApplicationSpec.scala   |   0
 .../ResultOfRegexWordApplicationSpec.scala    |   0
 .../ResultOfSizeWordApplicationSpec.scala     |   0
 ...ltOfTheSameElementsAsApplicationSpec.scala |   0
 ...SameElementsInOrderAsApplicationSpec.scala |   0
 ...ltOfTheSameInstanceAsApplicationSpec.scala |   0
 .../words/ResultOfTheTypeInvocationSpec.scala |   0
 .../ResultOfThrownByApplicationSpec.scala     |   0
 .../ResultOfValueWordApplicationSpec.scala    |   0
 .../org/scalatest/words/SizeWordSpec.scala    |   0
 .../org/scalatest/words/SortedWordSpec.scala  |   0
 .../scalatest/words/StartWithWordSpec.scala   |   0
 .../scalatest/words/WritableWordSpec.scala    |   0
 {src => scalatest-test/src}/us/US.scala       |   0
 {src => scalatest-test/src}/us/readme.txt     |   0
 {src => scalatest-test/src}/us/runem.scala    |   0
 {src => scalatest/src}/main/html/addl.css     |   0
 .../src}/main/html/featureSpec.gif            | Bin
 {src => scalatest/src}/main/html/flatSpec.gif | Bin
 {src => scalatest/src}/main/html/freeSpec.gif | Bin
 {src => scalatest/src}/main/html/funSpec.gif  | Bin
 {src => scalatest/src}/main/html/funSuite.gif | Bin
 {src => scalatest/src}/main/html/propSpec.gif | Bin
 {src => scalatest/src}/main/html/spec.gif     | Bin
 {src => scalatest/src}/main/html/wordSpec.gif | Bin
 .../java/org/scalatest/DoNotDiscover.java     |   0
 .../src}/main/java/org/scalatest/Finders.java |   0
 .../src}/main/java/org/scalatest/Ignore.java  |   0
 .../java/org/scalatest/TagAnnotation.java     |   0
 .../main/java/org/scalatest/WrapWith.java     |   0
 .../main/java/org/scalatest/tags/CPU.java     |   0
 .../org/scalatest/tags/ChromeBrowser.java     |   0
 .../main/java/org/scalatest/tags/Disk.java    |   0
 .../org/scalatest/tags/FirefoxBrowser.java    |   0
 .../org/scalatest/tags/HtmlUnitBrowser.java   |   0
 .../tags/InternetExplorerBrowser.java         |   0
 .../main/java/org/scalatest/tags/Network.java |   0
 .../java/org/scalatest/tags/Retryable.java    |   0
 .../org/scalatest/tags/SafariBrowser.java     |   0
 .../main/java/org/scalatest/tags/Slow.java    |   0
 .../src}/main/resources/images/bluedot.gif    | Bin
 .../src}/main/resources/images/bluedots.psd   | Bin
 .../src}/main/resources/images/bluedotsel.gif | Bin
 .../src}/main/resources/images/cyandot.gif    | Bin
 .../src}/main/resources/images/cyandots.psd   | Bin
 .../src}/main/resources/images/cyandotsel.gif | Bin
 .../src}/main/resources/images/dots.psd       | Bin
 .../src}/main/resources/images/graybullet.gif | Bin
 .../src}/main/resources/images/graybullet.psd | Bin
 .../src}/main/resources/images/graydot.gif    | Bin
 .../src}/main/resources/images/graydots.psd   | Bin
 .../src}/main/resources/images/graydotsel.gif | Bin
 .../main/resources/images/greenbullet.gif     | Bin
 .../main/resources/images/greenbullet.psd     | Bin
 .../src}/main/resources/images/greendot.gif   | Bin
 .../src}/main/resources/images/greendots.psd  | Bin
 .../main/resources/images/greendotsel.gif     | Bin
 .../src}/main/resources/images/inProgress.gif | Bin
 .../src}/main/resources/images/purpledot.gif  | Bin
 .../src}/main/resources/images/purpledots.psd | Bin
 .../main/resources/images/purpledotsel.gif    | Bin
 .../src}/main/resources/images/redbullet.gif  | Bin
 .../src}/main/resources/images/redbullet.psd  | Bin
 .../src}/main/resources/images/reddot.gif     | Bin
 .../src}/main/resources/images/reddots.psd    | Bin
 .../src}/main/resources/images/reddotsel.gif  | Bin
 .../main/resources/images/yellowbullet.gif    | Bin
 .../main/resources/images/yellowbullet.psd    | Bin
 .../src}/main/resources/images/yellowdot.gif  | Bin
 .../src}/main/resources/images/yellowdots.psd | Bin
 .../main/resources/images/yellowdotsel.gif    | Bin
 .../org/scalactic/ScalacticBundle.properties  |  42 ++++++
 .../resources/org/scalatest/HtmlReporter.css  |   0
 .../org/scalatest/ScalaTestBundle.properties  |   0
 .../main/resources/org/scalatest/d3.v2.min.js |   0
 .../main/resources/org/scalatest/sorttable.js |   0
 .../main/scala/org/scalatest/Alerter.scala    |   0
 .../main/scala/org/scalatest/Alerting.scala   |   0
 .../scala/org/scalatest/AppendedClues.scala   |   0
 .../src}/main/scala/org/scalatest/Args.scala  |   0
 .../main/scala/org/scalatest/Assertions.scala |   0
 .../scala/org/scalatest/AssertionsMacro.scala |   0
 .../scala/org/scalatest/BeforeAndAfter.scala  |   0
 .../org/scalatest/BeforeAndAfterAll.scala     |   0
 .../BeforeAndAfterAllConfigMap.scala          |   0
 .../org/scalatest/BeforeAndAfterEach.scala    |   0
 .../BeforeAndAfterEachTestData.scala          |   0
 .../org/scalatest/CancelAfterFailure.scala    |   0
 .../scala/org/scalatest/CatchReporter.scala   |   0
 .../scala/org/scalatest/Checkpoints.scala     |   0
 .../scala/org/scalatest/CompileMacro.scala    |   0
 .../org/scalatest/ConcurrentInformer.scala    |   0
 .../main/scala/org/scalatest/ConfigMap.scala  |   0
 .../org/scalatest/ConfigMapWrapperSuite.scala |   0
 .../org/scalatest/DiagrammedAssertions.scala  |   0
 .../scalatest/DiagrammedAssertionsMacro.scala |   0
 .../scala/org/scalatest/DiagrammedExpr.scala  |   0
 .../org/scalatest/DiagrammedExprMacro.scala   |   0
 .../org/scalatest/DispatchReporter.scala      |   0
 .../scalatest/DistributedSuiteSorter.scala    |   0
 .../org/scalatest/DistributedTestSorter.scala |   0
 .../scala/org/scalatest/Distributor.scala     |   0
 .../src}/main/scala/org/scalatest/Doc.scala   |   0
 .../main/scala/org/scalatest/DocSpec.scala    |   0
 .../scala/org/scalatest/DocSpecLike.scala     |   0
 .../main/scala/org/scalatest/Documenter.scala |   0
 .../scala/org/scalatest/Documenting.scala     |   0
 .../main/scala/org/scalatest/DynaTags.scala   |   0
 .../scala/org/scalatest/EitherValues.scala    |   0
 .../scala/org/scalatest/EncodedOrdering.scala |   0
 .../main/scala/org/scalatest/Engine.scala     |   0
 .../src}/main/scala/org/scalatest/Entry.scala |   0
 .../scala/org/scalatest/FailureMessages.scala |   0
 .../scala/org/scalatest/FeatureSpec.scala     |   0
 .../scala/org/scalatest/FeatureSpecLike.scala |   0
 .../main/scala/org/scalatest/Filter.scala     |   0
 .../main/scala/org/scalatest/FlatSpec.scala   |   0
 .../scala/org/scalatest/FlatSpecLike.scala    |   0
 .../main/scala/org/scalatest/FreeSpec.scala   |   0
 .../scala/org/scalatest/FreeSpecLike.scala    |   0
 .../main/scala/org/scalatest/FunSpec.scala    |   0
 .../scala/org/scalatest/FunSpecLike.scala     |   0
 .../main/scala/org/scalatest/FunSuite.scala   |   0
 .../scala/org/scalatest/FunSuiteLike.scala    |   0
 .../scala/org/scalatest/GivenWhenThen.scala   |   0
 .../main/scala/org/scalatest/Informer.scala   |   0
 .../main/scala/org/scalatest/Informing.scala  |   0
 .../main/scala/org/scalatest/Inside.scala     |   0
 .../main/scala/org/scalatest/Inspectors.scala |   0
 .../main/scala/org/scalatest/JSuite.scala     |   0
 .../scala/org/scalatest/LoneElement.scala     |   0
 .../main/scala/org/scalatest/Matchers.scala   |   0
 .../scala/org/scalatest/MatchersHelper.scala  |   0
 .../org/scalatest/NonImplicitAssertions.scala |   0
 .../main/scala/org/scalatest/Notifier.scala   |   0
 .../main/scala/org/scalatest/Notifying.scala  |   0
 .../org/scalatest/OneInstancePerTest.scala    |   0
 .../scala/org/scalatest/OptionValues.scala    |   0
 .../main/scala/org/scalatest/Outcome.scala    |   0
 .../main/scala/org/scalatest/OutcomeOf.scala  |   0
 .../org/scalatest/ParallelTestExecution.scala |   0
 .../org/scalatest/PartialFunctionValues.scala |   0
 .../main/scala/org/scalatest/Payloads.scala   |   0
 .../scala/org/scalatest/PendingNothing.scala  |   0
 .../org/scalatest/PrivateMethodTester.scala   |   0
 .../main/scala/org/scalatest/PropSpec.scala   |   0
 .../scala/org/scalatest/PropSpecLike.scala    |   0
 .../scala/org/scalatest/RandomTestOrder.scala |   0
 .../main/scala/org/scalatest/Reporter.scala   |   0
 .../main/scala/org/scalatest/Rerunner.scala   |   0
 .../org/scalatest/ResourcefulReporter.scala   |   0
 .../main/scala/org/scalatest/Resources.scala  |   0
 .../main/scala/org/scalatest/Retries.scala    |   0
 .../scala/org/scalatest/RunningTest.scala     |   0
 .../org/scalatest/ScreenshotCapturer.scala    |   0
 .../org/scalatest/ScreenshotOnFailure.scala   |   0
 .../main/scala/org/scalatest/Sequential.scala |   0
 .../SequentialNestedSuiteExecution.scala      |   0
 .../org/scalatest/SeveredStackTraces.scala    |   0
 .../src}/main/scala/org/scalatest/Shell.scala |   0
 .../main/scala/org/scalatest/Slowpoke.scala   |   0
 .../org/scalatest/SlowpokeDetector.scala      |   0
 .../src}/main/scala/org/scalatest/Spec.scala  |   0
 .../main/scala/org/scalatest/SpecLike.scala   |   0
 .../main/scala/org/scalatest/Status.scala     |   0
 .../main/scala/org/scalatest/Stepwise.scala   |   0
 .../StepwiseNestedSuiteExecution.scala        |   0
 .../scala/org/scalatest/StopOnFailure.scala   |   0
 .../org/scalatest/StopOnFailureReporter.scala |   0
 .../main/scala/org/scalatest/Stopper.scala    |   0
 .../scala/org/scalatest/StreamlinedXml.scala  |   0
 .../scalatest/StreamlinedXmlEquality.scala    |   0
 .../scalatest/StreamlinedXmlNormMethods.scala |   0
 .../src}/main/scala/org/scalatest/Suite.scala |   0
 .../scala/org/scalatest/SuiteHelpers.scala    |   0
 .../main/scala/org/scalatest/SuiteMixin.scala |   0
 .../scala/org/scalatest/SuiteRerunner.scala   |   0
 .../main/scala/org/scalatest/Suites.scala     |   0
 .../src}/main/scala/org/scalatest/Tag.scala   |   0
 .../main/scala/org/scalatest/TestData.scala   |   0
 .../org/scalatest/TestRegistration.scala      |   0
 .../scala/org/scalatest/TestRerunner.scala    |   0
 .../main/scala/org/scalatest/Tracker.scala    |   0
 .../scala/org/scalatest/Transformer.scala     |   0
 .../main/scala/org/scalatest/TryValues.scala  |   0
 .../main/scala/org/scalatest/WordSpec.scala   |   0
 .../scala/org/scalatest/WordSpecLike.scala    |   0
 .../AbstractPatienceConfiguration.scala       |   0
 .../concurrent/AsyncAssertions.scala          |   0
 .../concurrent/ConductorFixture.scala         |   0
 .../concurrent/ConductorMethods.scala         |   0
 .../org/scalatest/concurrent/Conductors.scala |   0
 .../scalatest/concurrent/DoNotInterrupt.scala |   0
 .../org/scalatest/concurrent/Eventually.scala |   0
 .../org/scalatest/concurrent/Futures.scala    |   0
 .../concurrent/IntegrationPatience.scala      |   0
 .../scalatest/concurrent/Interruptor.scala    |   0
 .../scalatest/concurrent/JavaFutures.scala    |   0
 .../concurrent/PatienceConfiguration.scala    |   0
 .../concurrent/PimpedReadWriteLock.scala      |   0
 .../concurrent/PimpedThreadGroup.scala        |   0
 .../scalatest/concurrent/ScalaFutures.scala   |   0
 .../concurrent/ScaledTimeSpans.scala          |   0
 .../concurrent/SelectorInterruptor.scala      |   0
 .../concurrent/SocketInterruptor.scala        |   0
 .../TestThreadsStartingCounter.scala          |   0
 .../concurrent/ThreadInterruptor.scala        |   0
 .../concurrent/TimeLimitedTests.scala         |   0
 .../scalatest/concurrent/TimeoutTask.scala    |   0
 .../org/scalatest/concurrent/Timeouts.scala   |   0
 .../org/scalatest/enablers/Aggregating.scala  |   0
 .../org/scalatest/enablers/Collecting.scala   |   0
 .../org/scalatest/enablers/Containing.scala   |   0
 .../org/scalatest/enablers/Definition.scala   |   0
 .../org/scalatest/enablers/Emptiness.scala    |   0
 .../org/scalatest/enablers/Existence.scala    |   0
 .../org/scalatest/enablers/KeyMapping.scala   |   0
 .../scala/org/scalatest/enablers/Length.scala |   0
 .../org/scalatest/enablers/Messaging.scala    |   0
 .../org/scalatest/enablers/Readability.scala  |   0
 .../org/scalatest/enablers/Sequencing.scala   |   0
 .../scala/org/scalatest/enablers/Size.scala   |   0
 .../org/scalatest/enablers/Slicing.scala      |   0
 .../org/scalatest/enablers/Sortable.scala     |   0
 .../org/scalatest/enablers/ValueMapping.scala |   0
 .../org/scalatest/enablers/Writability.scala  |   0
 .../scala/org/scalatest/events/Event.scala    |   0
 .../org/scalatest/events/Formatter.scala      |   0
 .../scala/org/scalatest/events/Location.scala |   0
 .../scala/org/scalatest/events/NameInfo.scala |   0
 .../scala/org/scalatest/events/Ordinal.scala  |   0
 .../scala/org/scalatest/events/Summary.scala  |   0
 .../DiscardedEvaluationException.scala        |   0
 .../DuplicateTestNameException.scala          |   0
 ...orDrivenPropertyCheckFailedException.scala |   0
 .../exceptions/ModifiableMessage.scala        |   0
 .../exceptions/ModifiablePayload.scala        |   0
 .../exceptions/NotAllowedException.scala      |   0
 .../scalatest/exceptions/PayloadField.scala   |   0
 .../PropertyCheckFailedException.scala        |   0
 .../org/scalatest/exceptions/StackDepth.scala |   0
 .../exceptions/StackDepthException.scala      |   0
 ...leDrivenPropertyCheckFailedException.scala |   0
 .../exceptions/TestCanceledException.scala    |   0
 .../TestFailedDueToTimeoutException.scala     |   0
 .../exceptions/TestFailedException.scala      |   0
 .../exceptions/TestPendingException.scala     |   0
 .../TestRegistrationClosedException.scala     |   0
 .../scalatest/exceptions/TimeoutField.scala   |   0
 .../scalatest/fixture/ConfigMapFixture.scala  |   0
 .../org/scalatest/fixture/FeatureSpec.scala   |   0
 .../scalatest/fixture/FeatureSpecLike.scala   |   0
 .../scalatest/fixture/FixtureNodeFamily.scala |   0
 .../org/scalatest/fixture/FlatSpec.scala      |   0
 .../org/scalatest/fixture/FlatSpecLike.scala  |   0
 .../org/scalatest/fixture/FreeSpec.scala      |   0
 .../org/scalatest/fixture/FreeSpecLike.scala  |   0
 .../scala/org/scalatest/fixture/FunSpec.scala |   0
 .../org/scalatest/fixture/FunSpecLike.scala   |   0
 .../org/scalatest/fixture/FunSuite.scala      |   0
 .../org/scalatest/fixture/FunSuiteLike.scala  |   0
 .../scala/org/scalatest/fixture/NoArg.scala   |   0
 .../scalatest/fixture/NoArgTestWrapper.scala  |   0
 .../org/scalatest/fixture/PropSpec.scala      |   0
 .../org/scalatest/fixture/PropSpecLike.scala  |   0
 .../scala/org/scalatest/fixture/Spec.scala    |   0
 .../org/scalatest/fixture/SpecLike.scala      |   0
 .../scala/org/scalatest/fixture/Suite.scala   |   0
 .../scalatest/fixture/TestDataFixture.scala   |   0
 .../scalatest/fixture/TestRegistration.scala  |   0
 .../org/scalatest/fixture/Transformer.scala   |   0
 .../org/scalatest/fixture/UnitFixture.scala   |   0
 .../org/scalatest/fixture/WordSpec.scala      |   0
 .../org/scalatest/fixture/WordSpecLike.scala  |   0
 .../scalatest/junit/AssertionsForJUnit.scala  |   0
 .../org/scalatest/junit/JUnit3Suite.scala     |   0
 .../org/scalatest/junit/JUnitRunner.scala     |   0
 .../org/scalatest/junit/JUnitSuite.scala      |   0
 .../org/scalatest/junit/JUnitSuiteLike.scala  |   0
 .../junit/JUnitTestFailedError.scala          |   0
 .../scalatest/junit/JUnitWrapperSuite.scala   |   0
 .../org/scalatest/junit/MyRunListener.scala   |   0
 .../scalatest/junit/RunNotifierReporter.scala |   0
 .../org/scalatest/matchers/AMatcher.scala     |   0
 .../org/scalatest/matchers/AnMatcher.scala    |   0
 .../org/scalatest/matchers/BeMatcher.scala    |   0
 .../matchers/BePropertyMatchResult.scala      |   0
 .../matchers/BePropertyMatcher.scala          |   0
 .../matchers/HavePropertyMatchResult.scala    |   0
 .../matchers/HavePropertyMatcher.scala        |   0
 .../org/scalatest/matchers/LazyArg.scala      |   0
 .../org/scalatest/matchers/LazyMessage.scala  |   0
 .../org/scalatest/matchers/MatchFailed.scala  |   0
 .../matchers/MatchPatternHelper.scala         |   0
 .../matchers/MatchPatternMacro.scala          |   0
 .../org/scalatest/matchers/MatchResult.scala  |   0
 .../scalatest/matchers/MatchSucceeded.scala   |   0
 .../org/scalatest/matchers/Matcher.scala      |   0
 .../scalatest/matchers/MatcherProducers.scala |   0
 .../matchers/TypeMatcherHelper.scala          |   0
 .../scalatest/matchers/TypeMatcherMacro.scala |   0
 .../org/scalatest/mock/EasyMockSugar.scala    |   0
 .../scala/org/scalatest/mock/JMockCycle.scala |   0
 .../scalatest/mock/JMockCycleFixture.scala    |   0
 .../scalatest/mock/JMockExpectations.scala    |   0
 .../org/scalatest/mock/MockitoSugar.scala     |   0
 .../main/scala/org/scalatest/package.scala    |   0
 .../scala/org/scalatest/path/FreeSpec.scala   |   0
 .../org/scalatest/path/FreeSpecLike.scala     |   0
 .../scala/org/scalatest/path/FunSpec.scala    |   0
 .../org/scalatest/path/FunSpecLike.scala      |   0
 .../scala/org/scalatest/prop/Checkers.scala   |   0
 .../org/scalatest/prop/Configuration.scala    |   0
 .../org/scalatest/prop/PropertyChecks.scala   |   0
 .../scala/org/scalatest/prop/Whenever.scala   |   0
 .../src}/main/scala/org/scalatest/run.scala   |   0
 .../scala/org/scalatest/selenium/Page.scala   |   0
 .../org/scalatest/selenium/WebBrowser.scala   |   0
 .../scala/org/scalatest/tagobjects/CPU.scala  |   0
 .../scalatest/tagobjects/ChromeBrowser.scala  |   0
 .../scala/org/scalatest/tagobjects/Disk.scala |   0
 .../scalatest/tagobjects/FirefoxBrowser.scala |   0
 .../tagobjects/HtmlUnitBrowser.scala          |   0
 .../tagobjects/InternetExplorerBrowser.scala  |   0
 .../org/scalatest/tagobjects/Network.scala    |   0
 .../org/scalatest/tagobjects/Retryable.scala  |   0
 .../scalatest/tagobjects/SafariBrowser.scala  |   0
 .../scala/org/scalatest/tagobjects/Slow.scala |   0
 .../SingleTestAnnotationTransformer.scala     |   0
 .../org/scalatest/testng/TestNGSuite.scala    |   0
 .../scalatest/testng/TestNGSuiteLike.scala    |   0
 .../scalatest/testng/TestNGWrapperSuite.scala |   0
 .../main/scala/org/scalatest/time/Now.scala   |   0
 .../main/scala/org/scalatest/time/Span.scala  |   0
 .../scala/org/scalatest/time/SpanSugar.scala  |   0
 .../main/scala/org/scalatest/time/Units.scala |   0
 .../org/scalatest/tools/AboutJDialog.scala    |   0
 .../scala/org/scalatest/tools/AnsiColor.scala |   0
 .../scala/org/scalatest/tools/AnsiReset.scala |   0
 .../scala/org/scalatest/tools/ColorBar.scala  |   0
 .../tools/ConcurrentDistributor.scala         |   0
 .../scalatest/tools/DashboardReporter.scala   |   0
 .../org/scalatest/tools/DiscoverySuite.scala  |   0
 .../tools/DistributedTestRunnerSuite.scala    |   0
 .../scala/org/scalatest/tools/Durations.scala |   0
 .../org/scalatest/tools/EventHolder.scala     |   0
 .../org/scalatest/tools/EventToPresent.scala  |   0
 .../org/scalatest/tools/FileReporter.scala    |   0
 .../org/scalatest/tools/FilterReporter.scala  |   0
 .../scala/org/scalatest/tools/Fragment.scala  |   0
 .../scala/org/scalatest/tools/Framework.scala |   0
 .../tools/FriendlyParamsTranslator.scala      |   0
 .../org/scalatest/tools/HtmlReporter.scala    |   0
 .../IconEmbellishedListCellRenderer.scala     |   0
 .../scalatest/tools/JUnitXmlReporter.scala    |   0
 .../scala/org/scalatest/tools/Memento.scala   |   0
 .../org/scalatest/tools/MemoryReporter.scala  |   0
 .../scalatest/tools/NarrowJOptionPane.scala   |   0
 .../org/scalatest/tools/ParsedArgs.scala      |   0
 .../org/scalatest/tools/PrintReporter.scala   |   0
 .../scalatest/tools/ProgressBarPanel.scala    |   0
 .../scalatest/tools/ReporterConfigParam.scala |   0
 .../tools/ReporterConfiguration.scala         |   0
 .../org/scalatest/tools/ReporterFactory.scala |   0
 .../org/scalatest/tools/RunDoneListener.scala |   0
 .../scala/org/scalatest/tools/Runner.scala    |   0
 .../scala/org/scalatest/tools/RunnerGUI.scala |   0
 .../org/scalatest/tools/RunnerGUIState.scala  |   0
 .../org/scalatest/tools/RunnerJFrame.scala    |   0
 .../scalatest/tools/SbtCommandParser.scala    |   0
 .../scalatest/tools/SbtDispatchReporter.scala |   0
 .../scalatest/tools/ScalaTestAntTask.scala    |   0
 .../scalatest/tools/ScalaTestFramework.scala  |   0
 .../org/scalatest/tools/SocketReporter.scala  |   0
 .../scalatest/tools/StandardErrReporter.scala |   0
 .../scalatest/tools/StandardOutReporter.scala |   0
 .../org/scalatest/tools/StatusJPanel.scala    |   0
 .../org/scalatest/tools/StringReporter.scala  |   0
 .../tools/SuiteDiscoveryHelper.scala          |   0
 .../org/scalatest/tools/SuiteResult.scala     |   0
 .../scalatest/tools/SuiteResultHolder.scala   |   0
 .../org/scalatest/tools/SuiteRunner.scala     |   0
 .../tools/SuiteSortingReporter.scala          |   0
 .../scalatest/tools/TestSortingReporter.scala |   0
 .../org/scalatest/tools/XmlReporter.scala     |   0
 .../scalatest/tools/XmlSocketReporter.scala   |   0
 .../org/scalatest/words/ArrayWrapper.scala    |   0
 .../scala/org/scalatest/words/BeWord.scala    |   0
 .../org/scalatest/words/BehaveWord.scala      |   0
 .../scala/org/scalatest/words/CanVerb.scala   |   0
 .../org/scalatest/words/CompileWord.scala     |   0
 .../org/scalatest/words/ContainWord.scala     |   0
 .../org/scalatest/words/DefinedWord.scala     |   0
 .../scala/org/scalatest/words/EmptyWord.scala |   0
 .../org/scalatest/words/EndWithWord.scala     |   0
 .../scala/org/scalatest/words/ExistWord.scala |   0
 .../org/scalatest/words/FullyMatchWord.scala  |   0
 .../scala/org/scalatest/words/HaveWord.scala  |   0
 .../org/scalatest/words/IncludeWord.scala     |   0
 .../words/JavaCollectionWrapper.scala         |   0
 .../org/scalatest/words/JavaMapWrapper.scala  |   0
 .../org/scalatest/words/LengthWord.scala      |   0
 .../scalatest/words/MatchPatternWord.scala    |   0
 .../org/scalatest/words/MatcherWords.scala    |   0
 .../scala/org/scalatest/words/MustVerb.scala  |   0
 .../org/scalatest/words/NoExceptionWord.scala |   0
 .../scala/org/scalatest/words/NotWord.scala   |   0
 ...aseUseNoExceptionShouldSyntaxInstead.scala |   0
 .../org/scalatest/words/ReadableWord.scala    |   0
 .../org/scalatest/words/RegexWithGroups.scala |   0
 .../words/ResultOfATypeInvocation.scala       |   0
 .../ResultOfAWordToAMatcherApplication.scala  |   0
 ...fAWordToBePropertyMatcherApplication.scala |   0
 .../ResultOfAWordToSymbolApplication.scala    |   0
 .../words/ResultOfAfterWordApplication.scala  |   0
 .../words/ResultOfAllOfApplication.scala      |   0
 .../words/ResultOfAnTypeInvocation.scala      |   0
 ...ResultOfAnWordToAnMatcherApplication.scala |   0
 ...AnWordToBePropertyMatcherApplication.scala |   0
 .../ResultOfAnWordToSymbolApplication.scala   |   0
 .../ResultOfAtLeastOneOfApplication.scala     |   0
 .../ResultOfAtMostOneOfApplication.scala      |   0
 .../words/ResultOfBeWordForAType.scala        |   0
 .../words/ResultOfBeWordForAnType.scala       |   0
 .../words/ResultOfBeWordForNoException.scala  |   0
 .../scalatest/words/ResultOfContainWord.scala |   0
 .../scalatest/words/ResultOfDefinedAt.scala   |   0
 .../words/ResultOfGreaterThanComparison.scala |   0
 ...sultOfGreaterThanOrEqualToComparison.scala |   0
 .../words/ResultOfInOrderApplication.scala    |   0
 .../ResultOfInOrderOnlyApplication.scala      |   0
 .../words/ResultOfKeyWordApplication.scala    |   0
 .../words/ResultOfLengthWordApplication.scala |   0
 .../words/ResultOfLessThanComparison.scala    |   0
 .../ResultOfLessThanOrEqualToComparison.scala |   0
 .../ResultOfMessageWordApplication.scala      |   0
 .../words/ResultOfNoneOfApplication.scala     |   0
 .../scalatest/words/ResultOfNotExist.scala    |   0
 .../words/ResultOfNotWordForAny.scala         |   0
 .../words/ResultOfOfTypeInvocation.scala      |   0
 .../words/ResultOfOneOfApplication.scala      |   0
 .../words/ResultOfOnlyApplication.scala       |   0
 .../words/ResultOfRegexWordApplication.scala  |   0
 .../words/ResultOfSizeWordApplication.scala   |   0
 .../words/ResultOfStringPassedToVerb.scala    |   0
 .../words/ResultOfTaggedAsInvocation.scala    |   0
 ...ResultOfTheSameElementsAsApplication.scala |   0
 ...fTheSameElementsInOrderAsApplication.scala |   0
 ...ResultOfTheSameInstanceAsApplication.scala |   0
 .../words/ResultOfTheTypeInvocation.scala     |   0
 .../words/ResultOfThrownByApplication.scala   |   0
 .../words/ResultOfValueWordApplication.scala  |   0
 .../org/scalatest/words/ShouldVerb.scala      |   0
 .../scala/org/scalatest/words/SizeWord.scala  |   0
 .../org/scalatest/words/SortedWord.scala      |   0
 .../org/scalatest/words/StartWithWord.scala   |   0
 .../words/StringVerbBlockRegistration.scala   |   0
 .../org/scalatest/words/TypeCheckWord.scala   |   0
 .../org/scalatest/words/WritableWord.scala    |   0
 1140 files changed, 124 insertions(+), 65 deletions(-)
 rename {src/test => common-test/src/main}/scala/org/scalatest/SharedHelpers.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/AccumulationSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/CatcherSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/ChainSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/ConversionCheckedMapEqualityConstraintsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/ConversionCheckedSeqEqualityConstraintsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/ConversionCheckedSetEqualityConstraintsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/ConversionCheckedTraversableEqualityConstraintsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/ConversionCheckedTripleEqualsExplicitlySpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/ConversionCheckedTripleEqualsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/DecidersSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/DefaultEqualitySpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/EitherSugarSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/EqualitySpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/EverySpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/ExplicitlySpecHelpers.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/NormMethodsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/NormalizationSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/NormalizingEqualitySpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/NumericEqualityConstraintsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/OptionSugarSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/OrSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/PrettifierSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/PrettyMethodsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/RequirementsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/SnapshotsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/SpreadSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/StringNormalizationsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TimesOnIntSpec.scala (96%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/ToleranceSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TolerantEqualitySpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TolerantEquivalenceSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TraversableConstraintsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TripleEqualsSpec.for210 (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TripleEqualsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TrySugarSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TypeCheckedMapEqualityConstraintsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TypeCheckedSeqEqualityConstraintsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TypeCheckedSetEqualityConstraintsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TypeCheckedTraversableEqualityConstraintsSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/TypeCheckedTripleEqualsExplicitlySpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/UnitSpec.scala (100%)
 rename {src => scalactic-test/src}/test/scala/org/scalactic/ValidationSpec.scala (100%)
 rename {src => scalactic/src}/main/resources/org/scalactic/ScalacticBundle.properties (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/AbstractStringUniformity.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Accumulation.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Bool.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/BooleanMacro.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Catcher.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Chain.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/ComposedNormalizingEquality.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/ComposedNormalizingEquivalence.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Constraint.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/ConversionCheckedTripleEquals.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/DefaultEquality.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/EitherSugar.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Equality.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Equivalence.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Every.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Explicitly.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/FailureMessages.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/LowPriorityConversionCheckedConstraint.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/LowPriorityTypeCheckedConstraint.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/MacroOwnerRepair.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/MapEqualityConstraints.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/NormMethods.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Normalization.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/NormalizingEquality.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/NormalizingEquivalence.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/NumericEqualityConstraints.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/OptionSugar.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Or.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Prettifier.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/PrettyMethods.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Requirements.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Resources.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/SeqEqualityConstraints.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/SetEqualityConstraints.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Snapshots.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/StringNormalizations.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/TimesOnInt.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Tolerance.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/TolerantNumerics.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/TraversableEqualityConstraints.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/TripleEquals.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/TripleEqualsSupport.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/TrySugar.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/TypeCheckedTripleEquals.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Uniformity.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/Validation.scala (100%)
 rename {src => scalactic/src}/main/scala/org/scalactic/package.scala (100%)
 rename {src => scalatest-test/src}/test-osgi/scala/org/scalatest/osgi/OsgiSuite.scala (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/FastAsLight.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/HasField.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/HasFieldAndGetMethod.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/HasFieldAndMethod.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/HasFieldMethodAndGetMethod.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/PackageAccessConstructorSuite.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/SlowAsMolasses.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/WeakAsAKitten.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/junit/JBitterSuite.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/junit/JHappySuite.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/junit/JUnit3TestCase.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/junit/JUnit3TestSuite.java (100%)
 rename {src => scalatest-test/src}/test/java/org/scalatest/tools/PackageAccessSuite.java (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/AMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/AlerterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/AllOfContainMatcherDeciderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/AllOfContainMatcherEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/AllOfContainMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/AllSuiteProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/AnMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/AnyValMatchersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/AppendedCluesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ArgsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/AssertionsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/BeforeAndAfterAllConfigMapSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/BeforeAndAfterAllProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/BeforeAndAfterAllSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/BeforeAndAfterConfigSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/BeforeAndAfterEachTestDataSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/BeforeAndAfterSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/BeforeNAfterSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/BigSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/BigSuiteSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/BookPropertyMatchers.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/CancelAfterFailureSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/CatchReporterProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/CatchReporterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/CheckpointsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ClassTaggingProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ClueSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ConfigMapSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ConfigMapWrapperSuiteSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ContainMatcherAndOrDeciderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ContainMatcherAndOrEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ContainMatcherAndOrExplicitEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ContainMatcherAndOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ConversionCheckedAssertionsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/CustomMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/DiagrammedAssertionsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/DispatchReporterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/DocSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EasySuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EitherValuesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EmptyMocks.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EncodedOrderingSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EngineSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EntrySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EventHelpers.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryLoneElementSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainAllOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainAllOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainAllOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainAtMostOneOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainAtMostOneOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainAtMostOneOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainInOrderLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainInOrderLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainInOrderOnlyLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainInOrderOnlyLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainInOrderOnlySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainInOrderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainNoneOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainNoneOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainNoneOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainOneOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainOneOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainOneOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainOnlyLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainOnlyLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainOnlySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ExampleBeforeAfterParallelSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ExampleParallelSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ExampleStackSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ExampleSuiteTimeoutSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ExampleTimeoutParallelSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ExamplesSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FailureMessagesSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FeatureSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FileMocks.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FilterProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FilterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FlatSpecImportedMatchersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FlatSpecMixedInMatchersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FlatSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FreeSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FruitMocks.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FunSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FunSpecSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FunSuiteSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FunSuiteSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FunctionSuiteExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/FunctionSuiteProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/GivenWhenThenSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InOrderContainMatcherDeciderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InOrderContainMatcherEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InOrderContainMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InOrderOnlyContainMatcherDeciderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InOrderOnlyContainMatcherEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InOrderOnlyContainMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InformerSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InheritedTagProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InsideMixinSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InsideSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InspectorShorthandsRegexWithGroupsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InspectorShorthandsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InspectorsForMapSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/InspectorsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListLoneElementSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldBeEmptyLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldBeEmptyLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldBeEmptySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainAllOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainAllOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainAllOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainAtLeastOneOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainAtLeastOneOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainAtLeastOneOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainAtMostOneOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainAtMostOneOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainAtMostOneOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainInOrderLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainInOrderLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainInOrderOnlyLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainInOrderOnlyLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainInOrderOnlySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainInOrderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainNoneOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainNoneOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainNoneOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainOneOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainOneOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainOneOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainOnlyLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainOnlyLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainOnlySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainTheSameElementsAsLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainTheSameElementsAsLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainTheSameElementsAsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/MapShouldBeDefinedAtSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/MatcherGenSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/MatchersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/MethodSuiteExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/MethodSuiteProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/NonImplicitAssertionsSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/NoneOfContainMatcherDeciderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/NoneOfContainMatcherEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/NoneOfContainMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/NotifierSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OldDocSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OneInstancePerTestSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OneOfContainMatcherDeciderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OneOfContainMatcherEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OneOfContainMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OnlyContainMatcherDeciderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OnlyContainMatcherEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OnlyContainMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OperatorNames.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OptionShouldContainOneOfLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OptionShouldContainOneOfLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OptionShouldContainOneOfSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OptionShouldContainSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OptionValuesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/OutcomeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ParallelTestExecutionInfoExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ParallelTestExecutionOrderExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ParallelTestExecutionParallelSuiteExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ParallelTestExecutionProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ParallelTestExecutionSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ParallelTestExecutionSuiteTimeoutExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ParallelTestExecutionTestTimeoutExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/PartialFunctionValuesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/PrettyAstSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/PrivateMethodTesterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/PropSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/PropertyFunSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/RandomTestOrderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/RetriesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ReturnsNormallyThrowsAssertion.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/RunInSpurtsSpec1.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/RunInSpurtsSpec2.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/RunningTestSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SavesConfigMapSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SequentialNestedSuiteExecutionSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SeveredStackTracesFailureSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SeveredStackTracesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShellSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShorthandShouldBeThrownBySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShorthandShouldNotBeThrownBySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeAMatcherAndOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeASymbolSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeATypeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeAnMatcherAndOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeAnSymbolSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeAnTypeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeAnySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedAtForAllSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedAtSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedLogicalAndExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedLogicalAndImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedLogicalOrExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedLogicalOrImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedStructuralLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedStructuralLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeDefinedStructuralSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeEmptyExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeEmptyImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeEmptyLogicalAndExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeEmptyLogicalAndImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeEmptyLogicalOrExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeEmptyLogicalOrImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeEmptyStructuralLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeEmptyStructuralLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeEmptyStructuralSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeNullSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBePropertyMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableLogicalAndExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableLogicalAndImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableLogicalOrExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableLogicalOrImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableStructuralLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableStructuralLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeReadableStructuralSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeShorthandForAllSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeShorthandSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeSortedLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeSortedLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeSortedSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeSymbolSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeThrownBySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableLogicalAndExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableLogicalAndImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableLogicalOrExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableLogicalOrImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableStructuralLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableStructuralLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBeWritableStructuralSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldBehaveLikeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldCollectedTripleEqualsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldCollectedTripleEqualsToleranceSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldCompileSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldContainElementNewSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldContainElementSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldContainKeySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldContainValueSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldConversionCheckedTripleEqualsEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldEndWithRegexSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldEndWithSubstringSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldEqualEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldEqualExplicitlySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldEqualNullSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldEqualSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldEqualTokenToleranceSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldEqualToleranceSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldExistExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldExistImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldExistLogicalAndExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldExistLogicalAndImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldExistLogicalAndSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldExistLogicalOrExplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldExistLogicalOrImplicitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldExistLogicalOrSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldExistSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldFileBePropertyMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldFullyMatchSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldHavePropertiesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldIncludeRegexSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldIncludeSubstringSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldLengthSizeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldLengthSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldLogicalMatcherExprSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldMatchPatternSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldMessageSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldNotBeThrownBySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldNotCompileSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldNotShorthandForAllSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldNotShorthandSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldNotTypeCheckSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldOrderedSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldPlusOrMinusSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldSameInstanceAsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldSizeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldStartWithRegexSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldStartWithSubstringSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldStructuralLengthSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldStructuralSizeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldThrowSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldTripleEqualsEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldTripleEqualsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldTripleEqualsToleranceSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ShouldTypeCheckedTripleEqualsEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SlowpokeDetectorSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StatefulStatusSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StatusProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StatusSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StepwiseNestedSuiteExecutionSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StopOnFailureProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StopOnFailureSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StreamlinedXmlEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StreamlinedXmlNormMethodsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StreamlinedXmlSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StringFixture.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StringLoneElementSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/StubReporter.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SuiteCompletedStatusReporter.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SuiteExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SuiteProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SuiteSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SuiteSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/SuitesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TagGroupsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TaggingScopesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TestColonEscapeProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TestDataProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TestNameProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TheSameElementsAsContainMatcherDeciderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TheSameElementsAsContainMatcherEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TheSameElementsAsContainMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherDeciderSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherEqualitySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/ThreadNameSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TryValuesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/TypeCheckedAssertionsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/UnitSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/VariousWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/WordSpecImportedMatchersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/WordSpecMixedInMatchersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/WordSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/AsyncAssertionsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/ConductorFixtureSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/ConductorMethodsSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/ConductorSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/DoOver.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/DoOverSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/EventuallySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/FuturesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/IntegrationPatienceSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/JavaFuturesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/PatienceConfigurationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/ScalaFuturesSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/ScaledTimeSpansSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/TestThreadsStartingCounterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/TimeLimitedTestsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/concurrent/TimeoutsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/enablers/CollectingSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/enablers/NoParamSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/EventSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/LocationFunctionSuiteProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/LocationMethodSuiteProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/LocationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/LocationSuiteProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/OrdinalSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/ScopePendingProp.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/TestLocationFunctionServices.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/TestLocationJUnit3Suite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/TestLocationJUnitSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/TestLocationMethodJUnit3Suite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/TestLocationMethodJUnitSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/TestLocationMethodServices.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/TestLocationMethodTestNGSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/TestLocationServices.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/TestLocationTestNGSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/examples/ExampleCancelInNestedSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/events/examples/ExampleCancelSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/exceptions/GeneratorDrivenPropertyCheckFailedExceptionSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/exceptions/PayloadSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/exceptions/StackDepthExceptionSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/exceptions/TableDrivenPropertyCheckFailedExceptionSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/exceptions/TestCanceledExceptionSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/exceptions/TestFailedExceptionSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/exceptions/TestFailedExceptionWithImportSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/ConfigMapFixtureSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/FeatureSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/FlatSpecImportedMatchersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/FlatSpecMixedInMatchersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/FlatSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/FreeSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/FunSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/FunSuiteSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/NoArgAlternativeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/NoArgSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/PropSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/SpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/SuiteSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/TestDataFixtureSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/UnitFixtureSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/WordSpecImportedMatchersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/WordSpecMixedInMatchersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/fixture/WordSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/jmock/SuiteExpectations.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/jmock/TestReporter.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/junit/AssertionsForJUnitWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/junit/JUnit3SuiteSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/junit/JUnitRunnerSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/junit/JUnitSuiteSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/junit/JUnitSuiteSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/junit/JUnitTestFailedErrorSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/junit/JUnitWrapperSuiteSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/junit/RunNotifierSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/junit/helpers/TestWasCalledSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/junit/junit4helpers/TestWasCalledSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/AMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/AnMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/BeMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/BePropertyMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/BookPropertyMatchers.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/HavePropertyMatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/LazyArgSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/MatchResultSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/MatcherFactorySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/MatcherProducersSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/MatcherSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/MatcherToStringSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/ShouldAndMustSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/ShouldBehaveLikeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/ShouldEndWithRegexSpec.OLD (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/ShouldHavePropertiesSpec.OLD (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/matchers/ShouldIncludeRegexSpec.OLD (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/mock/EasyMockSugarSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/mock/JMockCycleSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/mytags.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/path/ExampleLikeSpecs.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/path/FreeSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/path/FunSpecSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/path/StackSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/prop/CheckersSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/prop/ConfigurationSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/prop/HelperSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/prop/PropertyCheckConfigParamSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/prop/PropertyCheckConfigSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/prop/TableStyleSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/selenium/DriverSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/selenium/JettySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/selenium/ScreenshotSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/selenium/WebBrowserSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/FirstTestIgnoredExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/InfoInsideTestFiredAfterTestExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/OnlyFirstTestExecutedOnCreationExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/PathBeforeAndAfterExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/PathListBufferExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/PathSuiteExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/PathSuiteMatrix.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/SecondTestIgnoredExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/SuiteExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/SuiteMatrix.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/TwoSlowAndOneWeakTestExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/TwoSlowTestsExample.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/suiteprop/TwoTestsIgnoredExamples.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/testng/TestNGSuiteGroupsSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/testng/TestNGSuiteSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/testng/TestNGWrapperSuiteSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/testng/example/ExampleTestNGSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/testng/example/ExampleTestNGWrapperSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/testng/example/testngsuite.xml (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/time/DurationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/time/SpanMatchers.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/time/SpanSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/time/SpanSugarSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/DashboardReporterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/DiscoverySuiteSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/FilterReporterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/FrameworkSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/HtmlReporterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/JUnitXmlReporterSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/MemoryReporterSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/PrintReporterSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/RunnerSpec.scala (99%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/SbtCommandParserSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/ScalaTestAntTaskSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/ScalaTestFrameworkSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/ScalaTestRunnerSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/SomeApiClass.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/SomeApiClassRunner.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/SomeApiSubClass.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/StringReporterAlertSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/StringReporterSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/StringReporterSummarySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/SuiteDiscoveryHelperSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/SuiteSortingReporterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/TestSortingReporterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/XmlSocketReporterSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/memoryfile.eg (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/AbortedSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/CPUTaggedSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/CustomTaggedSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/DiskTaggedSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/DoNotDiscoverSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/NestedConfigMapSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/NetworkTaggedSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/NotASuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/SampleInheritedSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/SampleSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/SlowSampleSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/SuiteWithFailedCanceledTests.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/SuiteWithFailedSkippedTests.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/tools/scalasbt/SuiteWithNestedSuites.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/BeWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/BehaveWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/CanVerbSuite.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ContainWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/DefinedWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/EmptyWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/EndWithWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ExistWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/FullyMatchWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/HaveWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/IncludeWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/LengthWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/MatcherWordsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/NoExceptionWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/NotWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ReadableWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/RegexWithGroupsSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfATypeInvocationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAWordToAMatcherApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAWordToBePropertyMatcherApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAWordToSymbolApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAfterWordApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAllOfApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAnTypeInvocationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAnWordToAnMatcherApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAnWordToBePropertyMatcherApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAnWordToSymbolApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAtLeastOneOfApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfAtMostOneOfApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfBeWordForATypeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfBeWordForAnTypeSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfBeWordForNoExceptionSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfContainWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfDefinedAtSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfGreaterThanComparisonSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfGreaterThanOrEqualToComparisonSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfInOrderApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfInOrderOnlyApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfKeyWordApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfLengthWordApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfLessThanComparisonSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfLessThanOrEqualToComparisonSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfMessageWordApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfNoneOfApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfNotExistSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfNotWordForAnySpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfOfTypeInvocationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfOneOfApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfOnlyApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfRegexWordApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfSizeWordApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfTheSameElementsAsApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfTheSameElementsInOrderAsApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfTheSameInstanceAsApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfTheTypeInvocationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfThrownByApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/ResultOfValueWordApplicationSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/SizeWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/SortedWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/StartWithWordSpec.scala (100%)
 rename {src => scalatest-test/src}/test/scala/org/scalatest/words/WritableWordSpec.scala (100%)
 rename {src => scalatest-test/src}/us/US.scala (100%)
 rename {src => scalatest-test/src}/us/readme.txt (100%)
 rename {src => scalatest-test/src}/us/runem.scala (100%)
 rename {src => scalatest/src}/main/html/addl.css (100%)
 rename {src => scalatest/src}/main/html/featureSpec.gif (100%)
 rename {src => scalatest/src}/main/html/flatSpec.gif (100%)
 rename {src => scalatest/src}/main/html/freeSpec.gif (100%)
 rename {src => scalatest/src}/main/html/funSpec.gif (100%)
 rename {src => scalatest/src}/main/html/funSuite.gif (100%)
 rename {src => scalatest/src}/main/html/propSpec.gif (100%)
 rename {src => scalatest/src}/main/html/spec.gif (100%)
 rename {src => scalatest/src}/main/html/wordSpec.gif (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/DoNotDiscover.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/Finders.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/Ignore.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/TagAnnotation.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/WrapWith.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/tags/CPU.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/tags/ChromeBrowser.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/tags/Disk.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/tags/FirefoxBrowser.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/tags/HtmlUnitBrowser.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/tags/InternetExplorerBrowser.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/tags/Network.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/tags/Retryable.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/tags/SafariBrowser.java (100%)
 rename {src => scalatest/src}/main/java/org/scalatest/tags/Slow.java (100%)
 rename {src => scalatest/src}/main/resources/images/bluedot.gif (100%)
 rename {src => scalatest/src}/main/resources/images/bluedots.psd (100%)
 rename {src => scalatest/src}/main/resources/images/bluedotsel.gif (100%)
 rename {src => scalatest/src}/main/resources/images/cyandot.gif (100%)
 rename {src => scalatest/src}/main/resources/images/cyandots.psd (100%)
 rename {src => scalatest/src}/main/resources/images/cyandotsel.gif (100%)
 rename {src => scalatest/src}/main/resources/images/dots.psd (100%)
 rename {src => scalatest/src}/main/resources/images/graybullet.gif (100%)
 rename {src => scalatest/src}/main/resources/images/graybullet.psd (100%)
 rename {src => scalatest/src}/main/resources/images/graydot.gif (100%)
 rename {src => scalatest/src}/main/resources/images/graydots.psd (100%)
 rename {src => scalatest/src}/main/resources/images/graydotsel.gif (100%)
 rename {src => scalatest/src}/main/resources/images/greenbullet.gif (100%)
 rename {src => scalatest/src}/main/resources/images/greenbullet.psd (100%)
 rename {src => scalatest/src}/main/resources/images/greendot.gif (100%)
 rename {src => scalatest/src}/main/resources/images/greendots.psd (100%)
 rename {src => scalatest/src}/main/resources/images/greendotsel.gif (100%)
 rename {src => scalatest/src}/main/resources/images/inProgress.gif (100%)
 rename {src => scalatest/src}/main/resources/images/purpledot.gif (100%)
 rename {src => scalatest/src}/main/resources/images/purpledots.psd (100%)
 rename {src => scalatest/src}/main/resources/images/purpledotsel.gif (100%)
 rename {src => scalatest/src}/main/resources/images/redbullet.gif (100%)
 rename {src => scalatest/src}/main/resources/images/redbullet.psd (100%)
 rename {src => scalatest/src}/main/resources/images/reddot.gif (100%)
 rename {src => scalatest/src}/main/resources/images/reddots.psd (100%)
 rename {src => scalatest/src}/main/resources/images/reddotsel.gif (100%)
 rename {src => scalatest/src}/main/resources/images/yellowbullet.gif (100%)
 rename {src => scalatest/src}/main/resources/images/yellowbullet.psd (100%)
 rename {src => scalatest/src}/main/resources/images/yellowdot.gif (100%)
 rename {src => scalatest/src}/main/resources/images/yellowdots.psd (100%)
 rename {src => scalatest/src}/main/resources/images/yellowdotsel.gif (100%)
 create mode 100644 scalatest/src/main/resources/org/scalactic/ScalacticBundle.properties
 rename {src => scalatest/src}/main/resources/org/scalatest/HtmlReporter.css (100%)
 rename {src => scalatest/src}/main/resources/org/scalatest/ScalaTestBundle.properties (100%)
 rename {src => scalatest/src}/main/resources/org/scalatest/d3.v2.min.js (100%)
 rename {src => scalatest/src}/main/resources/org/scalatest/sorttable.js (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Alerter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Alerting.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/AppendedClues.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Args.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Assertions.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/AssertionsMacro.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/BeforeAndAfter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/BeforeAndAfterAll.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/BeforeAndAfterAllConfigMap.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/BeforeAndAfterEach.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/BeforeAndAfterEachTestData.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/CancelAfterFailure.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/CatchReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Checkpoints.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/CompileMacro.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/ConcurrentInformer.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/ConfigMap.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/ConfigMapWrapperSuite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/DiagrammedAssertions.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/DiagrammedAssertionsMacro.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/DiagrammedExpr.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/DiagrammedExprMacro.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/DispatchReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/DistributedSuiteSorter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/DistributedTestSorter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Distributor.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Doc.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/DocSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/DocSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Documenter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Documenting.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/DynaTags.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/EitherValues.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/EncodedOrdering.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Engine.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Entry.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FailureMessages.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FeatureSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FeatureSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Filter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FlatSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FlatSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FreeSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FreeSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FunSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FunSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FunSuite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/FunSuiteLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/GivenWhenThen.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Informer.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Informing.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Inside.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Inspectors.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/JSuite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/LoneElement.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Matchers.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/MatchersHelper.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/NonImplicitAssertions.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Notifier.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Notifying.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/OneInstancePerTest.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/OptionValues.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Outcome.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/OutcomeOf.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/ParallelTestExecution.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/PartialFunctionValues.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Payloads.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/PendingNothing.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/PrivateMethodTester.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/PropSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/PropSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/RandomTestOrder.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Reporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Rerunner.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/ResourcefulReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Resources.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Retries.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/RunningTest.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/ScreenshotCapturer.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/ScreenshotOnFailure.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Sequential.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/SequentialNestedSuiteExecution.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/SeveredStackTraces.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Shell.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Slowpoke.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/SlowpokeDetector.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Spec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/SpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Status.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Stepwise.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/StepwiseNestedSuiteExecution.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/StopOnFailure.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/StopOnFailureReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Stopper.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/StreamlinedXml.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/StreamlinedXmlEquality.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/StreamlinedXmlNormMethods.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Suite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/SuiteHelpers.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/SuiteMixin.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/SuiteRerunner.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Suites.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Tag.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/TestData.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/TestRegistration.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/TestRerunner.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Tracker.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/Transformer.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/TryValues.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/WordSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/WordSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/AbstractPatienceConfiguration.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/AsyncAssertions.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/ConductorFixture.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/ConductorMethods.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/Conductors.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/DoNotInterrupt.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/Eventually.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/Futures.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/IntegrationPatience.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/Interruptor.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/JavaFutures.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/PatienceConfiguration.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/PimpedReadWriteLock.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/PimpedThreadGroup.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/ScalaFutures.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/ScaledTimeSpans.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/SelectorInterruptor.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/SocketInterruptor.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/TestThreadsStartingCounter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/ThreadInterruptor.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/TimeLimitedTests.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/TimeoutTask.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/concurrent/Timeouts.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Aggregating.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Collecting.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Containing.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Definition.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Emptiness.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Existence.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/KeyMapping.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Length.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Messaging.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Readability.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Sequencing.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Size.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Slicing.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Sortable.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/ValueMapping.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/enablers/Writability.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/events/Event.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/events/Formatter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/events/Location.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/events/NameInfo.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/events/Ordinal.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/events/Summary.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/DiscardedEvaluationException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/DuplicateTestNameException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/GeneratorDrivenPropertyCheckFailedException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/ModifiableMessage.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/ModifiablePayload.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/NotAllowedException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/PayloadField.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/PropertyCheckFailedException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/StackDepth.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/StackDepthException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/TableDrivenPropertyCheckFailedException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/TestCanceledException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/TestFailedDueToTimeoutException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/TestFailedException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/TestPendingException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/TestRegistrationClosedException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/exceptions/TimeoutField.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/ConfigMapFixture.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FeatureSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FeatureSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FixtureNodeFamily.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FlatSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FlatSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FreeSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FreeSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FunSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FunSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FunSuite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/FunSuiteLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/NoArg.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/NoArgTestWrapper.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/PropSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/PropSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/Spec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/SpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/Suite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/TestDataFixture.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/TestRegistration.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/Transformer.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/UnitFixture.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/WordSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/fixture/WordSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/junit/AssertionsForJUnit.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/junit/JUnit3Suite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/junit/JUnitRunner.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/junit/JUnitSuite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/junit/JUnitSuiteLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/junit/JUnitTestFailedError.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/junit/JUnitWrapperSuite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/junit/MyRunListener.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/junit/RunNotifierReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/AMatcher.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/AnMatcher.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/BeMatcher.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/BePropertyMatchResult.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/BePropertyMatcher.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/HavePropertyMatchResult.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/HavePropertyMatcher.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/LazyArg.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/LazyMessage.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/MatchFailed.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/MatchPatternHelper.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/MatchPatternMacro.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/MatchResult.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/MatchSucceeded.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/Matcher.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/MatcherProducers.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/TypeMatcherHelper.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/matchers/TypeMatcherMacro.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/mock/EasyMockSugar.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/mock/JMockCycle.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/mock/JMockCycleFixture.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/mock/JMockExpectations.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/mock/MockitoSugar.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/package.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/path/FreeSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/path/FreeSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/path/FunSpec.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/path/FunSpecLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/prop/Checkers.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/prop/Configuration.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/prop/PropertyChecks.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/prop/Whenever.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/run.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/selenium/Page.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/selenium/WebBrowser.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tagobjects/CPU.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tagobjects/ChromeBrowser.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tagobjects/Disk.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tagobjects/FirefoxBrowser.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tagobjects/HtmlUnitBrowser.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tagobjects/InternetExplorerBrowser.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tagobjects/Network.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tagobjects/Retryable.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tagobjects/SafariBrowser.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tagobjects/Slow.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/testng/SingleTestAnnotationTransformer.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/testng/TestNGSuite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/testng/TestNGSuiteLike.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/testng/TestNGWrapperSuite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/time/Now.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/time/Span.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/time/SpanSugar.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/time/Units.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/AboutJDialog.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/AnsiColor.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/AnsiReset.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/ColorBar.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/ConcurrentDistributor.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/DashboardReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/DiscoverySuite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/DistributedTestRunnerSuite.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/Durations.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/EventHolder.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/EventToPresent.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/FileReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/FilterReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/Fragment.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/Framework.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/FriendlyParamsTranslator.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/HtmlReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/IconEmbellishedListCellRenderer.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/JUnitXmlReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/Memento.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/MemoryReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/NarrowJOptionPane.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/ParsedArgs.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/PrintReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/ProgressBarPanel.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/ReporterConfigParam.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/ReporterConfiguration.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/ReporterFactory.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/RunDoneListener.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/Runner.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/RunnerGUI.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/RunnerGUIState.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/RunnerJFrame.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/SbtCommandParser.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/SbtDispatchReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/ScalaTestAntTask.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/ScalaTestFramework.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/SocketReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/StandardErrReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/StandardOutReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/StatusJPanel.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/StringReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/SuiteDiscoveryHelper.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/SuiteResult.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/SuiteResultHolder.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/SuiteRunner.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/SuiteSortingReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/TestSortingReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/XmlReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/tools/XmlSocketReporter.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ArrayWrapper.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/BeWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/BehaveWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/CanVerb.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/CompileWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ContainWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/DefinedWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/EmptyWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/EndWithWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ExistWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/FullyMatchWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/HaveWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/IncludeWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/JavaCollectionWrapper.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/JavaMapWrapper.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/LengthWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/MatchPatternWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/MatcherWords.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/MustVerb.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/NoExceptionWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/NotWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/PleaseUseNoExceptionShouldSyntaxInstead.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ReadableWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/RegexWithGroups.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfATypeInvocation.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAWordToAMatcherApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAWordToBePropertyMatcherApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAWordToSymbolApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAfterWordApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAllOfApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAnTypeInvocation.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAnWordToAnMatcherApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAnWordToBePropertyMatcherApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAnWordToSymbolApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAtLeastOneOfApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfAtMostOneOfApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfBeWordForAType.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfBeWordForAnType.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfBeWordForNoException.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfContainWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfDefinedAt.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfGreaterThanComparison.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfGreaterThanOrEqualToComparison.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfInOrderApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfInOrderOnlyApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfKeyWordApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfLengthWordApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfLessThanComparison.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfLessThanOrEqualToComparison.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfMessageWordApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfNoneOfApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfNotExist.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfNotWordForAny.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfOfTypeInvocation.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfOneOfApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfOnlyApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfRegexWordApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfSizeWordApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfStringPassedToVerb.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfTaggedAsInvocation.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfTheSameElementsAsApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfTheSameElementsInOrderAsApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfTheSameInstanceAsApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfTheTypeInvocation.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfThrownByApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ResultOfValueWordApplication.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/ShouldVerb.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/SizeWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/SortedWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/StartWithWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/StringVerbBlockRegistration.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/TypeCheckWord.scala (100%)
 rename {src => scalatest/src}/main/scala/org/scalatest/words/WritableWord.scala (100%)

diff --git a/src/test/scala/org/scalatest/SharedHelpers.scala b/common-test/src/main/scala/org/scalatest/SharedHelpers.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SharedHelpers.scala
rename to common-test/src/main/scala/org/scalatest/SharedHelpers.scala
diff --git a/project/GenMatchers.scala b/project/GenMatchers.scala
index 538c716846..6bcabbccb2 100644
--- a/project/GenMatchers.scala
+++ b/project/GenMatchers.scala
@@ -53,7 +53,7 @@ object GenMatchers {
     val mustMatchersFile = new File(targetDir, "MustMatchers.scala")
     val mustMatchersWriter = new BufferedWriter(new FileWriter(mustMatchersFile))
     try {
-      val lines = Source.fromFile(new File("src/main/scala/org/scalatest/Matchers.scala")).getLines.toList
+      val lines = Source.fromFile(new File("scalatest/src/main/scala/org/scalatest/Matchers.scala")).getLines.toList
       for (line <- lines) {
         val mustLine = translateShouldToMust(line)
         mustMatchersWriter.write(mustLine)
diff --git a/project/GenVersions.scala b/project/GenVersions.scala
index fdfd1a24c1..4a88d7eb2b 100644
--- a/project/GenVersions.scala
+++ b/project/GenVersions.scala
@@ -2,7 +2,7 @@ import java.io.{File, FileWriter, BufferedWriter}
 
 object GenVersions {
 
-  def genScalacticVersions(targetDir: File, version: String, scalaVersion: String): Unit = {
+  def genScalacticVersions(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     val shortScalaVersion = scalaVersion.split("\\.").take(2).mkString(".")
     targetDir.mkdirs()
 
@@ -22,6 +22,8 @@ object GenVersions {
     scalacticVersionsFileWriter.flush()
     scalacticVersionsFileWriter.close()
     println("Generated " + scalacticVersionsFile.getAbsolutePath)
+    Seq(scalacticVersionsFile)
+
   }
 
   def genScalaTestVersions(targetDir: File, version: String, scalaVersion: String): Unit = {
diff --git a/project/scalatest.scala b/project/scalatest.scala
index c13c0d0707..3ced88a7ce 100644
--- a/project/scalatest.scala
+++ b/project/scalatest.scala
@@ -155,7 +155,45 @@ object ScalatestBuild extends Build {
       "org.pegdown" % "pegdown" % "1.4.2" % "optional"
     )
 
-  lazy val scalatest = Project("scalatest", file("."))
+  lazy val commonTest = Project("common-test", file("common-test"))
+    .settings(sharedSettings: _*)
+    .settings(
+      projectTitle := "Common test classes used by scalactic and scalatest"
+    ).dependsOn(LocalProject("scalatest"))
+
+  lazy val scalactic = Project("scalactic", file("scalactic"))
+    .settings(sharedSettings: _*)
+    .settings(
+      projectTitle := "Scalactic",
+      organization := "org.scalactic",
+      initialCommands in console := "import org.scalactic._",
+      sourceGenerators in Compile += {
+        Def.task{
+          GenVersions.genScalacticVersions((sourceManaged in Compile).value / "scala" / "org" / "scalactic", version.value, scalaVersion.value)
+        }.taskValue
+      },
+      scalacticDocTaskSetting
+    ).settings(osgiSettings: _*).settings(
+      OsgiKeys.exportPackage := Seq(
+        "org.scalactic",
+        "org.scalautils"
+      ),
+      OsgiKeys.additionalHeaders:= Map(
+        "Bundle-Name" -> "Scalactic",
+        "Bundle-Description" -> "Scalactic is an open-source library for Scala projects.",
+        "Bundle-DocURL" -> "http://www.scalactic.org/",
+        "Bundle-Vendor" -> "Artima, Inc."
+      )
+    )
+
+  lazy val scalacticTest = Project("scalactic-test", file("scalactic-test"))
+    .settings(sharedSettings: _*)
+    .settings(
+      projectTitle := "Scalactic Test",
+      organization := "org.scalactic"
+    ).dependsOn(scalactic, scalatest % "test", commonTest % "test")
+
+  lazy val scalatest = Project("scalatest", file("scalatest"))
    .settings(sharedSettings: _*)
    .settings(
      projectTitle := "ScalaTest",
@@ -187,30 +225,6 @@ object ScalatestBuild extends Build {
          (baseDirectory, sourceManaged in Compile, version, scalaVersion) map genFiles("gencompcls", "GenCompatibleClasses.scala")(GenCompatibleClasses.genMain),
      sourceGenerators in Compile <+=
          (baseDirectory, sourceManaged in Compile, version, scalaVersion) map genFiles("genversions", "GenVersions.scala")(GenVersions.genScalaTestVersions),
-     testOptions in Test := Seq(Tests.Argument("-l", "org.scalatest.tags.Slow",
-                                               "-m", "org.scalatest",
-                                               "-m", "org.scalactic",
-                                               "-m", "org.scalatest.fixture",
-                                               "-m", "org.scalatest.concurrent",
-                                               "-m", "org.scalatest.testng",
-                                               "-m", "org.scalatest.junit",
-                                               "-m", "org.scalatest.events",
-                                               "-m", "org.scalatest.prop",
-                                               "-m", "org.scalatest.tools",
-                                               "-m", "org.scalatest.matchers",
-                                               "-m", "org.scalatest.suiteprop",
-                                               "-m", "org.scalatest.mock",
-                                               "-m", "org.scalatest.path",
-                                               "-m", "org.scalatest.selenium",
-                                               "-m", "org.scalatest.exceptions",
-                                               "-m", "org.scalatest.time",
-                                               "-m", "org.scalatest.words",
-                                               "-m", "org.scalatest.enablers",
-                                               "-m", "org.scalautils",
-                                               "-oDI",
-                                               "-h", "target/html",
-                                               "-u", "target/junit",
-                                               "-fW", "target/result.txt")),
      scalatestDocTaskSetting
    ).settings(osgiSettings: _*).settings(
       OsgiKeys.exportPackage := Seq(
@@ -243,44 +257,47 @@ object ScalatestBuild extends Build {
         "Bundle-Vendor" -> "Artima, Inc.",
         "Main-Class" -> "org.scalatest.tools.Runner"
       )
-   )
+   ).dependsOn(scalactic)
 
-  lazy val scalactic = Project("scalactic", file("genscalactic"))
+  lazy val scalatestTest = Project("scalatest-test", file("scalatest-test"))
     .settings(sharedSettings: _*)
     .settings(
-      projectTitle := "Scalactic",
-      organization := "org.scalactic",
-      initialCommands in console := "import org.scalactic._",
-      sourceGenerators in Compile <+=
-        (baseDirectory, sourceManaged in Compile, version, scalaVersion) map genFiles("", "GenScalactic.scala")(GenScalactic.genMain),
-      sourceGenerators in Test <+=
-        (baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("", "GenScalactic.scala")(GenScalactic.genTest),
-      resourceDirectories in Compile += {
-        (sourceManaged in Compile).value / "resources"
-      },
-      // TODO - This is a hack to get us on the resources list..
-      resourceGenerators in Compile += {
-        Def.task{
-          Seq((sourceManaged in Compile).value / "resources" / "org" / "scalactic" / "ScalacticBundle.properties")
-        }.taskValue
-      },
-      // Note this should be removable.
-      mappings in (Compile, packageBin) += {
-        ((sourceManaged in Compile).value / "resources" / "org" / "scalactic" / "ScalacticBundle.properties") -> "org/scalactic/ScalacticBundle.properties"
-      },
-      scalacticDocTaskSetting
-    ).settings(osgiSettings: _*).settings(
-      OsgiKeys.exportPackage := Seq(
-        "org.scalactic",
-        "org.scalautils"
-      ),
-      OsgiKeys.additionalHeaders:= Map(
-        "Bundle-Name" -> "Scalactic",
-        "Bundle-Description" -> "Scalactic is an open-source library for Scala projects.",
-        "Bundle-DocURL" -> "http://www.scalactic.org/",
-        "Bundle-Vendor" -> "Artima, Inc."
-      )
-    ).dependsOn(scalatest % "test")
+      projectTitle := "ScalaTest Test",
+      organization := "org.scalatest",
+      libraryDependencies ++= crossBuildLibraryDependencies(scalaVersion.value),
+      libraryDependencies ++= scalatestLibraryDependencies,
+      testOptions in Test := Seq(Tests.Argument("-l", "org.scalatest.tags.Slow",
+        "-m", "org.scalatest",
+        "-m", "org.scalactic",
+        "-m", "org.scalatest.fixture",
+        "-m", "org.scalatest.concurrent",
+        "-m", "org.scalatest.testng",
+        "-m", "org.scalatest.junit",
+        "-m", "org.scalatest.events",
+        "-m", "org.scalatest.prop",
+        "-m", "org.scalatest.tools",
+        "-m", "org.scalatest.matchers",
+        "-m", "org.scalatest.suiteprop",
+        "-m", "org.scalatest.mock",
+        "-m", "org.scalatest.path",
+        "-m", "org.scalatest.selenium",
+        "-m", "org.scalatest.exceptions",
+        "-m", "org.scalatest.time",
+        "-m", "org.scalatest.words",
+        "-m", "org.scalatest.enablers",
+        "-m", "org.scalautils",
+        "-oDI",
+        "-h", "target/html",
+        "-u", "target/junit",
+        "-fW", "target/result.txt"))
+    ).dependsOn(scalatest % "test", commonTest % "test")
+
+  lazy val scalatestAll = Project("scalatest-all", file("."))
+    .settings(sharedSettings: _*)
+    .settings(
+      projectTitle := "ScalaTest All",
+      organization := "org.scalatest"
+    ).dependsOn(scalactic % "compile-internal", scalatest % "compile-internal").aggregate(scalactic, scalatest, scalacticTest, scalatestTest)
 
   def gentestsLibraryDependencies =
     Seq(
diff --git a/src/test/scala/org/scalactic/AccumulationSpec.scala b/scalactic-test/src/test/scala/org/scalactic/AccumulationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/AccumulationSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/AccumulationSpec.scala
diff --git a/src/test/scala/org/scalactic/CatcherSpec.scala b/scalactic-test/src/test/scala/org/scalactic/CatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/CatcherSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/CatcherSpec.scala
diff --git a/src/test/scala/org/scalactic/ChainSpec.scala b/scalactic-test/src/test/scala/org/scalactic/ChainSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/ChainSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/ChainSpec.scala
diff --git a/src/test/scala/org/scalactic/ConversionCheckedMapEqualityConstraintsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/ConversionCheckedMapEqualityConstraintsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/ConversionCheckedMapEqualityConstraintsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/ConversionCheckedMapEqualityConstraintsSpec.scala
diff --git a/src/test/scala/org/scalactic/ConversionCheckedSeqEqualityConstraintsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/ConversionCheckedSeqEqualityConstraintsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/ConversionCheckedSeqEqualityConstraintsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/ConversionCheckedSeqEqualityConstraintsSpec.scala
diff --git a/src/test/scala/org/scalactic/ConversionCheckedSetEqualityConstraintsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/ConversionCheckedSetEqualityConstraintsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/ConversionCheckedSetEqualityConstraintsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/ConversionCheckedSetEqualityConstraintsSpec.scala
diff --git a/src/test/scala/org/scalactic/ConversionCheckedTraversableEqualityConstraintsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/ConversionCheckedTraversableEqualityConstraintsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/ConversionCheckedTraversableEqualityConstraintsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/ConversionCheckedTraversableEqualityConstraintsSpec.scala
diff --git a/src/test/scala/org/scalactic/ConversionCheckedTripleEqualsExplicitlySpec.scala b/scalactic-test/src/test/scala/org/scalactic/ConversionCheckedTripleEqualsExplicitlySpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/ConversionCheckedTripleEqualsExplicitlySpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/ConversionCheckedTripleEqualsExplicitlySpec.scala
diff --git a/src/test/scala/org/scalactic/ConversionCheckedTripleEqualsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/ConversionCheckedTripleEqualsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/ConversionCheckedTripleEqualsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/ConversionCheckedTripleEqualsSpec.scala
diff --git a/src/test/scala/org/scalactic/DecidersSpec.scala b/scalactic-test/src/test/scala/org/scalactic/DecidersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/DecidersSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/DecidersSpec.scala
diff --git a/src/test/scala/org/scalactic/DefaultEqualitySpec.scala b/scalactic-test/src/test/scala/org/scalactic/DefaultEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/DefaultEqualitySpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/DefaultEqualitySpec.scala
diff --git a/src/test/scala/org/scalactic/EitherSugarSpec.scala b/scalactic-test/src/test/scala/org/scalactic/EitherSugarSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/EitherSugarSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/EitherSugarSpec.scala
diff --git a/src/test/scala/org/scalactic/EqualitySpec.scala b/scalactic-test/src/test/scala/org/scalactic/EqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/EqualitySpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/EqualitySpec.scala
diff --git a/src/test/scala/org/scalactic/EverySpec.scala b/scalactic-test/src/test/scala/org/scalactic/EverySpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/EverySpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/EverySpec.scala
diff --git a/src/test/scala/org/scalactic/ExplicitlySpecHelpers.scala b/scalactic-test/src/test/scala/org/scalactic/ExplicitlySpecHelpers.scala
similarity index 100%
rename from src/test/scala/org/scalactic/ExplicitlySpecHelpers.scala
rename to scalactic-test/src/test/scala/org/scalactic/ExplicitlySpecHelpers.scala
diff --git a/src/test/scala/org/scalactic/NormMethodsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/NormMethodsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/NormMethodsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/NormMethodsSpec.scala
diff --git a/src/test/scala/org/scalactic/NormalizationSpec.scala b/scalactic-test/src/test/scala/org/scalactic/NormalizationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/NormalizationSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/NormalizationSpec.scala
diff --git a/src/test/scala/org/scalactic/NormalizingEqualitySpec.scala b/scalactic-test/src/test/scala/org/scalactic/NormalizingEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/NormalizingEqualitySpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/NormalizingEqualitySpec.scala
diff --git a/src/test/scala/org/scalactic/NumericEqualityConstraintsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/NumericEqualityConstraintsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/NumericEqualityConstraintsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/NumericEqualityConstraintsSpec.scala
diff --git a/src/test/scala/org/scalactic/OptionSugarSpec.scala b/scalactic-test/src/test/scala/org/scalactic/OptionSugarSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/OptionSugarSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/OptionSugarSpec.scala
diff --git a/src/test/scala/org/scalactic/OrSpec.scala b/scalactic-test/src/test/scala/org/scalactic/OrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/OrSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/OrSpec.scala
diff --git a/src/test/scala/org/scalactic/PrettifierSpec.scala b/scalactic-test/src/test/scala/org/scalactic/PrettifierSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/PrettifierSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/PrettifierSpec.scala
diff --git a/src/test/scala/org/scalactic/PrettyMethodsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/PrettyMethodsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/PrettyMethodsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/PrettyMethodsSpec.scala
diff --git a/src/test/scala/org/scalactic/RequirementsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/RequirementsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/RequirementsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/RequirementsSpec.scala
diff --git a/src/test/scala/org/scalactic/SnapshotsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/SnapshotsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/SnapshotsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/SnapshotsSpec.scala
diff --git a/src/test/scala/org/scalactic/SpreadSpec.scala b/scalactic-test/src/test/scala/org/scalactic/SpreadSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/SpreadSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/SpreadSpec.scala
diff --git a/src/test/scala/org/scalactic/StringNormalizationsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/StringNormalizationsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/StringNormalizationsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/StringNormalizationsSpec.scala
diff --git a/src/test/scala/org/scalactic/TimesOnIntSpec.scala b/scalactic-test/src/test/scala/org/scalactic/TimesOnIntSpec.scala
similarity index 96%
rename from src/test/scala/org/scalactic/TimesOnIntSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TimesOnIntSpec.scala
index 195a027c05..e3312b1db3 100644
--- a/src/test/scala/org/scalactic/TimesOnIntSpec.scala
+++ b/scalactic-test/src/test/scala/org/scalactic/TimesOnIntSpec.scala
@@ -16,8 +16,6 @@
 package org.scalactic
 
 import org.scalatest._
-import org.scalatest.events._
-import SharedHelpers._
 
 class TimesOnIntSpec extends FunSpec with TimesOnInt {
 
diff --git a/src/test/scala/org/scalactic/ToleranceSpec.scala b/scalactic-test/src/test/scala/org/scalactic/ToleranceSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/ToleranceSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/ToleranceSpec.scala
diff --git a/src/test/scala/org/scalactic/TolerantEqualitySpec.scala b/scalactic-test/src/test/scala/org/scalactic/TolerantEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/TolerantEqualitySpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TolerantEqualitySpec.scala
diff --git a/src/test/scala/org/scalactic/TolerantEquivalenceSpec.scala b/scalactic-test/src/test/scala/org/scalactic/TolerantEquivalenceSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/TolerantEquivalenceSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TolerantEquivalenceSpec.scala
diff --git a/src/test/scala/org/scalactic/TraversableConstraintsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/TraversableConstraintsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/TraversableConstraintsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TraversableConstraintsSpec.scala
diff --git a/src/test/scala/org/scalactic/TripleEqualsSpec.for210 b/scalactic-test/src/test/scala/org/scalactic/TripleEqualsSpec.for210
similarity index 100%
rename from src/test/scala/org/scalactic/TripleEqualsSpec.for210
rename to scalactic-test/src/test/scala/org/scalactic/TripleEqualsSpec.for210
diff --git a/src/test/scala/org/scalactic/TripleEqualsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/TripleEqualsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/TripleEqualsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TripleEqualsSpec.scala
diff --git a/src/test/scala/org/scalactic/TrySugarSpec.scala b/scalactic-test/src/test/scala/org/scalactic/TrySugarSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/TrySugarSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TrySugarSpec.scala
diff --git a/src/test/scala/org/scalactic/TypeCheckedMapEqualityConstraintsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/TypeCheckedMapEqualityConstraintsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/TypeCheckedMapEqualityConstraintsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TypeCheckedMapEqualityConstraintsSpec.scala
diff --git a/src/test/scala/org/scalactic/TypeCheckedSeqEqualityConstraintsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/TypeCheckedSeqEqualityConstraintsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/TypeCheckedSeqEqualityConstraintsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TypeCheckedSeqEqualityConstraintsSpec.scala
diff --git a/src/test/scala/org/scalactic/TypeCheckedSetEqualityConstraintsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/TypeCheckedSetEqualityConstraintsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/TypeCheckedSetEqualityConstraintsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TypeCheckedSetEqualityConstraintsSpec.scala
diff --git a/src/test/scala/org/scalactic/TypeCheckedTraversableEqualityConstraintsSpec.scala b/scalactic-test/src/test/scala/org/scalactic/TypeCheckedTraversableEqualityConstraintsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/TypeCheckedTraversableEqualityConstraintsSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TypeCheckedTraversableEqualityConstraintsSpec.scala
diff --git a/src/test/scala/org/scalactic/TypeCheckedTripleEqualsExplicitlySpec.scala b/scalactic-test/src/test/scala/org/scalactic/TypeCheckedTripleEqualsExplicitlySpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/TypeCheckedTripleEqualsExplicitlySpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/TypeCheckedTripleEqualsExplicitlySpec.scala
diff --git a/src/test/scala/org/scalactic/UnitSpec.scala b/scalactic-test/src/test/scala/org/scalactic/UnitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/UnitSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/UnitSpec.scala
diff --git a/src/test/scala/org/scalactic/ValidationSpec.scala b/scalactic-test/src/test/scala/org/scalactic/ValidationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalactic/ValidationSpec.scala
rename to scalactic-test/src/test/scala/org/scalactic/ValidationSpec.scala
diff --git a/src/main/resources/org/scalactic/ScalacticBundle.properties b/scalactic/src/main/resources/org/scalactic/ScalacticBundle.properties
similarity index 100%
rename from src/main/resources/org/scalactic/ScalacticBundle.properties
rename to scalactic/src/main/resources/org/scalactic/ScalacticBundle.properties
diff --git a/src/main/scala/org/scalactic/AbstractStringUniformity.scala b/scalactic/src/main/scala/org/scalactic/AbstractStringUniformity.scala
similarity index 100%
rename from src/main/scala/org/scalactic/AbstractStringUniformity.scala
rename to scalactic/src/main/scala/org/scalactic/AbstractStringUniformity.scala
diff --git a/src/main/scala/org/scalactic/Accumulation.scala b/scalactic/src/main/scala/org/scalactic/Accumulation.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Accumulation.scala
rename to scalactic/src/main/scala/org/scalactic/Accumulation.scala
diff --git a/src/main/scala/org/scalactic/Bool.scala b/scalactic/src/main/scala/org/scalactic/Bool.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Bool.scala
rename to scalactic/src/main/scala/org/scalactic/Bool.scala
diff --git a/src/main/scala/org/scalactic/BooleanMacro.scala b/scalactic/src/main/scala/org/scalactic/BooleanMacro.scala
similarity index 100%
rename from src/main/scala/org/scalactic/BooleanMacro.scala
rename to scalactic/src/main/scala/org/scalactic/BooleanMacro.scala
diff --git a/src/main/scala/org/scalactic/Catcher.scala b/scalactic/src/main/scala/org/scalactic/Catcher.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Catcher.scala
rename to scalactic/src/main/scala/org/scalactic/Catcher.scala
diff --git a/src/main/scala/org/scalactic/Chain.scala b/scalactic/src/main/scala/org/scalactic/Chain.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Chain.scala
rename to scalactic/src/main/scala/org/scalactic/Chain.scala
diff --git a/src/main/scala/org/scalactic/ComposedNormalizingEquality.scala b/scalactic/src/main/scala/org/scalactic/ComposedNormalizingEquality.scala
similarity index 100%
rename from src/main/scala/org/scalactic/ComposedNormalizingEquality.scala
rename to scalactic/src/main/scala/org/scalactic/ComposedNormalizingEquality.scala
diff --git a/src/main/scala/org/scalactic/ComposedNormalizingEquivalence.scala b/scalactic/src/main/scala/org/scalactic/ComposedNormalizingEquivalence.scala
similarity index 100%
rename from src/main/scala/org/scalactic/ComposedNormalizingEquivalence.scala
rename to scalactic/src/main/scala/org/scalactic/ComposedNormalizingEquivalence.scala
diff --git a/src/main/scala/org/scalactic/Constraint.scala b/scalactic/src/main/scala/org/scalactic/Constraint.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Constraint.scala
rename to scalactic/src/main/scala/org/scalactic/Constraint.scala
diff --git a/src/main/scala/org/scalactic/ConversionCheckedTripleEquals.scala b/scalactic/src/main/scala/org/scalactic/ConversionCheckedTripleEquals.scala
similarity index 100%
rename from src/main/scala/org/scalactic/ConversionCheckedTripleEquals.scala
rename to scalactic/src/main/scala/org/scalactic/ConversionCheckedTripleEquals.scala
diff --git a/src/main/scala/org/scalactic/DefaultEquality.scala b/scalactic/src/main/scala/org/scalactic/DefaultEquality.scala
similarity index 100%
rename from src/main/scala/org/scalactic/DefaultEquality.scala
rename to scalactic/src/main/scala/org/scalactic/DefaultEquality.scala
diff --git a/src/main/scala/org/scalactic/EitherSugar.scala b/scalactic/src/main/scala/org/scalactic/EitherSugar.scala
similarity index 100%
rename from src/main/scala/org/scalactic/EitherSugar.scala
rename to scalactic/src/main/scala/org/scalactic/EitherSugar.scala
diff --git a/src/main/scala/org/scalactic/Equality.scala b/scalactic/src/main/scala/org/scalactic/Equality.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Equality.scala
rename to scalactic/src/main/scala/org/scalactic/Equality.scala
diff --git a/src/main/scala/org/scalactic/Equivalence.scala b/scalactic/src/main/scala/org/scalactic/Equivalence.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Equivalence.scala
rename to scalactic/src/main/scala/org/scalactic/Equivalence.scala
diff --git a/src/main/scala/org/scalactic/Every.scala b/scalactic/src/main/scala/org/scalactic/Every.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Every.scala
rename to scalactic/src/main/scala/org/scalactic/Every.scala
diff --git a/src/main/scala/org/scalactic/Explicitly.scala b/scalactic/src/main/scala/org/scalactic/Explicitly.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Explicitly.scala
rename to scalactic/src/main/scala/org/scalactic/Explicitly.scala
diff --git a/src/main/scala/org/scalactic/FailureMessages.scala b/scalactic/src/main/scala/org/scalactic/FailureMessages.scala
similarity index 100%
rename from src/main/scala/org/scalactic/FailureMessages.scala
rename to scalactic/src/main/scala/org/scalactic/FailureMessages.scala
diff --git a/src/main/scala/org/scalactic/LowPriorityConversionCheckedConstraint.scala b/scalactic/src/main/scala/org/scalactic/LowPriorityConversionCheckedConstraint.scala
similarity index 100%
rename from src/main/scala/org/scalactic/LowPriorityConversionCheckedConstraint.scala
rename to scalactic/src/main/scala/org/scalactic/LowPriorityConversionCheckedConstraint.scala
diff --git a/src/main/scala/org/scalactic/LowPriorityTypeCheckedConstraint.scala b/scalactic/src/main/scala/org/scalactic/LowPriorityTypeCheckedConstraint.scala
similarity index 100%
rename from src/main/scala/org/scalactic/LowPriorityTypeCheckedConstraint.scala
rename to scalactic/src/main/scala/org/scalactic/LowPriorityTypeCheckedConstraint.scala
diff --git a/src/main/scala/org/scalactic/MacroOwnerRepair.scala b/scalactic/src/main/scala/org/scalactic/MacroOwnerRepair.scala
similarity index 100%
rename from src/main/scala/org/scalactic/MacroOwnerRepair.scala
rename to scalactic/src/main/scala/org/scalactic/MacroOwnerRepair.scala
diff --git a/src/main/scala/org/scalactic/MapEqualityConstraints.scala b/scalactic/src/main/scala/org/scalactic/MapEqualityConstraints.scala
similarity index 100%
rename from src/main/scala/org/scalactic/MapEqualityConstraints.scala
rename to scalactic/src/main/scala/org/scalactic/MapEqualityConstraints.scala
diff --git a/src/main/scala/org/scalactic/NormMethods.scala b/scalactic/src/main/scala/org/scalactic/NormMethods.scala
similarity index 100%
rename from src/main/scala/org/scalactic/NormMethods.scala
rename to scalactic/src/main/scala/org/scalactic/NormMethods.scala
diff --git a/src/main/scala/org/scalactic/Normalization.scala b/scalactic/src/main/scala/org/scalactic/Normalization.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Normalization.scala
rename to scalactic/src/main/scala/org/scalactic/Normalization.scala
diff --git a/src/main/scala/org/scalactic/NormalizingEquality.scala b/scalactic/src/main/scala/org/scalactic/NormalizingEquality.scala
similarity index 100%
rename from src/main/scala/org/scalactic/NormalizingEquality.scala
rename to scalactic/src/main/scala/org/scalactic/NormalizingEquality.scala
diff --git a/src/main/scala/org/scalactic/NormalizingEquivalence.scala b/scalactic/src/main/scala/org/scalactic/NormalizingEquivalence.scala
similarity index 100%
rename from src/main/scala/org/scalactic/NormalizingEquivalence.scala
rename to scalactic/src/main/scala/org/scalactic/NormalizingEquivalence.scala
diff --git a/src/main/scala/org/scalactic/NumericEqualityConstraints.scala b/scalactic/src/main/scala/org/scalactic/NumericEqualityConstraints.scala
similarity index 100%
rename from src/main/scala/org/scalactic/NumericEqualityConstraints.scala
rename to scalactic/src/main/scala/org/scalactic/NumericEqualityConstraints.scala
diff --git a/src/main/scala/org/scalactic/OptionSugar.scala b/scalactic/src/main/scala/org/scalactic/OptionSugar.scala
similarity index 100%
rename from src/main/scala/org/scalactic/OptionSugar.scala
rename to scalactic/src/main/scala/org/scalactic/OptionSugar.scala
diff --git a/src/main/scala/org/scalactic/Or.scala b/scalactic/src/main/scala/org/scalactic/Or.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Or.scala
rename to scalactic/src/main/scala/org/scalactic/Or.scala
diff --git a/src/main/scala/org/scalactic/Prettifier.scala b/scalactic/src/main/scala/org/scalactic/Prettifier.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Prettifier.scala
rename to scalactic/src/main/scala/org/scalactic/Prettifier.scala
diff --git a/src/main/scala/org/scalactic/PrettyMethods.scala b/scalactic/src/main/scala/org/scalactic/PrettyMethods.scala
similarity index 100%
rename from src/main/scala/org/scalactic/PrettyMethods.scala
rename to scalactic/src/main/scala/org/scalactic/PrettyMethods.scala
diff --git a/src/main/scala/org/scalactic/Requirements.scala b/scalactic/src/main/scala/org/scalactic/Requirements.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Requirements.scala
rename to scalactic/src/main/scala/org/scalactic/Requirements.scala
diff --git a/src/main/scala/org/scalactic/Resources.scala b/scalactic/src/main/scala/org/scalactic/Resources.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Resources.scala
rename to scalactic/src/main/scala/org/scalactic/Resources.scala
diff --git a/src/main/scala/org/scalactic/SeqEqualityConstraints.scala b/scalactic/src/main/scala/org/scalactic/SeqEqualityConstraints.scala
similarity index 100%
rename from src/main/scala/org/scalactic/SeqEqualityConstraints.scala
rename to scalactic/src/main/scala/org/scalactic/SeqEqualityConstraints.scala
diff --git a/src/main/scala/org/scalactic/SetEqualityConstraints.scala b/scalactic/src/main/scala/org/scalactic/SetEqualityConstraints.scala
similarity index 100%
rename from src/main/scala/org/scalactic/SetEqualityConstraints.scala
rename to scalactic/src/main/scala/org/scalactic/SetEqualityConstraints.scala
diff --git a/src/main/scala/org/scalactic/Snapshots.scala b/scalactic/src/main/scala/org/scalactic/Snapshots.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Snapshots.scala
rename to scalactic/src/main/scala/org/scalactic/Snapshots.scala
diff --git a/src/main/scala/org/scalactic/StringNormalizations.scala b/scalactic/src/main/scala/org/scalactic/StringNormalizations.scala
similarity index 100%
rename from src/main/scala/org/scalactic/StringNormalizations.scala
rename to scalactic/src/main/scala/org/scalactic/StringNormalizations.scala
diff --git a/src/main/scala/org/scalactic/TimesOnInt.scala b/scalactic/src/main/scala/org/scalactic/TimesOnInt.scala
similarity index 100%
rename from src/main/scala/org/scalactic/TimesOnInt.scala
rename to scalactic/src/main/scala/org/scalactic/TimesOnInt.scala
diff --git a/src/main/scala/org/scalactic/Tolerance.scala b/scalactic/src/main/scala/org/scalactic/Tolerance.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Tolerance.scala
rename to scalactic/src/main/scala/org/scalactic/Tolerance.scala
diff --git a/src/main/scala/org/scalactic/TolerantNumerics.scala b/scalactic/src/main/scala/org/scalactic/TolerantNumerics.scala
similarity index 100%
rename from src/main/scala/org/scalactic/TolerantNumerics.scala
rename to scalactic/src/main/scala/org/scalactic/TolerantNumerics.scala
diff --git a/src/main/scala/org/scalactic/TraversableEqualityConstraints.scala b/scalactic/src/main/scala/org/scalactic/TraversableEqualityConstraints.scala
similarity index 100%
rename from src/main/scala/org/scalactic/TraversableEqualityConstraints.scala
rename to scalactic/src/main/scala/org/scalactic/TraversableEqualityConstraints.scala
diff --git a/src/main/scala/org/scalactic/TripleEquals.scala b/scalactic/src/main/scala/org/scalactic/TripleEquals.scala
similarity index 100%
rename from src/main/scala/org/scalactic/TripleEquals.scala
rename to scalactic/src/main/scala/org/scalactic/TripleEquals.scala
diff --git a/src/main/scala/org/scalactic/TripleEqualsSupport.scala b/scalactic/src/main/scala/org/scalactic/TripleEqualsSupport.scala
similarity index 100%
rename from src/main/scala/org/scalactic/TripleEqualsSupport.scala
rename to scalactic/src/main/scala/org/scalactic/TripleEqualsSupport.scala
diff --git a/src/main/scala/org/scalactic/TrySugar.scala b/scalactic/src/main/scala/org/scalactic/TrySugar.scala
similarity index 100%
rename from src/main/scala/org/scalactic/TrySugar.scala
rename to scalactic/src/main/scala/org/scalactic/TrySugar.scala
diff --git a/src/main/scala/org/scalactic/TypeCheckedTripleEquals.scala b/scalactic/src/main/scala/org/scalactic/TypeCheckedTripleEquals.scala
similarity index 100%
rename from src/main/scala/org/scalactic/TypeCheckedTripleEquals.scala
rename to scalactic/src/main/scala/org/scalactic/TypeCheckedTripleEquals.scala
diff --git a/src/main/scala/org/scalactic/Uniformity.scala b/scalactic/src/main/scala/org/scalactic/Uniformity.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Uniformity.scala
rename to scalactic/src/main/scala/org/scalactic/Uniformity.scala
diff --git a/src/main/scala/org/scalactic/Validation.scala b/scalactic/src/main/scala/org/scalactic/Validation.scala
similarity index 100%
rename from src/main/scala/org/scalactic/Validation.scala
rename to scalactic/src/main/scala/org/scalactic/Validation.scala
diff --git a/src/main/scala/org/scalactic/package.scala b/scalactic/src/main/scala/org/scalactic/package.scala
similarity index 100%
rename from src/main/scala/org/scalactic/package.scala
rename to scalactic/src/main/scala/org/scalactic/package.scala
diff --git a/src/test-osgi/scala/org/scalatest/osgi/OsgiSuite.scala b/scalatest-test/src/test-osgi/scala/org/scalatest/osgi/OsgiSuite.scala
similarity index 100%
rename from src/test-osgi/scala/org/scalatest/osgi/OsgiSuite.scala
rename to scalatest-test/src/test-osgi/scala/org/scalatest/osgi/OsgiSuite.scala
diff --git a/src/test/java/org/scalatest/FastAsLight.java b/scalatest-test/src/test/java/org/scalatest/FastAsLight.java
similarity index 100%
rename from src/test/java/org/scalatest/FastAsLight.java
rename to scalatest-test/src/test/java/org/scalatest/FastAsLight.java
diff --git a/src/test/java/org/scalatest/HasField.java b/scalatest-test/src/test/java/org/scalatest/HasField.java
similarity index 100%
rename from src/test/java/org/scalatest/HasField.java
rename to scalatest-test/src/test/java/org/scalatest/HasField.java
diff --git a/src/test/java/org/scalatest/HasFieldAndGetMethod.java b/scalatest-test/src/test/java/org/scalatest/HasFieldAndGetMethod.java
similarity index 100%
rename from src/test/java/org/scalatest/HasFieldAndGetMethod.java
rename to scalatest-test/src/test/java/org/scalatest/HasFieldAndGetMethod.java
diff --git a/src/test/java/org/scalatest/HasFieldAndMethod.java b/scalatest-test/src/test/java/org/scalatest/HasFieldAndMethod.java
similarity index 100%
rename from src/test/java/org/scalatest/HasFieldAndMethod.java
rename to scalatest-test/src/test/java/org/scalatest/HasFieldAndMethod.java
diff --git a/src/test/java/org/scalatest/HasFieldMethodAndGetMethod.java b/scalatest-test/src/test/java/org/scalatest/HasFieldMethodAndGetMethod.java
similarity index 100%
rename from src/test/java/org/scalatest/HasFieldMethodAndGetMethod.java
rename to scalatest-test/src/test/java/org/scalatest/HasFieldMethodAndGetMethod.java
diff --git a/src/test/java/org/scalatest/PackageAccessConstructorSuite.java b/scalatest-test/src/test/java/org/scalatest/PackageAccessConstructorSuite.java
similarity index 100%
rename from src/test/java/org/scalatest/PackageAccessConstructorSuite.java
rename to scalatest-test/src/test/java/org/scalatest/PackageAccessConstructorSuite.java
diff --git a/src/test/java/org/scalatest/SlowAsMolasses.java b/scalatest-test/src/test/java/org/scalatest/SlowAsMolasses.java
similarity index 100%
rename from src/test/java/org/scalatest/SlowAsMolasses.java
rename to scalatest-test/src/test/java/org/scalatest/SlowAsMolasses.java
diff --git a/src/test/java/org/scalatest/WeakAsAKitten.java b/scalatest-test/src/test/java/org/scalatest/WeakAsAKitten.java
similarity index 100%
rename from src/test/java/org/scalatest/WeakAsAKitten.java
rename to scalatest-test/src/test/java/org/scalatest/WeakAsAKitten.java
diff --git a/src/test/java/org/scalatest/junit/JBitterSuite.java b/scalatest-test/src/test/java/org/scalatest/junit/JBitterSuite.java
similarity index 100%
rename from src/test/java/org/scalatest/junit/JBitterSuite.java
rename to scalatest-test/src/test/java/org/scalatest/junit/JBitterSuite.java
diff --git a/src/test/java/org/scalatest/junit/JHappySuite.java b/scalatest-test/src/test/java/org/scalatest/junit/JHappySuite.java
similarity index 100%
rename from src/test/java/org/scalatest/junit/JHappySuite.java
rename to scalatest-test/src/test/java/org/scalatest/junit/JHappySuite.java
diff --git a/src/test/java/org/scalatest/junit/JUnit3TestCase.java b/scalatest-test/src/test/java/org/scalatest/junit/JUnit3TestCase.java
similarity index 100%
rename from src/test/java/org/scalatest/junit/JUnit3TestCase.java
rename to scalatest-test/src/test/java/org/scalatest/junit/JUnit3TestCase.java
diff --git a/src/test/java/org/scalatest/junit/JUnit3TestSuite.java b/scalatest-test/src/test/java/org/scalatest/junit/JUnit3TestSuite.java
similarity index 100%
rename from src/test/java/org/scalatest/junit/JUnit3TestSuite.java
rename to scalatest-test/src/test/java/org/scalatest/junit/JUnit3TestSuite.java
diff --git a/src/test/java/org/scalatest/tools/PackageAccessSuite.java b/scalatest-test/src/test/java/org/scalatest/tools/PackageAccessSuite.java
similarity index 100%
rename from src/test/java/org/scalatest/tools/PackageAccessSuite.java
rename to scalatest-test/src/test/java/org/scalatest/tools/PackageAccessSuite.java
diff --git a/src/test/scala/org/scalatest/AMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/AMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/AMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/AMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/AlerterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/AlerterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/AlerterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/AlerterSpec.scala
diff --git a/src/test/scala/org/scalatest/AllOfContainMatcherDeciderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/AllOfContainMatcherDeciderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/AllOfContainMatcherDeciderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/AllOfContainMatcherDeciderSpec.scala
diff --git a/src/test/scala/org/scalatest/AllOfContainMatcherEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/AllOfContainMatcherEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/AllOfContainMatcherEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/AllOfContainMatcherEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/AllOfContainMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/AllOfContainMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/AllOfContainMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/AllOfContainMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/AllSuiteProp.scala b/scalatest-test/src/test/scala/org/scalatest/AllSuiteProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/AllSuiteProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/AllSuiteProp.scala
diff --git a/src/test/scala/org/scalatest/AnMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/AnMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/AnMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/AnMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/AnyValMatchersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/AnyValMatchersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/AnyValMatchersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/AnyValMatchersSpec.scala
diff --git a/src/test/scala/org/scalatest/AppendedCluesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/AppendedCluesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/AppendedCluesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/AppendedCluesSpec.scala
diff --git a/src/test/scala/org/scalatest/ArgsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ArgsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ArgsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ArgsSpec.scala
diff --git a/src/test/scala/org/scalatest/AssertionsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/AssertionsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/AssertionsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/AssertionsSpec.scala
diff --git a/src/test/scala/org/scalatest/BeforeAndAfterAllConfigMapSpec.scala b/scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterAllConfigMapSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/BeforeAndAfterAllConfigMapSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterAllConfigMapSpec.scala
diff --git a/src/test/scala/org/scalatest/BeforeAndAfterAllProp.scala b/scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterAllProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/BeforeAndAfterAllProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterAllProp.scala
diff --git a/src/test/scala/org/scalatest/BeforeAndAfterAllSpec.scala b/scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterAllSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/BeforeAndAfterAllSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterAllSpec.scala
diff --git a/src/test/scala/org/scalatest/BeforeAndAfterConfigSuite.scala b/scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterConfigSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/BeforeAndAfterConfigSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterConfigSuite.scala
diff --git a/src/test/scala/org/scalatest/BeforeAndAfterEachTestDataSuite.scala b/scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterEachTestDataSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/BeforeAndAfterEachTestDataSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterEachTestDataSuite.scala
diff --git a/src/test/scala/org/scalatest/BeforeAndAfterSuite.scala b/scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/BeforeAndAfterSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterSuite.scala
diff --git a/src/test/scala/org/scalatest/BeforeNAfterSuite.scala b/scalatest-test/src/test/scala/org/scalatest/BeforeNAfterSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/BeforeNAfterSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/BeforeNAfterSuite.scala
diff --git a/src/test/scala/org/scalatest/BigSuite.scala b/scalatest-test/src/test/scala/org/scalatest/BigSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/BigSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/BigSuite.scala
diff --git a/src/test/scala/org/scalatest/BigSuiteSuite.scala b/scalatest-test/src/test/scala/org/scalatest/BigSuiteSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/BigSuiteSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/BigSuiteSuite.scala
diff --git a/src/test/scala/org/scalatest/BookPropertyMatchers.scala b/scalatest-test/src/test/scala/org/scalatest/BookPropertyMatchers.scala
similarity index 100%
rename from src/test/scala/org/scalatest/BookPropertyMatchers.scala
rename to scalatest-test/src/test/scala/org/scalatest/BookPropertyMatchers.scala
diff --git a/src/test/scala/org/scalatest/CancelAfterFailureSpec.scala b/scalatest-test/src/test/scala/org/scalatest/CancelAfterFailureSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/CancelAfterFailureSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/CancelAfterFailureSpec.scala
diff --git a/src/test/scala/org/scalatest/CatchReporterProp.scala b/scalatest-test/src/test/scala/org/scalatest/CatchReporterProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/CatchReporterProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/CatchReporterProp.scala
diff --git a/src/test/scala/org/scalatest/CatchReporterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/CatchReporterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/CatchReporterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/CatchReporterSpec.scala
diff --git a/src/test/scala/org/scalatest/CheckpointsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/CheckpointsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/CheckpointsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/CheckpointsSpec.scala
diff --git a/src/test/scala/org/scalatest/ClassTaggingProp.scala b/scalatest-test/src/test/scala/org/scalatest/ClassTaggingProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ClassTaggingProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/ClassTaggingProp.scala
diff --git a/src/test/scala/org/scalatest/ClueSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ClueSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ClueSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ClueSpec.scala
diff --git a/src/test/scala/org/scalatest/ConfigMapSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ConfigMapSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ConfigMapSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ConfigMapSpec.scala
diff --git a/src/test/scala/org/scalatest/ConfigMapWrapperSuiteSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ConfigMapWrapperSuiteSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ConfigMapWrapperSuiteSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ConfigMapWrapperSuiteSpec.scala
diff --git a/src/test/scala/org/scalatest/ContainMatcherAndOrDeciderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ContainMatcherAndOrDeciderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ContainMatcherAndOrDeciderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ContainMatcherAndOrDeciderSpec.scala
diff --git a/src/test/scala/org/scalatest/ContainMatcherAndOrEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ContainMatcherAndOrEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ContainMatcherAndOrEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ContainMatcherAndOrEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/ContainMatcherAndOrExplicitEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ContainMatcherAndOrExplicitEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ContainMatcherAndOrExplicitEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ContainMatcherAndOrExplicitEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/ContainMatcherAndOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ContainMatcherAndOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ContainMatcherAndOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ContainMatcherAndOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ConversionCheckedAssertionsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ConversionCheckedAssertionsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ConversionCheckedAssertionsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ConversionCheckedAssertionsSpec.scala
diff --git a/src/test/scala/org/scalatest/CustomMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/CustomMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/CustomMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/CustomMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/DiagrammedAssertionsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/DiagrammedAssertionsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/DiagrammedAssertionsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/DiagrammedAssertionsSpec.scala
diff --git a/src/test/scala/org/scalatest/DispatchReporterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/DispatchReporterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/DispatchReporterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/DispatchReporterSpec.scala
diff --git a/src/test/scala/org/scalatest/DocSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/DocSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/DocSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/DocSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/EasySuite.scala b/scalatest-test/src/test/scala/org/scalatest/EasySuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EasySuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/EasySuite.scala
diff --git a/src/test/scala/org/scalatest/EitherValuesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EitherValuesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EitherValuesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EitherValuesSpec.scala
diff --git a/src/test/scala/org/scalatest/EmptyMocks.scala b/scalatest-test/src/test/scala/org/scalatest/EmptyMocks.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EmptyMocks.scala
rename to scalatest-test/src/test/scala/org/scalatest/EmptyMocks.scala
diff --git a/src/test/scala/org/scalatest/EncodedOrderingSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EncodedOrderingSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EncodedOrderingSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EncodedOrderingSpec.scala
diff --git a/src/test/scala/org/scalatest/EngineSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EngineSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EngineSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EngineSpec.scala
diff --git a/src/test/scala/org/scalatest/EntrySpec.scala b/scalatest-test/src/test/scala/org/scalatest/EntrySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EntrySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EntrySpec.scala
diff --git a/src/test/scala/org/scalatest/EventHelpers.scala b/scalatest-test/src/test/scala/org/scalatest/EventHelpers.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EventHelpers.scala
rename to scalatest-test/src/test/scala/org/scalatest/EventHelpers.scala
diff --git a/src/test/scala/org/scalatest/EveryLoneElementSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryLoneElementSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryLoneElementSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryLoneElementSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainAllOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAllOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainAllOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAllOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainAllOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAllOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainAllOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAllOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainAllOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAllOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainAllOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAllOfSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtLeastOneOfSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainAtMostOneOfSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainInOrderLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainInOrderLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainInOrderLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainInOrderLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainInOrderOnlyLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderOnlyLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainInOrderOnlyLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderOnlyLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainInOrderOnlyLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderOnlyLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainInOrderOnlyLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderOnlyLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainInOrderOnlySpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderOnlySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainInOrderOnlySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderOnlySpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainInOrderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainInOrderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainInOrderSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainNoneOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainNoneOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainNoneOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainNoneOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainNoneOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainNoneOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainNoneOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainNoneOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainNoneOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainNoneOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainNoneOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainNoneOfSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainOneOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOneOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainOneOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOneOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainOneOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOneOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainOneOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOneOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainOneOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOneOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainOneOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOneOfSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainOnlyLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOnlyLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainOnlyLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOnlyLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainOnlyLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOnlyLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainOnlyLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOnlyLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainOnlySpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOnlySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainOnlySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainOnlySpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsAsSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/EveryShouldContainTheSameElementsInOrderAsSpec.scala
diff --git a/src/test/scala/org/scalatest/ExampleBeforeAfterParallelSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ExampleBeforeAfterParallelSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ExampleBeforeAfterParallelSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ExampleBeforeAfterParallelSpec.scala
diff --git a/src/test/scala/org/scalatest/ExampleParallelSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ExampleParallelSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ExampleParallelSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ExampleParallelSpec.scala
diff --git a/src/test/scala/org/scalatest/ExampleStackSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ExampleStackSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ExampleStackSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ExampleStackSpec.scala
diff --git a/src/test/scala/org/scalatest/ExampleSuiteTimeoutSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ExampleSuiteTimeoutSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ExampleSuiteTimeoutSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ExampleSuiteTimeoutSpec.scala
diff --git a/src/test/scala/org/scalatest/ExampleTimeoutParallelSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ExampleTimeoutParallelSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ExampleTimeoutParallelSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ExampleTimeoutParallelSpec.scala
diff --git a/src/test/scala/org/scalatest/ExamplesSuite.scala b/scalatest-test/src/test/scala/org/scalatest/ExamplesSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ExamplesSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/ExamplesSuite.scala
diff --git a/src/test/scala/org/scalatest/FailureMessagesSuite.scala b/scalatest-test/src/test/scala/org/scalatest/FailureMessagesSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FailureMessagesSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/FailureMessagesSuite.scala
diff --git a/src/test/scala/org/scalatest/FeatureSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/FeatureSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FeatureSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/FeatureSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/FileMocks.scala b/scalatest-test/src/test/scala/org/scalatest/FileMocks.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FileMocks.scala
rename to scalatest-test/src/test/scala/org/scalatest/FileMocks.scala
diff --git a/src/test/scala/org/scalatest/FilterProp.scala b/scalatest-test/src/test/scala/org/scalatest/FilterProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FilterProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/FilterProp.scala
diff --git a/src/test/scala/org/scalatest/FilterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/FilterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FilterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/FilterSpec.scala
diff --git a/src/test/scala/org/scalatest/FlatSpecImportedMatchersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/FlatSpecImportedMatchersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FlatSpecImportedMatchersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/FlatSpecImportedMatchersSpec.scala
diff --git a/src/test/scala/org/scalatest/FlatSpecMixedInMatchersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/FlatSpecMixedInMatchersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FlatSpecMixedInMatchersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/FlatSpecMixedInMatchersSpec.scala
diff --git a/src/test/scala/org/scalatest/FlatSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/FlatSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FlatSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/FlatSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/FreeSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/FreeSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FreeSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/FreeSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/FruitMocks.scala b/scalatest-test/src/test/scala/org/scalatest/FruitMocks.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FruitMocks.scala
rename to scalatest-test/src/test/scala/org/scalatest/FruitMocks.scala
diff --git a/src/test/scala/org/scalatest/FunSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/FunSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FunSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/FunSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/FunSpecSuite.scala b/scalatest-test/src/test/scala/org/scalatest/FunSpecSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FunSpecSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/FunSpecSuite.scala
diff --git a/src/test/scala/org/scalatest/FunSuiteSpec.scala b/scalatest-test/src/test/scala/org/scalatest/FunSuiteSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FunSuiteSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/FunSuiteSpec.scala
diff --git a/src/test/scala/org/scalatest/FunSuiteSuite.scala b/scalatest-test/src/test/scala/org/scalatest/FunSuiteSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FunSuiteSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/FunSuiteSuite.scala
diff --git a/src/test/scala/org/scalatest/FunctionSuiteExamples.scala b/scalatest-test/src/test/scala/org/scalatest/FunctionSuiteExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FunctionSuiteExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/FunctionSuiteExamples.scala
diff --git a/src/test/scala/org/scalatest/FunctionSuiteProp.scala b/scalatest-test/src/test/scala/org/scalatest/FunctionSuiteProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/FunctionSuiteProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/FunctionSuiteProp.scala
diff --git a/src/test/scala/org/scalatest/GivenWhenThenSpec.scala b/scalatest-test/src/test/scala/org/scalatest/GivenWhenThenSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/GivenWhenThenSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/GivenWhenThenSpec.scala
diff --git a/src/test/scala/org/scalatest/InOrderContainMatcherDeciderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InOrderContainMatcherDeciderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InOrderContainMatcherDeciderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InOrderContainMatcherDeciderSpec.scala
diff --git a/src/test/scala/org/scalatest/InOrderContainMatcherEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/InOrderContainMatcherEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InOrderContainMatcherEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InOrderContainMatcherEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/InOrderContainMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InOrderContainMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InOrderContainMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InOrderContainMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/InOrderOnlyContainMatcherDeciderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InOrderOnlyContainMatcherDeciderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InOrderOnlyContainMatcherDeciderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InOrderOnlyContainMatcherDeciderSpec.scala
diff --git a/src/test/scala/org/scalatest/InOrderOnlyContainMatcherEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/InOrderOnlyContainMatcherEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InOrderOnlyContainMatcherEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InOrderOnlyContainMatcherEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/InOrderOnlyContainMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InOrderOnlyContainMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InOrderOnlyContainMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InOrderOnlyContainMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/InformerSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InformerSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InformerSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InformerSpec.scala
diff --git a/src/test/scala/org/scalatest/InheritedTagProp.scala b/scalatest-test/src/test/scala/org/scalatest/InheritedTagProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InheritedTagProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/InheritedTagProp.scala
diff --git a/src/test/scala/org/scalatest/InsideMixinSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InsideMixinSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InsideMixinSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InsideMixinSpec.scala
diff --git a/src/test/scala/org/scalatest/InsideSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InsideSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InsideSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InsideSpec.scala
diff --git a/src/test/scala/org/scalatest/InspectorShorthandsRegexWithGroupsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InspectorShorthandsRegexWithGroupsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InspectorShorthandsRegexWithGroupsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InspectorShorthandsRegexWithGroupsSpec.scala
diff --git a/src/test/scala/org/scalatest/InspectorShorthandsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InspectorShorthandsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InspectorShorthandsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InspectorShorthandsSpec.scala
diff --git a/src/test/scala/org/scalatest/InspectorsForMapSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InspectorsForMapSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InspectorsForMapSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InspectorsForMapSpec.scala
diff --git a/src/test/scala/org/scalatest/InspectorsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/InspectorsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/InspectorsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/InspectorsSpec.scala
diff --git a/src/test/scala/org/scalatest/ListLoneElementSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListLoneElementSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListLoneElementSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListLoneElementSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldBeEmptyLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldBeEmptyLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldBeEmptyLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldBeEmptyLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldBeEmptyLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldBeEmptyLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldBeEmptyLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldBeEmptyLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldBeEmptySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldBeEmptySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldBeEmptySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldBeEmptySpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainAllOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainAllOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainAllOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainAllOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainAllOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainAllOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainAllOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainAllOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainAllOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainAllOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainAllOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainAllOfSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtLeastOneOfSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainAtMostOneOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtMostOneOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainAtMostOneOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtMostOneOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainAtMostOneOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtMostOneOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainAtMostOneOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtMostOneOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainAtMostOneOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtMostOneOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainAtMostOneOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainAtMostOneOfSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainInOrderLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainInOrderLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainInOrderLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainInOrderLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainInOrderOnlyLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderOnlyLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainInOrderOnlyLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderOnlyLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainInOrderOnlyLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderOnlyLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainInOrderOnlyLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderOnlyLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainInOrderOnlySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderOnlySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainInOrderOnlySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderOnlySpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainInOrderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainInOrderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainInOrderSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainNoneOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainNoneOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainNoneOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainNoneOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainNoneOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainNoneOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainNoneOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainNoneOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainNoneOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainNoneOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainNoneOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainNoneOfSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainOneOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainOneOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainOneOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainOneOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainOneOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainOneOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainOneOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainOneOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainOneOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainOneOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainOneOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainOneOfSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainOnlyLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainOnlyLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainOnlyLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainOnlyLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainOnlyLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainOnlyLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainOnlyLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainOnlyLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainOnlySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainOnlySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainOnlySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainOnlySpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsAsSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ListShouldContainTheSameElementsInOrderAsSpec.scala
diff --git a/src/test/scala/org/scalatest/MapShouldBeDefinedAtSpec.scala b/scalatest-test/src/test/scala/org/scalatest/MapShouldBeDefinedAtSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/MapShouldBeDefinedAtSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/MapShouldBeDefinedAtSpec.scala
diff --git a/src/test/scala/org/scalatest/MatcherGenSpec.scala b/scalatest-test/src/test/scala/org/scalatest/MatcherGenSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/MatcherGenSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/MatcherGenSpec.scala
diff --git a/src/test/scala/org/scalatest/MatchersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/MatchersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/MatchersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/MatchersSpec.scala
diff --git a/src/test/scala/org/scalatest/MethodSuiteExamples.scala b/scalatest-test/src/test/scala/org/scalatest/MethodSuiteExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/MethodSuiteExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/MethodSuiteExamples.scala
diff --git a/src/test/scala/org/scalatest/MethodSuiteProp.scala b/scalatest-test/src/test/scala/org/scalatest/MethodSuiteProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/MethodSuiteProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/MethodSuiteProp.scala
diff --git a/src/test/scala/org/scalatest/NonImplicitAssertionsSuite.scala b/scalatest-test/src/test/scala/org/scalatest/NonImplicitAssertionsSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/NonImplicitAssertionsSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/NonImplicitAssertionsSuite.scala
diff --git a/src/test/scala/org/scalatest/NoneOfContainMatcherDeciderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/NoneOfContainMatcherDeciderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/NoneOfContainMatcherDeciderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/NoneOfContainMatcherDeciderSpec.scala
diff --git a/src/test/scala/org/scalatest/NoneOfContainMatcherEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/NoneOfContainMatcherEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/NoneOfContainMatcherEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/NoneOfContainMatcherEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/NoneOfContainMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/NoneOfContainMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/NoneOfContainMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/NoneOfContainMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/NotifierSpec.scala b/scalatest-test/src/test/scala/org/scalatest/NotifierSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/NotifierSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/NotifierSpec.scala
diff --git a/src/test/scala/org/scalatest/OldDocSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OldDocSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OldDocSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OldDocSpec.scala
diff --git a/src/test/scala/org/scalatest/OneInstancePerTestSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OneInstancePerTestSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OneInstancePerTestSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OneInstancePerTestSpec.scala
diff --git a/src/test/scala/org/scalatest/OneOfContainMatcherDeciderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OneOfContainMatcherDeciderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OneOfContainMatcherDeciderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OneOfContainMatcherDeciderSpec.scala
diff --git a/src/test/scala/org/scalatest/OneOfContainMatcherEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/OneOfContainMatcherEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OneOfContainMatcherEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OneOfContainMatcherEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/OneOfContainMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OneOfContainMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OneOfContainMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OneOfContainMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/OnlyContainMatcherDeciderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OnlyContainMatcherDeciderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OnlyContainMatcherDeciderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OnlyContainMatcherDeciderSpec.scala
diff --git a/src/test/scala/org/scalatest/OnlyContainMatcherEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/OnlyContainMatcherEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OnlyContainMatcherEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OnlyContainMatcherEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/OnlyContainMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OnlyContainMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OnlyContainMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OnlyContainMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/OperatorNames.scala b/scalatest-test/src/test/scala/org/scalatest/OperatorNames.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OperatorNames.scala
rename to scalatest-test/src/test/scala/org/scalatest/OperatorNames.scala
diff --git a/src/test/scala/org/scalatest/OptionShouldContainOneOfLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OptionShouldContainOneOfLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OptionShouldContainOneOfLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OptionShouldContainOneOfLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/OptionShouldContainOneOfLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OptionShouldContainOneOfLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OptionShouldContainOneOfLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OptionShouldContainOneOfLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/OptionShouldContainOneOfSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OptionShouldContainOneOfSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OptionShouldContainOneOfSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OptionShouldContainOneOfSpec.scala
diff --git a/src/test/scala/org/scalatest/OptionShouldContainSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OptionShouldContainSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OptionShouldContainSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OptionShouldContainSpec.scala
diff --git a/src/test/scala/org/scalatest/OptionValuesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OptionValuesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OptionValuesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OptionValuesSpec.scala
diff --git a/src/test/scala/org/scalatest/OutcomeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/OutcomeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/OutcomeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/OutcomeSpec.scala
diff --git a/src/test/scala/org/scalatest/ParallelTestExecutionInfoExamples.scala b/scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionInfoExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ParallelTestExecutionInfoExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionInfoExamples.scala
diff --git a/src/test/scala/org/scalatest/ParallelTestExecutionOrderExamples.scala b/scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionOrderExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ParallelTestExecutionOrderExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionOrderExamples.scala
diff --git a/src/test/scala/org/scalatest/ParallelTestExecutionParallelSuiteExamples.scala b/scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionParallelSuiteExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ParallelTestExecutionParallelSuiteExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionParallelSuiteExamples.scala
diff --git a/src/test/scala/org/scalatest/ParallelTestExecutionProp.scala b/scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ParallelTestExecutionProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionProp.scala
diff --git a/src/test/scala/org/scalatest/ParallelTestExecutionSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ParallelTestExecutionSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionSpec.scala
diff --git a/src/test/scala/org/scalatest/ParallelTestExecutionSuiteTimeoutExamples.scala b/scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionSuiteTimeoutExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ParallelTestExecutionSuiteTimeoutExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionSuiteTimeoutExamples.scala
diff --git a/src/test/scala/org/scalatest/ParallelTestExecutionTestTimeoutExamples.scala b/scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionTestTimeoutExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ParallelTestExecutionTestTimeoutExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/ParallelTestExecutionTestTimeoutExamples.scala
diff --git a/src/test/scala/org/scalatest/PartialFunctionValuesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/PartialFunctionValuesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/PartialFunctionValuesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/PartialFunctionValuesSpec.scala
diff --git a/src/test/scala/org/scalatest/PrettyAstSpec.scala b/scalatest-test/src/test/scala/org/scalatest/PrettyAstSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/PrettyAstSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/PrettyAstSpec.scala
diff --git a/src/test/scala/org/scalatest/PrivateMethodTesterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/PrivateMethodTesterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/PrivateMethodTesterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/PrivateMethodTesterSpec.scala
diff --git a/src/test/scala/org/scalatest/PropSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/PropSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/PropSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/PropSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/PropertyFunSuite.scala b/scalatest-test/src/test/scala/org/scalatest/PropertyFunSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/PropertyFunSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/PropertyFunSuite.scala
diff --git a/src/test/scala/org/scalatest/RandomTestOrderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/RandomTestOrderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/RandomTestOrderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/RandomTestOrderSpec.scala
diff --git a/src/test/scala/org/scalatest/RetriesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/RetriesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/RetriesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/RetriesSpec.scala
diff --git a/src/test/scala/org/scalatest/ReturnsNormallyThrowsAssertion.scala b/scalatest-test/src/test/scala/org/scalatest/ReturnsNormallyThrowsAssertion.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ReturnsNormallyThrowsAssertion.scala
rename to scalatest-test/src/test/scala/org/scalatest/ReturnsNormallyThrowsAssertion.scala
diff --git a/src/test/scala/org/scalatest/RunInSpurtsSpec1.scala b/scalatest-test/src/test/scala/org/scalatest/RunInSpurtsSpec1.scala
similarity index 100%
rename from src/test/scala/org/scalatest/RunInSpurtsSpec1.scala
rename to scalatest-test/src/test/scala/org/scalatest/RunInSpurtsSpec1.scala
diff --git a/src/test/scala/org/scalatest/RunInSpurtsSpec2.scala b/scalatest-test/src/test/scala/org/scalatest/RunInSpurtsSpec2.scala
similarity index 100%
rename from src/test/scala/org/scalatest/RunInSpurtsSpec2.scala
rename to scalatest-test/src/test/scala/org/scalatest/RunInSpurtsSpec2.scala
diff --git a/src/test/scala/org/scalatest/RunningTestSpec.scala b/scalatest-test/src/test/scala/org/scalatest/RunningTestSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/RunningTestSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/RunningTestSpec.scala
diff --git a/src/test/scala/org/scalatest/SavesConfigMapSuite.scala b/scalatest-test/src/test/scala/org/scalatest/SavesConfigMapSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SavesConfigMapSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/SavesConfigMapSuite.scala
diff --git a/src/test/scala/org/scalatest/SequentialNestedSuiteExecutionSpec.scala b/scalatest-test/src/test/scala/org/scalatest/SequentialNestedSuiteExecutionSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SequentialNestedSuiteExecutionSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/SequentialNestedSuiteExecutionSpec.scala
diff --git a/src/test/scala/org/scalatest/SeveredStackTracesFailureSpec.scala b/scalatest-test/src/test/scala/org/scalatest/SeveredStackTracesFailureSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SeveredStackTracesFailureSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/SeveredStackTracesFailureSpec.scala
diff --git a/src/test/scala/org/scalatest/SeveredStackTracesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/SeveredStackTracesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SeveredStackTracesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/SeveredStackTracesSpec.scala
diff --git a/src/test/scala/org/scalatest/ShellSuite.scala b/scalatest-test/src/test/scala/org/scalatest/ShellSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShellSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShellSuite.scala
diff --git a/src/test/scala/org/scalatest/ShorthandShouldBeThrownBySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShorthandShouldBeThrownBySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShorthandShouldBeThrownBySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShorthandShouldBeThrownBySpec.scala
diff --git a/src/test/scala/org/scalatest/ShorthandShouldNotBeThrownBySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShorthandShouldNotBeThrownBySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShorthandShouldNotBeThrownBySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShorthandShouldNotBeThrownBySpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeAMatcherAndOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeAMatcherAndOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeAMatcherAndOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeAMatcherAndOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeASymbolSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeASymbolSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeASymbolSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeASymbolSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeATypeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeATypeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeATypeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeATypeSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeAnMatcherAndOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeAnMatcherAndOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeAnMatcherAndOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeAnMatcherAndOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeAnSymbolSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeAnSymbolSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeAnSymbolSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeAnSymbolSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeAnTypeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeAnTypeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeAnTypeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeAnTypeSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeAnySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeAnySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeAnySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeAnySpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedAtForAllSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedAtForAllSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedAtForAllSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedAtForAllSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedAtSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedAtSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedAtSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedAtSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedStructuralLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedStructuralLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedStructuralLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedStructuralLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedStructuralLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedStructuralLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedStructuralLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedStructuralLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeDefinedStructuralSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedStructuralSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeDefinedStructuralSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeDefinedStructuralSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeEmptyExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeEmptyExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeEmptyImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeEmptyImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeEmptyLogicalAndExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyLogicalAndExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeEmptyLogicalAndExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyLogicalAndExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeEmptyLogicalAndImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyLogicalAndImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeEmptyLogicalAndImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyLogicalAndImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeEmptyLogicalOrExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyLogicalOrExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeEmptyLogicalOrExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyLogicalOrExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeEmptyLogicalOrImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyLogicalOrImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeEmptyLogicalOrImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyLogicalOrImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeEmptyStructuralLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyStructuralLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeEmptyStructuralLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyStructuralLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeEmptyStructuralLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyStructuralLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeEmptyStructuralLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyStructuralLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeEmptyStructuralSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyStructuralSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeEmptyStructuralSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeEmptyStructuralSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeNullSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeNullSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeNullSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeNullSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBePropertyMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBePropertyMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBePropertyMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBePropertyMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableLogicalAndExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalAndExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableLogicalAndExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalAndExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableLogicalAndImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalAndImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableLogicalAndImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalAndImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableLogicalOrExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalOrExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableLogicalOrExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalOrExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableLogicalOrImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalOrImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableLogicalOrImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalOrImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableStructuralLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableStructuralLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableStructuralLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableStructuralLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableStructuralLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableStructuralLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableStructuralLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableStructuralLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeReadableStructuralSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableStructuralSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeReadableStructuralSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeReadableStructuralSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeShorthandForAllSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeShorthandForAllSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeShorthandForAllSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeShorthandForAllSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeShorthandSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeShorthandSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeShorthandSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeShorthandSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeSortedLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeSortedLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeSortedLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeSortedLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeSortedLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeSortedLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeSortedLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeSortedLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeSortedSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeSortedSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeSortedSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeSortedSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeSymbolSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeSymbolSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeSymbolSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeSymbolSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeThrownBySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeThrownBySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeThrownBySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeThrownBySpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableLogicalAndExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalAndExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableLogicalAndExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalAndExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableLogicalAndImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalAndImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableLogicalAndImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalAndImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableLogicalOrExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalOrExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableLogicalOrExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalOrExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableLogicalOrImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalOrImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableLogicalOrImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalOrImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableStructuralLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableStructuralLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableStructuralLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableStructuralLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableStructuralLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableStructuralLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableStructuralLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableStructuralLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBeWritableStructuralSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableStructuralSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBeWritableStructuralSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBeWritableStructuralSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldBehaveLikeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldBehaveLikeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldBehaveLikeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldBehaveLikeSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldCollectedTripleEqualsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldCollectedTripleEqualsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldCollectedTripleEqualsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldCollectedTripleEqualsSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldCollectedTripleEqualsToleranceSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldCollectedTripleEqualsToleranceSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldCollectedTripleEqualsToleranceSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldCollectedTripleEqualsToleranceSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldCompileSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldCompileSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldCompileSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldCompileSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldContainElementNewSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldContainElementNewSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldContainElementNewSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldContainElementNewSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldContainElementSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldContainElementSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldContainElementSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldContainElementSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldContainKeySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldContainKeySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldContainKeySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldContainKeySpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldContainValueSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldContainValueSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldContainValueSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldContainValueSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldConversionCheckedTripleEqualsEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldConversionCheckedTripleEqualsEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldConversionCheckedTripleEqualsEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldConversionCheckedTripleEqualsEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldEndWithRegexSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldEndWithRegexSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldEndWithRegexSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldEndWithRegexSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldEndWithSubstringSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldEndWithSubstringSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldEndWithSubstringSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldEndWithSubstringSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldEqualEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldEqualEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldEqualEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldEqualEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldEqualExplicitlySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldEqualExplicitlySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldEqualExplicitlySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldEqualExplicitlySpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldEqualNullSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldEqualNullSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldEqualNullSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldEqualNullSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldEqualSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldEqualSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldEqualSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldEqualSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldEqualTokenToleranceSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldEqualTokenToleranceSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldEqualTokenToleranceSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldEqualTokenToleranceSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldEqualToleranceSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldEqualToleranceSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldEqualToleranceSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldEqualToleranceSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldExistExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldExistExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldExistExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldExistExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldExistImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldExistImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldExistImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldExistImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldExistLogicalAndExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalAndExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldExistLogicalAndExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalAndExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldExistLogicalAndImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalAndImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldExistLogicalAndImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalAndImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldExistLogicalAndSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalAndSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldExistLogicalAndSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalAndSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldExistLogicalOrExplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalOrExplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldExistLogicalOrExplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalOrExplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldExistLogicalOrImplicitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalOrImplicitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldExistLogicalOrImplicitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalOrImplicitSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldExistLogicalOrSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalOrSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldExistLogicalOrSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldExistLogicalOrSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldExistSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldExistSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldExistSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldExistSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldFileBePropertyMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldFileBePropertyMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldFileBePropertyMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldFileBePropertyMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldFullyMatchSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldFullyMatchSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldFullyMatchSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldFullyMatchSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldHavePropertiesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldHavePropertiesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldHavePropertiesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldHavePropertiesSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldIncludeRegexSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldIncludeRegexSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldIncludeRegexSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldIncludeRegexSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldIncludeSubstringSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldIncludeSubstringSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldIncludeSubstringSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldIncludeSubstringSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldLengthSizeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldLengthSizeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldLengthSizeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldLengthSizeSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldLengthSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldLengthSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldLengthSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldLengthSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldLogicalMatcherExprSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldLogicalMatcherExprSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldLogicalMatcherExprSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldLogicalMatcherExprSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldMatchPatternSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldMatchPatternSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldMatchPatternSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldMatchPatternSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldMessageSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldMessageSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldMessageSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldMessageSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldNotBeThrownBySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldNotBeThrownBySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldNotBeThrownBySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldNotBeThrownBySpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldNotCompileSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldNotCompileSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldNotCompileSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldNotCompileSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldNotShorthandForAllSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldNotShorthandForAllSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldNotShorthandForAllSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldNotShorthandForAllSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldNotShorthandSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldNotShorthandSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldNotShorthandSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldNotShorthandSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldNotTypeCheckSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldNotTypeCheckSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldNotTypeCheckSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldNotTypeCheckSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldOrderedSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldOrderedSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldOrderedSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldOrderedSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldPlusOrMinusSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldPlusOrMinusSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldPlusOrMinusSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldPlusOrMinusSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldSameInstanceAsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldSameInstanceAsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldSameInstanceAsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldSameInstanceAsSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldSizeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldSizeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldSizeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldSizeSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldStartWithRegexSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldStartWithRegexSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldStartWithRegexSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldStartWithRegexSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldStartWithSubstringSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldStartWithSubstringSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldStartWithSubstringSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldStartWithSubstringSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldStructuralLengthSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldStructuralLengthSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldStructuralLengthSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldStructuralLengthSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldStructuralSizeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldStructuralSizeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldStructuralSizeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldStructuralSizeSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldThrowSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldThrowSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldThrowSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldThrowSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldTripleEqualsEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldTripleEqualsEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldTripleEqualsEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldTripleEqualsEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldTripleEqualsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldTripleEqualsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldTripleEqualsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldTripleEqualsSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldTripleEqualsToleranceSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldTripleEqualsToleranceSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldTripleEqualsToleranceSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldTripleEqualsToleranceSpec.scala
diff --git a/src/test/scala/org/scalatest/ShouldTypeCheckedTripleEqualsEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/ShouldTypeCheckedTripleEqualsEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ShouldTypeCheckedTripleEqualsEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ShouldTypeCheckedTripleEqualsEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/SlowpokeDetectorSpec.scala b/scalatest-test/src/test/scala/org/scalatest/SlowpokeDetectorSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SlowpokeDetectorSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/SlowpokeDetectorSpec.scala
diff --git a/src/test/scala/org/scalatest/SpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/SpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/SpecSpec.scala
diff --git a/src/test/scala/org/scalatest/StatefulStatusSpec.scala b/scalatest-test/src/test/scala/org/scalatest/StatefulStatusSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StatefulStatusSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/StatefulStatusSpec.scala
diff --git a/src/test/scala/org/scalatest/StatusProp.scala b/scalatest-test/src/test/scala/org/scalatest/StatusProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StatusProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/StatusProp.scala
diff --git a/src/test/scala/org/scalatest/StatusSpec.scala b/scalatest-test/src/test/scala/org/scalatest/StatusSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StatusSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/StatusSpec.scala
diff --git a/src/test/scala/org/scalatest/StepwiseNestedSuiteExecutionSpec.scala b/scalatest-test/src/test/scala/org/scalatest/StepwiseNestedSuiteExecutionSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StepwiseNestedSuiteExecutionSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/StepwiseNestedSuiteExecutionSpec.scala
diff --git a/src/test/scala/org/scalatest/StopOnFailureProp.scala b/scalatest-test/src/test/scala/org/scalatest/StopOnFailureProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StopOnFailureProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/StopOnFailureProp.scala
diff --git a/src/test/scala/org/scalatest/StopOnFailureSpec.scala b/scalatest-test/src/test/scala/org/scalatest/StopOnFailureSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StopOnFailureSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/StopOnFailureSpec.scala
diff --git a/src/test/scala/org/scalatest/StreamlinedXmlEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/StreamlinedXmlEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StreamlinedXmlEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/StreamlinedXmlEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/StreamlinedXmlNormMethodsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/StreamlinedXmlNormMethodsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StreamlinedXmlNormMethodsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/StreamlinedXmlNormMethodsSpec.scala
diff --git a/src/test/scala/org/scalatest/StreamlinedXmlSpec.scala b/scalatest-test/src/test/scala/org/scalatest/StreamlinedXmlSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StreamlinedXmlSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/StreamlinedXmlSpec.scala
diff --git a/src/test/scala/org/scalatest/StringFixture.scala b/scalatest-test/src/test/scala/org/scalatest/StringFixture.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StringFixture.scala
rename to scalatest-test/src/test/scala/org/scalatest/StringFixture.scala
diff --git a/src/test/scala/org/scalatest/StringLoneElementSpec.scala b/scalatest-test/src/test/scala/org/scalatest/StringLoneElementSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StringLoneElementSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/StringLoneElementSpec.scala
diff --git a/src/test/scala/org/scalatest/StubReporter.scala b/scalatest-test/src/test/scala/org/scalatest/StubReporter.scala
similarity index 100%
rename from src/test/scala/org/scalatest/StubReporter.scala
rename to scalatest-test/src/test/scala/org/scalatest/StubReporter.scala
diff --git a/src/test/scala/org/scalatest/SuiteCompletedStatusReporter.scala b/scalatest-test/src/test/scala/org/scalatest/SuiteCompletedStatusReporter.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SuiteCompletedStatusReporter.scala
rename to scalatest-test/src/test/scala/org/scalatest/SuiteCompletedStatusReporter.scala
diff --git a/src/test/scala/org/scalatest/SuiteExamples.scala b/scalatest-test/src/test/scala/org/scalatest/SuiteExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SuiteExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/SuiteExamples.scala
diff --git a/src/test/scala/org/scalatest/SuiteProp.scala b/scalatest-test/src/test/scala/org/scalatest/SuiteProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SuiteProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/SuiteProp.scala
diff --git a/src/test/scala/org/scalatest/SuiteSpec.scala b/scalatest-test/src/test/scala/org/scalatest/SuiteSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SuiteSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/SuiteSpec.scala
diff --git a/src/test/scala/org/scalatest/SuiteSuite.scala b/scalatest-test/src/test/scala/org/scalatest/SuiteSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SuiteSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/SuiteSuite.scala
diff --git a/src/test/scala/org/scalatest/SuitesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/SuitesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/SuitesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/SuitesSpec.scala
diff --git a/src/test/scala/org/scalatest/TagGroupsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/TagGroupsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TagGroupsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/TagGroupsSpec.scala
diff --git a/src/test/scala/org/scalatest/TaggingScopesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/TaggingScopesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TaggingScopesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/TaggingScopesSpec.scala
diff --git a/src/test/scala/org/scalatest/TestColonEscapeProp.scala b/scalatest-test/src/test/scala/org/scalatest/TestColonEscapeProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TestColonEscapeProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/TestColonEscapeProp.scala
diff --git a/src/test/scala/org/scalatest/TestDataProp.scala b/scalatest-test/src/test/scala/org/scalatest/TestDataProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TestDataProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/TestDataProp.scala
diff --git a/src/test/scala/org/scalatest/TestNameProp.scala b/scalatest-test/src/test/scala/org/scalatest/TestNameProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TestNameProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/TestNameProp.scala
diff --git a/src/test/scala/org/scalatest/TheSameElementsAsContainMatcherDeciderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/TheSameElementsAsContainMatcherDeciderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TheSameElementsAsContainMatcherDeciderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/TheSameElementsAsContainMatcherDeciderSpec.scala
diff --git a/src/test/scala/org/scalatest/TheSameElementsAsContainMatcherEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/TheSameElementsAsContainMatcherEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TheSameElementsAsContainMatcherEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/TheSameElementsAsContainMatcherEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/TheSameElementsAsContainMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/TheSameElementsAsContainMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TheSameElementsAsContainMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/TheSameElementsAsContainMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherDeciderSpec.scala b/scalatest-test/src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherDeciderSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherDeciderSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherDeciderSpec.scala
diff --git a/src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherEqualitySpec.scala b/scalatest-test/src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherEqualitySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherEqualitySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherEqualitySpec.scala
diff --git a/src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/TheSameElementsInOrderAsContainMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/ThreadNameSpec.scala b/scalatest-test/src/test/scala/org/scalatest/ThreadNameSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/ThreadNameSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/ThreadNameSpec.scala
diff --git a/src/test/scala/org/scalatest/TryValuesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/TryValuesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TryValuesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/TryValuesSpec.scala
diff --git a/src/test/scala/org/scalatest/TypeCheckedAssertionsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/TypeCheckedAssertionsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/TypeCheckedAssertionsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/TypeCheckedAssertionsSpec.scala
diff --git a/src/test/scala/org/scalatest/UnitSpec.scala b/scalatest-test/src/test/scala/org/scalatest/UnitSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/UnitSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/UnitSpec.scala
diff --git a/src/test/scala/org/scalatest/VariousWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/VariousWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/VariousWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/VariousWordSpec.scala
diff --git a/src/test/scala/org/scalatest/WordSpecImportedMatchersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/WordSpecImportedMatchersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/WordSpecImportedMatchersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/WordSpecImportedMatchersSpec.scala
diff --git a/src/test/scala/org/scalatest/WordSpecMixedInMatchersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/WordSpecMixedInMatchersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/WordSpecMixedInMatchersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/WordSpecMixedInMatchersSpec.scala
diff --git a/src/test/scala/org/scalatest/WordSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/WordSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/WordSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/WordSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/AsyncAssertionsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/AsyncAssertionsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/AsyncAssertionsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/AsyncAssertionsSpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/ConductorFixtureSuite.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/ConductorFixtureSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/ConductorFixtureSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/ConductorFixtureSuite.scala
diff --git a/src/test/scala/org/scalatest/concurrent/ConductorMethodsSuite.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/ConductorMethodsSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/ConductorMethodsSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/ConductorMethodsSuite.scala
diff --git a/src/test/scala/org/scalatest/concurrent/ConductorSuite.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/ConductorSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/ConductorSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/ConductorSuite.scala
diff --git a/src/test/scala/org/scalatest/concurrent/DoOver.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/DoOver.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/DoOver.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/DoOver.scala
diff --git a/src/test/scala/org/scalatest/concurrent/DoOverSuite.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/DoOverSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/DoOverSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/DoOverSuite.scala
diff --git a/src/test/scala/org/scalatest/concurrent/EventuallySpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/EventuallySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/EventuallySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/EventuallySpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/FuturesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/FuturesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/FuturesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/FuturesSpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/IntegrationPatienceSpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/IntegrationPatienceSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/IntegrationPatienceSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/IntegrationPatienceSpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/JavaFuturesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/JavaFuturesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/JavaFuturesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/JavaFuturesSpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/PatienceConfigurationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/PatienceConfigurationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/PatienceConfigurationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/PatienceConfigurationSpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/ScalaFuturesSpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/ScalaFuturesSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/ScalaFuturesSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/ScalaFuturesSpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/ScaledTimeSpansSpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/ScaledTimeSpansSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/ScaledTimeSpansSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/ScaledTimeSpansSpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/TestThreadsStartingCounterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/TestThreadsStartingCounterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/TestThreadsStartingCounterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/TestThreadsStartingCounterSpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/TimeLimitedTestsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/TimeLimitedTestsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/TimeLimitedTestsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/TimeLimitedTestsSpec.scala
diff --git a/src/test/scala/org/scalatest/concurrent/TimeoutsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/concurrent/TimeoutsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/concurrent/TimeoutsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/concurrent/TimeoutsSpec.scala
diff --git a/src/test/scala/org/scalatest/enablers/CollectingSpec.scala b/scalatest-test/src/test/scala/org/scalatest/enablers/CollectingSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/enablers/CollectingSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/enablers/CollectingSpec.scala
diff --git a/src/test/scala/org/scalatest/enablers/NoParamSpec.scala b/scalatest-test/src/test/scala/org/scalatest/enablers/NoParamSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/enablers/NoParamSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/enablers/NoParamSpec.scala
diff --git a/src/test/scala/org/scalatest/events/EventSpec.scala b/scalatest-test/src/test/scala/org/scalatest/events/EventSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/EventSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/EventSpec.scala
diff --git a/src/test/scala/org/scalatest/events/LocationFunctionSuiteProp.scala b/scalatest-test/src/test/scala/org/scalatest/events/LocationFunctionSuiteProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/LocationFunctionSuiteProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/LocationFunctionSuiteProp.scala
diff --git a/src/test/scala/org/scalatest/events/LocationMethodSuiteProp.scala b/scalatest-test/src/test/scala/org/scalatest/events/LocationMethodSuiteProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/LocationMethodSuiteProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/LocationMethodSuiteProp.scala
diff --git a/src/test/scala/org/scalatest/events/LocationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/events/LocationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/LocationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/LocationSpec.scala
diff --git a/src/test/scala/org/scalatest/events/LocationSuiteProp.scala b/scalatest-test/src/test/scala/org/scalatest/events/LocationSuiteProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/LocationSuiteProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/LocationSuiteProp.scala
diff --git a/src/test/scala/org/scalatest/events/OrdinalSpec.scala b/scalatest-test/src/test/scala/org/scalatest/events/OrdinalSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/OrdinalSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/OrdinalSpec.scala
diff --git a/src/test/scala/org/scalatest/events/ScopePendingProp.scala b/scalatest-test/src/test/scala/org/scalatest/events/ScopePendingProp.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/ScopePendingProp.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/ScopePendingProp.scala
diff --git a/src/test/scala/org/scalatest/events/TestLocationFunctionServices.scala b/scalatest-test/src/test/scala/org/scalatest/events/TestLocationFunctionServices.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/TestLocationFunctionServices.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/TestLocationFunctionServices.scala
diff --git a/src/test/scala/org/scalatest/events/TestLocationJUnit3Suite.scala b/scalatest-test/src/test/scala/org/scalatest/events/TestLocationJUnit3Suite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/TestLocationJUnit3Suite.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/TestLocationJUnit3Suite.scala
diff --git a/src/test/scala/org/scalatest/events/TestLocationJUnitSuite.scala b/scalatest-test/src/test/scala/org/scalatest/events/TestLocationJUnitSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/TestLocationJUnitSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/TestLocationJUnitSuite.scala
diff --git a/src/test/scala/org/scalatest/events/TestLocationMethodJUnit3Suite.scala b/scalatest-test/src/test/scala/org/scalatest/events/TestLocationMethodJUnit3Suite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/TestLocationMethodJUnit3Suite.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/TestLocationMethodJUnit3Suite.scala
diff --git a/src/test/scala/org/scalatest/events/TestLocationMethodJUnitSuite.scala b/scalatest-test/src/test/scala/org/scalatest/events/TestLocationMethodJUnitSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/TestLocationMethodJUnitSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/TestLocationMethodJUnitSuite.scala
diff --git a/src/test/scala/org/scalatest/events/TestLocationMethodServices.scala b/scalatest-test/src/test/scala/org/scalatest/events/TestLocationMethodServices.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/TestLocationMethodServices.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/TestLocationMethodServices.scala
diff --git a/src/test/scala/org/scalatest/events/TestLocationMethodTestNGSuite.scala b/scalatest-test/src/test/scala/org/scalatest/events/TestLocationMethodTestNGSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/TestLocationMethodTestNGSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/TestLocationMethodTestNGSuite.scala
diff --git a/src/test/scala/org/scalatest/events/TestLocationServices.scala b/scalatest-test/src/test/scala/org/scalatest/events/TestLocationServices.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/TestLocationServices.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/TestLocationServices.scala
diff --git a/src/test/scala/org/scalatest/events/TestLocationTestNGSuite.scala b/scalatest-test/src/test/scala/org/scalatest/events/TestLocationTestNGSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/TestLocationTestNGSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/TestLocationTestNGSuite.scala
diff --git a/src/test/scala/org/scalatest/events/examples/ExampleCancelInNestedSuite.scala b/scalatest-test/src/test/scala/org/scalatest/events/examples/ExampleCancelInNestedSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/examples/ExampleCancelInNestedSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/examples/ExampleCancelInNestedSuite.scala
diff --git a/src/test/scala/org/scalatest/events/examples/ExampleCancelSpec.scala b/scalatest-test/src/test/scala/org/scalatest/events/examples/ExampleCancelSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/events/examples/ExampleCancelSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/events/examples/ExampleCancelSpec.scala
diff --git a/src/test/scala/org/scalatest/exceptions/GeneratorDrivenPropertyCheckFailedExceptionSuite.scala b/scalatest-test/src/test/scala/org/scalatest/exceptions/GeneratorDrivenPropertyCheckFailedExceptionSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/exceptions/GeneratorDrivenPropertyCheckFailedExceptionSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/exceptions/GeneratorDrivenPropertyCheckFailedExceptionSuite.scala
diff --git a/src/test/scala/org/scalatest/exceptions/PayloadSpec.scala b/scalatest-test/src/test/scala/org/scalatest/exceptions/PayloadSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/exceptions/PayloadSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/exceptions/PayloadSpec.scala
diff --git a/src/test/scala/org/scalatest/exceptions/StackDepthExceptionSpec.scala b/scalatest-test/src/test/scala/org/scalatest/exceptions/StackDepthExceptionSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/exceptions/StackDepthExceptionSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/exceptions/StackDepthExceptionSpec.scala
diff --git a/src/test/scala/org/scalatest/exceptions/TableDrivenPropertyCheckFailedExceptionSpec.scala b/scalatest-test/src/test/scala/org/scalatest/exceptions/TableDrivenPropertyCheckFailedExceptionSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/exceptions/TableDrivenPropertyCheckFailedExceptionSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/exceptions/TableDrivenPropertyCheckFailedExceptionSpec.scala
diff --git a/src/test/scala/org/scalatest/exceptions/TestCanceledExceptionSpec.scala b/scalatest-test/src/test/scala/org/scalatest/exceptions/TestCanceledExceptionSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/exceptions/TestCanceledExceptionSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/exceptions/TestCanceledExceptionSpec.scala
diff --git a/src/test/scala/org/scalatest/exceptions/TestFailedExceptionSpec.scala b/scalatest-test/src/test/scala/org/scalatest/exceptions/TestFailedExceptionSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/exceptions/TestFailedExceptionSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/exceptions/TestFailedExceptionSpec.scala
diff --git a/src/test/scala/org/scalatest/exceptions/TestFailedExceptionWithImportSpec.scala b/scalatest-test/src/test/scala/org/scalatest/exceptions/TestFailedExceptionWithImportSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/exceptions/TestFailedExceptionWithImportSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/exceptions/TestFailedExceptionWithImportSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/ConfigMapFixtureSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/ConfigMapFixtureSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/ConfigMapFixtureSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/ConfigMapFixtureSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/FeatureSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/FeatureSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/FeatureSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/FeatureSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/FlatSpecImportedMatchersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/FlatSpecImportedMatchersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/FlatSpecImportedMatchersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/FlatSpecImportedMatchersSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/FlatSpecMixedInMatchersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/FlatSpecMixedInMatchersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/FlatSpecMixedInMatchersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/FlatSpecMixedInMatchersSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/FlatSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/FlatSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/FlatSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/FlatSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/FreeSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/FreeSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/FreeSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/FreeSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/FunSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/FunSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/FunSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/FunSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/FunSuiteSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/FunSuiteSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/FunSuiteSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/FunSuiteSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/NoArgAlternativeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/NoArgAlternativeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/NoArgAlternativeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/NoArgAlternativeSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/NoArgSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/NoArgSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/NoArgSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/NoArgSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/PropSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/PropSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/PropSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/PropSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/SpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/SpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/SpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/SpecSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/SuiteSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/SuiteSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/SuiteSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/SuiteSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/TestDataFixtureSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/TestDataFixtureSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/TestDataFixtureSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/TestDataFixtureSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/UnitFixtureSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/UnitFixtureSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/UnitFixtureSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/UnitFixtureSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/WordSpecImportedMatchersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/WordSpecImportedMatchersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/WordSpecImportedMatchersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/WordSpecImportedMatchersSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/WordSpecMixedInMatchersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/WordSpecMixedInMatchersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/WordSpecMixedInMatchersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/WordSpecMixedInMatchersSpec.scala
diff --git a/src/test/scala/org/scalatest/fixture/WordSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/fixture/WordSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/fixture/WordSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/fixture/WordSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/jmock/SuiteExpectations.scala b/scalatest-test/src/test/scala/org/scalatest/jmock/SuiteExpectations.scala
similarity index 100%
rename from src/test/scala/org/scalatest/jmock/SuiteExpectations.scala
rename to scalatest-test/src/test/scala/org/scalatest/jmock/SuiteExpectations.scala
diff --git a/src/test/scala/org/scalatest/jmock/TestReporter.scala b/scalatest-test/src/test/scala/org/scalatest/jmock/TestReporter.scala
similarity index 100%
rename from src/test/scala/org/scalatest/jmock/TestReporter.scala
rename to scalatest-test/src/test/scala/org/scalatest/jmock/TestReporter.scala
diff --git a/src/test/scala/org/scalatest/junit/AssertionsForJUnitWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/junit/AssertionsForJUnitWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/junit/AssertionsForJUnitWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/junit/AssertionsForJUnitWordSpec.scala
diff --git a/src/test/scala/org/scalatest/junit/JUnit3SuiteSpec.scala b/scalatest-test/src/test/scala/org/scalatest/junit/JUnit3SuiteSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/junit/JUnit3SuiteSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/junit/JUnit3SuiteSpec.scala
diff --git a/src/test/scala/org/scalatest/junit/JUnitRunnerSuite.scala b/scalatest-test/src/test/scala/org/scalatest/junit/JUnitRunnerSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/junit/JUnitRunnerSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/junit/JUnitRunnerSuite.scala
diff --git a/src/test/scala/org/scalatest/junit/JUnitSuiteSpec.scala b/scalatest-test/src/test/scala/org/scalatest/junit/JUnitSuiteSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/junit/JUnitSuiteSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/junit/JUnitSuiteSpec.scala
diff --git a/src/test/scala/org/scalatest/junit/JUnitSuiteSuite.scala b/scalatest-test/src/test/scala/org/scalatest/junit/JUnitSuiteSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/junit/JUnitSuiteSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/junit/JUnitSuiteSuite.scala
diff --git a/src/test/scala/org/scalatest/junit/JUnitTestFailedErrorSpec.scala b/scalatest-test/src/test/scala/org/scalatest/junit/JUnitTestFailedErrorSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/junit/JUnitTestFailedErrorSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/junit/JUnitTestFailedErrorSpec.scala
diff --git a/src/test/scala/org/scalatest/junit/JUnitWrapperSuiteSuite.scala b/scalatest-test/src/test/scala/org/scalatest/junit/JUnitWrapperSuiteSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/junit/JUnitWrapperSuiteSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/junit/JUnitWrapperSuiteSuite.scala
diff --git a/src/test/scala/org/scalatest/junit/RunNotifierSuite.scala b/scalatest-test/src/test/scala/org/scalatest/junit/RunNotifierSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/junit/RunNotifierSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/junit/RunNotifierSuite.scala
diff --git a/src/test/scala/org/scalatest/junit/helpers/TestWasCalledSuite.scala b/scalatest-test/src/test/scala/org/scalatest/junit/helpers/TestWasCalledSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/junit/helpers/TestWasCalledSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/junit/helpers/TestWasCalledSuite.scala
diff --git a/src/test/scala/org/scalatest/junit/junit4helpers/TestWasCalledSuite.scala b/scalatest-test/src/test/scala/org/scalatest/junit/junit4helpers/TestWasCalledSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/junit/junit4helpers/TestWasCalledSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/junit/junit4helpers/TestWasCalledSuite.scala
diff --git a/src/test/scala/org/scalatest/matchers/AMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/AMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/AMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/AMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/AnMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/AnMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/AnMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/AnMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/BeMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/BeMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/BeMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/BeMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/BePropertyMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/BePropertyMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/BePropertyMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/BePropertyMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/BookPropertyMatchers.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/BookPropertyMatchers.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/BookPropertyMatchers.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/BookPropertyMatchers.scala
diff --git a/src/test/scala/org/scalatest/matchers/HavePropertyMatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/HavePropertyMatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/HavePropertyMatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/HavePropertyMatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/LazyArgSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/LazyArgSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/LazyArgSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/LazyArgSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/MatchResultSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/MatchResultSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/MatchResultSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/MatchResultSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/MatcherFactorySpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/MatcherFactorySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/MatcherFactorySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/MatcherFactorySpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/MatcherProducersSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/MatcherProducersSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/MatcherProducersSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/MatcherProducersSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/MatcherSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/MatcherSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/MatcherSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/MatcherSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/MatcherToStringSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/MatcherToStringSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/MatcherToStringSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/MatcherToStringSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/ShouldAndMustSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/ShouldAndMustSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/ShouldAndMustSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/ShouldAndMustSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/ShouldBehaveLikeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/matchers/ShouldBehaveLikeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/ShouldBehaveLikeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/matchers/ShouldBehaveLikeSpec.scala
diff --git a/src/test/scala/org/scalatest/matchers/ShouldEndWithRegexSpec.OLD b/scalatest-test/src/test/scala/org/scalatest/matchers/ShouldEndWithRegexSpec.OLD
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/ShouldEndWithRegexSpec.OLD
rename to scalatest-test/src/test/scala/org/scalatest/matchers/ShouldEndWithRegexSpec.OLD
diff --git a/src/test/scala/org/scalatest/matchers/ShouldHavePropertiesSpec.OLD b/scalatest-test/src/test/scala/org/scalatest/matchers/ShouldHavePropertiesSpec.OLD
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/ShouldHavePropertiesSpec.OLD
rename to scalatest-test/src/test/scala/org/scalatest/matchers/ShouldHavePropertiesSpec.OLD
diff --git a/src/test/scala/org/scalatest/matchers/ShouldIncludeRegexSpec.OLD b/scalatest-test/src/test/scala/org/scalatest/matchers/ShouldIncludeRegexSpec.OLD
similarity index 100%
rename from src/test/scala/org/scalatest/matchers/ShouldIncludeRegexSpec.OLD
rename to scalatest-test/src/test/scala/org/scalatest/matchers/ShouldIncludeRegexSpec.OLD
diff --git a/src/test/scala/org/scalatest/mock/EasyMockSugarSpec.scala b/scalatest-test/src/test/scala/org/scalatest/mock/EasyMockSugarSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/mock/EasyMockSugarSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/mock/EasyMockSugarSpec.scala
diff --git a/src/test/scala/org/scalatest/mock/JMockCycleSpec.scala b/scalatest-test/src/test/scala/org/scalatest/mock/JMockCycleSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/mock/JMockCycleSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/mock/JMockCycleSpec.scala
diff --git a/src/test/scala/org/scalatest/mytags.scala b/scalatest-test/src/test/scala/org/scalatest/mytags.scala
similarity index 100%
rename from src/test/scala/org/scalatest/mytags.scala
rename to scalatest-test/src/test/scala/org/scalatest/mytags.scala
diff --git a/src/test/scala/org/scalatest/path/ExampleLikeSpecs.scala b/scalatest-test/src/test/scala/org/scalatest/path/ExampleLikeSpecs.scala
similarity index 100%
rename from src/test/scala/org/scalatest/path/ExampleLikeSpecs.scala
rename to scalatest-test/src/test/scala/org/scalatest/path/ExampleLikeSpecs.scala
diff --git a/src/test/scala/org/scalatest/path/FreeSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/path/FreeSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/path/FreeSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/path/FreeSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/path/FunSpecSpec.scala b/scalatest-test/src/test/scala/org/scalatest/path/FunSpecSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/path/FunSpecSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/path/FunSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/path/StackSpec.scala b/scalatest-test/src/test/scala/org/scalatest/path/StackSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/path/StackSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/path/StackSpec.scala
diff --git a/src/test/scala/org/scalatest/prop/CheckersSuite.scala b/scalatest-test/src/test/scala/org/scalatest/prop/CheckersSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/prop/CheckersSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/prop/CheckersSuite.scala
diff --git a/src/test/scala/org/scalatest/prop/ConfigurationSuite.scala b/scalatest-test/src/test/scala/org/scalatest/prop/ConfigurationSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/prop/ConfigurationSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/prop/ConfigurationSuite.scala
diff --git a/src/test/scala/org/scalatest/prop/HelperSuite.scala b/scalatest-test/src/test/scala/org/scalatest/prop/HelperSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/prop/HelperSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/prop/HelperSuite.scala
diff --git a/src/test/scala/org/scalatest/prop/PropertyCheckConfigParamSuite.scala b/scalatest-test/src/test/scala/org/scalatest/prop/PropertyCheckConfigParamSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/prop/PropertyCheckConfigParamSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/prop/PropertyCheckConfigParamSuite.scala
diff --git a/src/test/scala/org/scalatest/prop/PropertyCheckConfigSuite.scala b/scalatest-test/src/test/scala/org/scalatest/prop/PropertyCheckConfigSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/prop/PropertyCheckConfigSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/prop/PropertyCheckConfigSuite.scala
diff --git a/src/test/scala/org/scalatest/prop/TableStyleSpec.scala b/scalatest-test/src/test/scala/org/scalatest/prop/TableStyleSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/prop/TableStyleSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/prop/TableStyleSpec.scala
diff --git a/src/test/scala/org/scalatest/selenium/DriverSpec.scala b/scalatest-test/src/test/scala/org/scalatest/selenium/DriverSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/selenium/DriverSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/selenium/DriverSpec.scala
diff --git a/src/test/scala/org/scalatest/selenium/JettySpec.scala b/scalatest-test/src/test/scala/org/scalatest/selenium/JettySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/selenium/JettySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/selenium/JettySpec.scala
diff --git a/src/test/scala/org/scalatest/selenium/ScreenshotSpec.scala b/scalatest-test/src/test/scala/org/scalatest/selenium/ScreenshotSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/selenium/ScreenshotSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/selenium/ScreenshotSpec.scala
diff --git a/src/test/scala/org/scalatest/selenium/WebBrowserSpec.scala b/scalatest-test/src/test/scala/org/scalatest/selenium/WebBrowserSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/selenium/WebBrowserSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/selenium/WebBrowserSpec.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/FirstTestIgnoredExamples.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/FirstTestIgnoredExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/FirstTestIgnoredExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/FirstTestIgnoredExamples.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/InfoInsideTestFiredAfterTestExamples.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/InfoInsideTestFiredAfterTestExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/InfoInsideTestFiredAfterTestExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/InfoInsideTestFiredAfterTestExamples.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/OnlyFirstTestExecutedOnCreationExamples.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/OnlyFirstTestExecutedOnCreationExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/OnlyFirstTestExecutedOnCreationExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/OnlyFirstTestExecutedOnCreationExamples.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/PathBeforeAndAfterExamples.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/PathBeforeAndAfterExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/PathBeforeAndAfterExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/PathBeforeAndAfterExamples.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/PathListBufferExamples.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/PathListBufferExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/PathListBufferExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/PathListBufferExamples.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/PathSuiteExamples.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/PathSuiteExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/PathSuiteExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/PathSuiteExamples.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/PathSuiteMatrix.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/PathSuiteMatrix.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/PathSuiteMatrix.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/PathSuiteMatrix.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/SecondTestIgnoredExamples.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/SecondTestIgnoredExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/SecondTestIgnoredExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/SecondTestIgnoredExamples.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/SuiteExamples.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/SuiteExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/SuiteExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/SuiteExamples.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/SuiteMatrix.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/SuiteMatrix.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/SuiteMatrix.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/SuiteMatrix.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/TwoSlowAndOneWeakTestExamples.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/TwoSlowAndOneWeakTestExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/TwoSlowAndOneWeakTestExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/TwoSlowAndOneWeakTestExamples.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/TwoSlowTestsExample.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/TwoSlowTestsExample.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/TwoSlowTestsExample.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/TwoSlowTestsExample.scala
diff --git a/src/test/scala/org/scalatest/suiteprop/TwoTestsIgnoredExamples.scala b/scalatest-test/src/test/scala/org/scalatest/suiteprop/TwoTestsIgnoredExamples.scala
similarity index 100%
rename from src/test/scala/org/scalatest/suiteprop/TwoTestsIgnoredExamples.scala
rename to scalatest-test/src/test/scala/org/scalatest/suiteprop/TwoTestsIgnoredExamples.scala
diff --git a/src/test/scala/org/scalatest/testng/TestNGSuiteGroupsSuite.scala b/scalatest-test/src/test/scala/org/scalatest/testng/TestNGSuiteGroupsSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/testng/TestNGSuiteGroupsSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/testng/TestNGSuiteGroupsSuite.scala
diff --git a/src/test/scala/org/scalatest/testng/TestNGSuiteSuite.scala b/scalatest-test/src/test/scala/org/scalatest/testng/TestNGSuiteSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/testng/TestNGSuiteSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/testng/TestNGSuiteSuite.scala
diff --git a/src/test/scala/org/scalatest/testng/TestNGWrapperSuiteSuite.scala b/scalatest-test/src/test/scala/org/scalatest/testng/TestNGWrapperSuiteSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/testng/TestNGWrapperSuiteSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/testng/TestNGWrapperSuiteSuite.scala
diff --git a/src/test/scala/org/scalatest/testng/example/ExampleTestNGSuite.scala b/scalatest-test/src/test/scala/org/scalatest/testng/example/ExampleTestNGSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/testng/example/ExampleTestNGSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/testng/example/ExampleTestNGSuite.scala
diff --git a/src/test/scala/org/scalatest/testng/example/ExampleTestNGWrapperSuite.scala b/scalatest-test/src/test/scala/org/scalatest/testng/example/ExampleTestNGWrapperSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/testng/example/ExampleTestNGWrapperSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/testng/example/ExampleTestNGWrapperSuite.scala
diff --git a/src/test/scala/org/scalatest/testng/example/testngsuite.xml b/scalatest-test/src/test/scala/org/scalatest/testng/example/testngsuite.xml
similarity index 100%
rename from src/test/scala/org/scalatest/testng/example/testngsuite.xml
rename to scalatest-test/src/test/scala/org/scalatest/testng/example/testngsuite.xml
diff --git a/src/test/scala/org/scalatest/time/DurationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/time/DurationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/time/DurationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/time/DurationSpec.scala
diff --git a/src/test/scala/org/scalatest/time/SpanMatchers.scala b/scalatest-test/src/test/scala/org/scalatest/time/SpanMatchers.scala
similarity index 100%
rename from src/test/scala/org/scalatest/time/SpanMatchers.scala
rename to scalatest-test/src/test/scala/org/scalatest/time/SpanMatchers.scala
diff --git a/src/test/scala/org/scalatest/time/SpanSpec.scala b/scalatest-test/src/test/scala/org/scalatest/time/SpanSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/time/SpanSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/time/SpanSpec.scala
diff --git a/src/test/scala/org/scalatest/time/SpanSugarSpec.scala b/scalatest-test/src/test/scala/org/scalatest/time/SpanSugarSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/time/SpanSugarSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/time/SpanSugarSpec.scala
diff --git a/src/test/scala/org/scalatest/tools/DashboardReporterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/DashboardReporterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/DashboardReporterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/DashboardReporterSpec.scala
diff --git a/src/test/scala/org/scalatest/tools/DiscoverySuiteSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/DiscoverySuiteSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/DiscoverySuiteSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/DiscoverySuiteSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/FilterReporterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/FilterReporterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/FilterReporterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/FilterReporterSpec.scala
diff --git a/src/test/scala/org/scalatest/tools/FrameworkSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/FrameworkSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/FrameworkSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/FrameworkSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/HtmlReporterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/HtmlReporterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/HtmlReporterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/HtmlReporterSpec.scala
diff --git a/src/test/scala/org/scalatest/tools/JUnitXmlReporterSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/JUnitXmlReporterSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/JUnitXmlReporterSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/JUnitXmlReporterSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/MemoryReporterSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/MemoryReporterSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/MemoryReporterSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/MemoryReporterSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/PrintReporterSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/PrintReporterSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/PrintReporterSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/PrintReporterSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/RunnerSpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/RunnerSpec.scala
similarity index 99%
rename from src/test/scala/org/scalatest/tools/RunnerSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/RunnerSpec.scala
index 1a94ae0215..4876aad9ac 100644
--- a/src/test/scala/org/scalatest/tools/RunnerSpec.scala
+++ b/scalatest-test/src/test/scala/org/scalatest/tools/RunnerSpec.scala
@@ -1803,7 +1803,7 @@ class RunnerSpec extends Spec with PrivateMethodTester {
     }
 
     Runner.readMemoryFiles(
-      List("src/test/scala/org/scalatest/tools/memoryfile.eg"),
+      List("scalatest-test/src/test/scala/org/scalatest/tools/memoryfile.eg"),
       reporter, tracker)
 
     assert(1 === events.filter(_.isInstanceOf[AlertProvided]).size)
diff --git a/src/test/scala/org/scalatest/tools/SbtCommandParserSpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/SbtCommandParserSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/SbtCommandParserSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/SbtCommandParserSpec.scala
diff --git a/src/test/scala/org/scalatest/tools/ScalaTestAntTaskSpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/ScalaTestAntTaskSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/ScalaTestAntTaskSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/ScalaTestAntTaskSpec.scala
diff --git a/src/test/scala/org/scalatest/tools/ScalaTestFrameworkSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/ScalaTestFrameworkSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/ScalaTestFrameworkSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/ScalaTestFrameworkSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/ScalaTestRunnerSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/ScalaTestRunnerSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/ScalaTestRunnerSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/ScalaTestRunnerSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/SomeApiClass.scala b/scalatest-test/src/test/scala/org/scalatest/tools/SomeApiClass.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/SomeApiClass.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/SomeApiClass.scala
diff --git a/src/test/scala/org/scalatest/tools/SomeApiClassRunner.scala b/scalatest-test/src/test/scala/org/scalatest/tools/SomeApiClassRunner.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/SomeApiClassRunner.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/SomeApiClassRunner.scala
diff --git a/src/test/scala/org/scalatest/tools/SomeApiSubClass.scala b/scalatest-test/src/test/scala/org/scalatest/tools/SomeApiSubClass.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/SomeApiSubClass.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/SomeApiSubClass.scala
diff --git a/src/test/scala/org/scalatest/tools/StringReporterAlertSpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/StringReporterAlertSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/StringReporterAlertSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/StringReporterAlertSpec.scala
diff --git a/src/test/scala/org/scalatest/tools/StringReporterSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/StringReporterSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/StringReporterSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/StringReporterSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/StringReporterSummarySpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/StringReporterSummarySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/StringReporterSummarySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/StringReporterSummarySpec.scala
diff --git a/src/test/scala/org/scalatest/tools/SuiteDiscoveryHelperSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/SuiteDiscoveryHelperSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/SuiteDiscoveryHelperSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/SuiteDiscoveryHelperSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/SuiteSortingReporterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/SuiteSortingReporterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/SuiteSortingReporterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/SuiteSortingReporterSpec.scala
diff --git a/src/test/scala/org/scalatest/tools/TestSortingReporterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/TestSortingReporterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/TestSortingReporterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/TestSortingReporterSpec.scala
diff --git a/src/test/scala/org/scalatest/tools/XmlSocketReporterSpec.scala b/scalatest-test/src/test/scala/org/scalatest/tools/XmlSocketReporterSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/XmlSocketReporterSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/XmlSocketReporterSpec.scala
diff --git a/src/test/scala/org/scalatest/tools/memoryfile.eg b/scalatest-test/src/test/scala/org/scalatest/tools/memoryfile.eg
similarity index 100%
rename from src/test/scala/org/scalatest/tools/memoryfile.eg
rename to scalatest-test/src/test/scala/org/scalatest/tools/memoryfile.eg
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/AbortedSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/AbortedSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/AbortedSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/AbortedSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/CPUTaggedSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/CPUTaggedSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/CPUTaggedSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/CPUTaggedSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/CustomTaggedSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/CustomTaggedSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/CustomTaggedSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/CustomTaggedSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/DiskTaggedSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/DiskTaggedSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/DiskTaggedSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/DiskTaggedSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/DoNotDiscoverSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/DoNotDiscoverSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/DoNotDiscoverSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/DoNotDiscoverSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/NestedConfigMapSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/NestedConfigMapSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/NestedConfigMapSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/NestedConfigMapSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/NetworkTaggedSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/NetworkTaggedSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/NetworkTaggedSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/NetworkTaggedSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/NotASuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/NotASuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/NotASuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/NotASuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/SampleInheritedSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SampleInheritedSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/SampleInheritedSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SampleInheritedSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/SampleSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SampleSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/SampleSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SampleSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/SlowSampleSuite.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SlowSampleSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/SlowSampleSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SlowSampleSuite.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/SuiteWithFailedCanceledTests.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SuiteWithFailedCanceledTests.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/SuiteWithFailedCanceledTests.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SuiteWithFailedCanceledTests.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/SuiteWithFailedSkippedTests.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SuiteWithFailedSkippedTests.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/SuiteWithFailedSkippedTests.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SuiteWithFailedSkippedTests.scala
diff --git a/src/test/scala/org/scalatest/tools/scalasbt/SuiteWithNestedSuites.scala b/scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SuiteWithNestedSuites.scala
similarity index 100%
rename from src/test/scala/org/scalatest/tools/scalasbt/SuiteWithNestedSuites.scala
rename to scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SuiteWithNestedSuites.scala
diff --git a/src/test/scala/org/scalatest/words/BeWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/BeWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/BeWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/BeWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/BehaveWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/BehaveWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/BehaveWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/BehaveWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/CanVerbSuite.scala b/scalatest-test/src/test/scala/org/scalatest/words/CanVerbSuite.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/CanVerbSuite.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/CanVerbSuite.scala
diff --git a/src/test/scala/org/scalatest/words/ContainWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ContainWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ContainWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ContainWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/DefinedWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/DefinedWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/DefinedWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/DefinedWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/EmptyWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/EmptyWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/EmptyWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/EmptyWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/EndWithWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/EndWithWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/EndWithWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/EndWithWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ExistWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ExistWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ExistWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ExistWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/FullyMatchWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/FullyMatchWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/FullyMatchWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/FullyMatchWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/HaveWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/HaveWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/HaveWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/HaveWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/IncludeWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/IncludeWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/IncludeWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/IncludeWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/LengthWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/LengthWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/LengthWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/LengthWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/MatcherWordsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/MatcherWordsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/MatcherWordsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/MatcherWordsSpec.scala
diff --git a/src/test/scala/org/scalatest/words/NoExceptionWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/NoExceptionWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/NoExceptionWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/NoExceptionWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/NotWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/NotWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/NotWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/NotWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ReadableWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ReadableWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ReadableWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ReadableWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/RegexWithGroupsSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/RegexWithGroupsSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/RegexWithGroupsSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/RegexWithGroupsSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfATypeInvocationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfATypeInvocationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfATypeInvocationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfATypeInvocationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAWordToAMatcherApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAWordToAMatcherApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAWordToAMatcherApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAWordToAMatcherApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAWordToBePropertyMatcherApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAWordToBePropertyMatcherApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAWordToBePropertyMatcherApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAWordToBePropertyMatcherApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAWordToSymbolApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAWordToSymbolApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAWordToSymbolApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAWordToSymbolApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAfterWordApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAfterWordApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAfterWordApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAfterWordApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAllOfApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAllOfApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAllOfApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAllOfApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAnTypeInvocationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAnTypeInvocationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAnTypeInvocationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAnTypeInvocationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAnWordToAnMatcherApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAnWordToAnMatcherApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAnWordToAnMatcherApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAnWordToAnMatcherApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAnWordToBePropertyMatcherApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAnWordToBePropertyMatcherApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAnWordToBePropertyMatcherApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAnWordToBePropertyMatcherApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAnWordToSymbolApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAnWordToSymbolApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAnWordToSymbolApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAnWordToSymbolApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAtLeastOneOfApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAtLeastOneOfApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAtLeastOneOfApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAtLeastOneOfApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfAtMostOneOfApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAtMostOneOfApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfAtMostOneOfApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfAtMostOneOfApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfBeWordForATypeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfBeWordForATypeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfBeWordForATypeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfBeWordForATypeSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfBeWordForAnTypeSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfBeWordForAnTypeSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfBeWordForAnTypeSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfBeWordForAnTypeSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfBeWordForNoExceptionSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfBeWordForNoExceptionSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfBeWordForNoExceptionSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfBeWordForNoExceptionSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfContainWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfContainWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfContainWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfContainWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfDefinedAtSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfDefinedAtSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfDefinedAtSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfDefinedAtSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfGreaterThanComparisonSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfGreaterThanComparisonSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfGreaterThanComparisonSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfGreaterThanComparisonSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfGreaterThanOrEqualToComparisonSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfGreaterThanOrEqualToComparisonSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfGreaterThanOrEqualToComparisonSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfGreaterThanOrEqualToComparisonSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfInOrderApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfInOrderApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfInOrderApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfInOrderApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfInOrderOnlyApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfInOrderOnlyApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfInOrderOnlyApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfInOrderOnlyApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfKeyWordApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfKeyWordApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfKeyWordApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfKeyWordApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfLengthWordApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfLengthWordApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfLengthWordApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfLengthWordApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfLessThanComparisonSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfLessThanComparisonSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfLessThanComparisonSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfLessThanComparisonSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfLessThanOrEqualToComparisonSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfLessThanOrEqualToComparisonSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfLessThanOrEqualToComparisonSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfLessThanOrEqualToComparisonSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfMessageWordApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfMessageWordApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfMessageWordApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfMessageWordApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfNoneOfApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfNoneOfApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfNoneOfApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfNoneOfApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfNotExistSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfNotExistSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfNotExistSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfNotExistSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfNotWordForAnySpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfNotWordForAnySpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfNotWordForAnySpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfNotWordForAnySpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfOfTypeInvocationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfOfTypeInvocationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfOfTypeInvocationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfOfTypeInvocationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfOneOfApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfOneOfApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfOneOfApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfOneOfApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfOnlyApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfOnlyApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfOnlyApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfOnlyApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfRegexWordApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfRegexWordApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfRegexWordApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfRegexWordApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfSizeWordApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfSizeWordApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfSizeWordApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfSizeWordApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfTheSameElementsAsApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfTheSameElementsAsApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfTheSameElementsAsApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfTheSameElementsAsApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfTheSameElementsInOrderAsApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfTheSameElementsInOrderAsApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfTheSameElementsInOrderAsApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfTheSameElementsInOrderAsApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfTheSameInstanceAsApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfTheSameInstanceAsApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfTheSameInstanceAsApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfTheSameInstanceAsApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfTheTypeInvocationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfTheTypeInvocationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfTheTypeInvocationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfTheTypeInvocationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfThrownByApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfThrownByApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfThrownByApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfThrownByApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/ResultOfValueWordApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfValueWordApplicationSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/ResultOfValueWordApplicationSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/ResultOfValueWordApplicationSpec.scala
diff --git a/src/test/scala/org/scalatest/words/SizeWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/SizeWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/SizeWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/SizeWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/SortedWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/SortedWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/SortedWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/SortedWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/StartWithWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/StartWithWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/StartWithWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/StartWithWordSpec.scala
diff --git a/src/test/scala/org/scalatest/words/WritableWordSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/WritableWordSpec.scala
similarity index 100%
rename from src/test/scala/org/scalatest/words/WritableWordSpec.scala
rename to scalatest-test/src/test/scala/org/scalatest/words/WritableWordSpec.scala
diff --git a/src/us/US.scala b/scalatest-test/src/us/US.scala
similarity index 100%
rename from src/us/US.scala
rename to scalatest-test/src/us/US.scala
diff --git a/src/us/readme.txt b/scalatest-test/src/us/readme.txt
similarity index 100%
rename from src/us/readme.txt
rename to scalatest-test/src/us/readme.txt
diff --git a/src/us/runem.scala b/scalatest-test/src/us/runem.scala
similarity index 100%
rename from src/us/runem.scala
rename to scalatest-test/src/us/runem.scala
diff --git a/src/main/html/addl.css b/scalatest/src/main/html/addl.css
similarity index 100%
rename from src/main/html/addl.css
rename to scalatest/src/main/html/addl.css
diff --git a/src/main/html/featureSpec.gif b/scalatest/src/main/html/featureSpec.gif
similarity index 100%
rename from src/main/html/featureSpec.gif
rename to scalatest/src/main/html/featureSpec.gif
diff --git a/src/main/html/flatSpec.gif b/scalatest/src/main/html/flatSpec.gif
similarity index 100%
rename from src/main/html/flatSpec.gif
rename to scalatest/src/main/html/flatSpec.gif
diff --git a/src/main/html/freeSpec.gif b/scalatest/src/main/html/freeSpec.gif
similarity index 100%
rename from src/main/html/freeSpec.gif
rename to scalatest/src/main/html/freeSpec.gif
diff --git a/src/main/html/funSpec.gif b/scalatest/src/main/html/funSpec.gif
similarity index 100%
rename from src/main/html/funSpec.gif
rename to scalatest/src/main/html/funSpec.gif
diff --git a/src/main/html/funSuite.gif b/scalatest/src/main/html/funSuite.gif
similarity index 100%
rename from src/main/html/funSuite.gif
rename to scalatest/src/main/html/funSuite.gif
diff --git a/src/main/html/propSpec.gif b/scalatest/src/main/html/propSpec.gif
similarity index 100%
rename from src/main/html/propSpec.gif
rename to scalatest/src/main/html/propSpec.gif
diff --git a/src/main/html/spec.gif b/scalatest/src/main/html/spec.gif
similarity index 100%
rename from src/main/html/spec.gif
rename to scalatest/src/main/html/spec.gif
diff --git a/src/main/html/wordSpec.gif b/scalatest/src/main/html/wordSpec.gif
similarity index 100%
rename from src/main/html/wordSpec.gif
rename to scalatest/src/main/html/wordSpec.gif
diff --git a/src/main/java/org/scalatest/DoNotDiscover.java b/scalatest/src/main/java/org/scalatest/DoNotDiscover.java
similarity index 100%
rename from src/main/java/org/scalatest/DoNotDiscover.java
rename to scalatest/src/main/java/org/scalatest/DoNotDiscover.java
diff --git a/src/main/java/org/scalatest/Finders.java b/scalatest/src/main/java/org/scalatest/Finders.java
similarity index 100%
rename from src/main/java/org/scalatest/Finders.java
rename to scalatest/src/main/java/org/scalatest/Finders.java
diff --git a/src/main/java/org/scalatest/Ignore.java b/scalatest/src/main/java/org/scalatest/Ignore.java
similarity index 100%
rename from src/main/java/org/scalatest/Ignore.java
rename to scalatest/src/main/java/org/scalatest/Ignore.java
diff --git a/src/main/java/org/scalatest/TagAnnotation.java b/scalatest/src/main/java/org/scalatest/TagAnnotation.java
similarity index 100%
rename from src/main/java/org/scalatest/TagAnnotation.java
rename to scalatest/src/main/java/org/scalatest/TagAnnotation.java
diff --git a/src/main/java/org/scalatest/WrapWith.java b/scalatest/src/main/java/org/scalatest/WrapWith.java
similarity index 100%
rename from src/main/java/org/scalatest/WrapWith.java
rename to scalatest/src/main/java/org/scalatest/WrapWith.java
diff --git a/src/main/java/org/scalatest/tags/CPU.java b/scalatest/src/main/java/org/scalatest/tags/CPU.java
similarity index 100%
rename from src/main/java/org/scalatest/tags/CPU.java
rename to scalatest/src/main/java/org/scalatest/tags/CPU.java
diff --git a/src/main/java/org/scalatest/tags/ChromeBrowser.java b/scalatest/src/main/java/org/scalatest/tags/ChromeBrowser.java
similarity index 100%
rename from src/main/java/org/scalatest/tags/ChromeBrowser.java
rename to scalatest/src/main/java/org/scalatest/tags/ChromeBrowser.java
diff --git a/src/main/java/org/scalatest/tags/Disk.java b/scalatest/src/main/java/org/scalatest/tags/Disk.java
similarity index 100%
rename from src/main/java/org/scalatest/tags/Disk.java
rename to scalatest/src/main/java/org/scalatest/tags/Disk.java
diff --git a/src/main/java/org/scalatest/tags/FirefoxBrowser.java b/scalatest/src/main/java/org/scalatest/tags/FirefoxBrowser.java
similarity index 100%
rename from src/main/java/org/scalatest/tags/FirefoxBrowser.java
rename to scalatest/src/main/java/org/scalatest/tags/FirefoxBrowser.java
diff --git a/src/main/java/org/scalatest/tags/HtmlUnitBrowser.java b/scalatest/src/main/java/org/scalatest/tags/HtmlUnitBrowser.java
similarity index 100%
rename from src/main/java/org/scalatest/tags/HtmlUnitBrowser.java
rename to scalatest/src/main/java/org/scalatest/tags/HtmlUnitBrowser.java
diff --git a/src/main/java/org/scalatest/tags/InternetExplorerBrowser.java b/scalatest/src/main/java/org/scalatest/tags/InternetExplorerBrowser.java
similarity index 100%
rename from src/main/java/org/scalatest/tags/InternetExplorerBrowser.java
rename to scalatest/src/main/java/org/scalatest/tags/InternetExplorerBrowser.java
diff --git a/src/main/java/org/scalatest/tags/Network.java b/scalatest/src/main/java/org/scalatest/tags/Network.java
similarity index 100%
rename from src/main/java/org/scalatest/tags/Network.java
rename to scalatest/src/main/java/org/scalatest/tags/Network.java
diff --git a/src/main/java/org/scalatest/tags/Retryable.java b/scalatest/src/main/java/org/scalatest/tags/Retryable.java
similarity index 100%
rename from src/main/java/org/scalatest/tags/Retryable.java
rename to scalatest/src/main/java/org/scalatest/tags/Retryable.java
diff --git a/src/main/java/org/scalatest/tags/SafariBrowser.java b/scalatest/src/main/java/org/scalatest/tags/SafariBrowser.java
similarity index 100%
rename from src/main/java/org/scalatest/tags/SafariBrowser.java
rename to scalatest/src/main/java/org/scalatest/tags/SafariBrowser.java
diff --git a/src/main/java/org/scalatest/tags/Slow.java b/scalatest/src/main/java/org/scalatest/tags/Slow.java
similarity index 100%
rename from src/main/java/org/scalatest/tags/Slow.java
rename to scalatest/src/main/java/org/scalatest/tags/Slow.java
diff --git a/src/main/resources/images/bluedot.gif b/scalatest/src/main/resources/images/bluedot.gif
similarity index 100%
rename from src/main/resources/images/bluedot.gif
rename to scalatest/src/main/resources/images/bluedot.gif
diff --git a/src/main/resources/images/bluedots.psd b/scalatest/src/main/resources/images/bluedots.psd
similarity index 100%
rename from src/main/resources/images/bluedots.psd
rename to scalatest/src/main/resources/images/bluedots.psd
diff --git a/src/main/resources/images/bluedotsel.gif b/scalatest/src/main/resources/images/bluedotsel.gif
similarity index 100%
rename from src/main/resources/images/bluedotsel.gif
rename to scalatest/src/main/resources/images/bluedotsel.gif
diff --git a/src/main/resources/images/cyandot.gif b/scalatest/src/main/resources/images/cyandot.gif
similarity index 100%
rename from src/main/resources/images/cyandot.gif
rename to scalatest/src/main/resources/images/cyandot.gif
diff --git a/src/main/resources/images/cyandots.psd b/scalatest/src/main/resources/images/cyandots.psd
similarity index 100%
rename from src/main/resources/images/cyandots.psd
rename to scalatest/src/main/resources/images/cyandots.psd
diff --git a/src/main/resources/images/cyandotsel.gif b/scalatest/src/main/resources/images/cyandotsel.gif
similarity index 100%
rename from src/main/resources/images/cyandotsel.gif
rename to scalatest/src/main/resources/images/cyandotsel.gif
diff --git a/src/main/resources/images/dots.psd b/scalatest/src/main/resources/images/dots.psd
similarity index 100%
rename from src/main/resources/images/dots.psd
rename to scalatest/src/main/resources/images/dots.psd
diff --git a/src/main/resources/images/graybullet.gif b/scalatest/src/main/resources/images/graybullet.gif
similarity index 100%
rename from src/main/resources/images/graybullet.gif
rename to scalatest/src/main/resources/images/graybullet.gif
diff --git a/src/main/resources/images/graybullet.psd b/scalatest/src/main/resources/images/graybullet.psd
similarity index 100%
rename from src/main/resources/images/graybullet.psd
rename to scalatest/src/main/resources/images/graybullet.psd
diff --git a/src/main/resources/images/graydot.gif b/scalatest/src/main/resources/images/graydot.gif
similarity index 100%
rename from src/main/resources/images/graydot.gif
rename to scalatest/src/main/resources/images/graydot.gif
diff --git a/src/main/resources/images/graydots.psd b/scalatest/src/main/resources/images/graydots.psd
similarity index 100%
rename from src/main/resources/images/graydots.psd
rename to scalatest/src/main/resources/images/graydots.psd
diff --git a/src/main/resources/images/graydotsel.gif b/scalatest/src/main/resources/images/graydotsel.gif
similarity index 100%
rename from src/main/resources/images/graydotsel.gif
rename to scalatest/src/main/resources/images/graydotsel.gif
diff --git a/src/main/resources/images/greenbullet.gif b/scalatest/src/main/resources/images/greenbullet.gif
similarity index 100%
rename from src/main/resources/images/greenbullet.gif
rename to scalatest/src/main/resources/images/greenbullet.gif
diff --git a/src/main/resources/images/greenbullet.psd b/scalatest/src/main/resources/images/greenbullet.psd
similarity index 100%
rename from src/main/resources/images/greenbullet.psd
rename to scalatest/src/main/resources/images/greenbullet.psd
diff --git a/src/main/resources/images/greendot.gif b/scalatest/src/main/resources/images/greendot.gif
similarity index 100%
rename from src/main/resources/images/greendot.gif
rename to scalatest/src/main/resources/images/greendot.gif
diff --git a/src/main/resources/images/greendots.psd b/scalatest/src/main/resources/images/greendots.psd
similarity index 100%
rename from src/main/resources/images/greendots.psd
rename to scalatest/src/main/resources/images/greendots.psd
diff --git a/src/main/resources/images/greendotsel.gif b/scalatest/src/main/resources/images/greendotsel.gif
similarity index 100%
rename from src/main/resources/images/greendotsel.gif
rename to scalatest/src/main/resources/images/greendotsel.gif
diff --git a/src/main/resources/images/inProgress.gif b/scalatest/src/main/resources/images/inProgress.gif
similarity index 100%
rename from src/main/resources/images/inProgress.gif
rename to scalatest/src/main/resources/images/inProgress.gif
diff --git a/src/main/resources/images/purpledot.gif b/scalatest/src/main/resources/images/purpledot.gif
similarity index 100%
rename from src/main/resources/images/purpledot.gif
rename to scalatest/src/main/resources/images/purpledot.gif
diff --git a/src/main/resources/images/purpledots.psd b/scalatest/src/main/resources/images/purpledots.psd
similarity index 100%
rename from src/main/resources/images/purpledots.psd
rename to scalatest/src/main/resources/images/purpledots.psd
diff --git a/src/main/resources/images/purpledotsel.gif b/scalatest/src/main/resources/images/purpledotsel.gif
similarity index 100%
rename from src/main/resources/images/purpledotsel.gif
rename to scalatest/src/main/resources/images/purpledotsel.gif
diff --git a/src/main/resources/images/redbullet.gif b/scalatest/src/main/resources/images/redbullet.gif
similarity index 100%
rename from src/main/resources/images/redbullet.gif
rename to scalatest/src/main/resources/images/redbullet.gif
diff --git a/src/main/resources/images/redbullet.psd b/scalatest/src/main/resources/images/redbullet.psd
similarity index 100%
rename from src/main/resources/images/redbullet.psd
rename to scalatest/src/main/resources/images/redbullet.psd
diff --git a/src/main/resources/images/reddot.gif b/scalatest/src/main/resources/images/reddot.gif
similarity index 100%
rename from src/main/resources/images/reddot.gif
rename to scalatest/src/main/resources/images/reddot.gif
diff --git a/src/main/resources/images/reddots.psd b/scalatest/src/main/resources/images/reddots.psd
similarity index 100%
rename from src/main/resources/images/reddots.psd
rename to scalatest/src/main/resources/images/reddots.psd
diff --git a/src/main/resources/images/reddotsel.gif b/scalatest/src/main/resources/images/reddotsel.gif
similarity index 100%
rename from src/main/resources/images/reddotsel.gif
rename to scalatest/src/main/resources/images/reddotsel.gif
diff --git a/src/main/resources/images/yellowbullet.gif b/scalatest/src/main/resources/images/yellowbullet.gif
similarity index 100%
rename from src/main/resources/images/yellowbullet.gif
rename to scalatest/src/main/resources/images/yellowbullet.gif
diff --git a/src/main/resources/images/yellowbullet.psd b/scalatest/src/main/resources/images/yellowbullet.psd
similarity index 100%
rename from src/main/resources/images/yellowbullet.psd
rename to scalatest/src/main/resources/images/yellowbullet.psd
diff --git a/src/main/resources/images/yellowdot.gif b/scalatest/src/main/resources/images/yellowdot.gif
similarity index 100%
rename from src/main/resources/images/yellowdot.gif
rename to scalatest/src/main/resources/images/yellowdot.gif
diff --git a/src/main/resources/images/yellowdots.psd b/scalatest/src/main/resources/images/yellowdots.psd
similarity index 100%
rename from src/main/resources/images/yellowdots.psd
rename to scalatest/src/main/resources/images/yellowdots.psd
diff --git a/src/main/resources/images/yellowdotsel.gif b/scalatest/src/main/resources/images/yellowdotsel.gif
similarity index 100%
rename from src/main/resources/images/yellowdotsel.gif
rename to scalatest/src/main/resources/images/yellowdotsel.gif
diff --git a/scalatest/src/main/resources/org/scalactic/ScalacticBundle.properties b/scalatest/src/main/resources/org/scalactic/ScalacticBundle.properties
new file mode 100644
index 0000000000..f8876dc9d5
--- /dev/null
+++ b/scalatest/src/main/resources/org/scalactic/ScalacticBundle.properties
@@ -0,0 +1,42 @@
+bigProblems=An exception or error caused a run to abort. 
+didNotEqual={0} did not equal {1}
+equaled={0} equaled {1}
+wasPlusOrMinus={0} was {1} plus or minus {2}
+wasNotPlusOrMinus={0} was not {1} plus or minus {2}
+expressionWasFalse=Expression was false
+expressionWasTrue=Expression was true
+wasNull={0} was null
+wereNull={0} were null
+comma=,\u0020
+and={0} and {1}
+wasTrue={0} was true
+wasFalse={0} was false
+wasLessThan={0} was less than {1}
+wasNotLessThan={0} was not less than {1}
+wasGreaterThan={0} was greater than {1}
+wasNotGreaterThan={0} was not greater than {1}
+wasLessThanOrEqualTo={0} was less than or equal to {1}
+wasNotLessThanOrEqualTo={0} was not less than or equal to {1}
+wasGreaterThanOrEqualTo={0} was greater than or equal to {1}
+wasNotGreaterThanOrEqualTo={0} was not greater than or equal to {1}
+didNotStartWith={0} did not start with {1}
+startedWith={0} started with {1}
+didNotEndWith={0} did not end with {1}
+endedWith={0} ended with {1}
+didNotContain={0} did not contain {1}
+contained={0} contained {1}
+didNotContainKey={0} did not contain key {1}
+containedKey={0} contained key {1}
+wasTheSameInstanceAs={0} was the same instance as {1}
+wasNotTheSameInstanceAs={0} was not the same instance as {1}
+wasNotEmpty={0} was not empty
+wasEmpty={0} was empty
+wasNotInstanceOf={0} was not instance of {1}
+wasInstanceOf={0} was instance of {1}
+hadLengthInsteadOfExpectedLength={0} had length {1} instead of expected length {2}
+hadLength={0} had length {1}
+hadSizeInsteadOfExpectedSize={0} had size {1} instead of expected size {2}
+hadSize={0} had size {1}
+commaBut={0}, but {1}
+commaAnd={0}, and {1}
+variableWasValue={0} was {1}
diff --git a/src/main/resources/org/scalatest/HtmlReporter.css b/scalatest/src/main/resources/org/scalatest/HtmlReporter.css
similarity index 100%
rename from src/main/resources/org/scalatest/HtmlReporter.css
rename to scalatest/src/main/resources/org/scalatest/HtmlReporter.css
diff --git a/src/main/resources/org/scalatest/ScalaTestBundle.properties b/scalatest/src/main/resources/org/scalatest/ScalaTestBundle.properties
similarity index 100%
rename from src/main/resources/org/scalatest/ScalaTestBundle.properties
rename to scalatest/src/main/resources/org/scalatest/ScalaTestBundle.properties
diff --git a/src/main/resources/org/scalatest/d3.v2.min.js b/scalatest/src/main/resources/org/scalatest/d3.v2.min.js
similarity index 100%
rename from src/main/resources/org/scalatest/d3.v2.min.js
rename to scalatest/src/main/resources/org/scalatest/d3.v2.min.js
diff --git a/src/main/resources/org/scalatest/sorttable.js b/scalatest/src/main/resources/org/scalatest/sorttable.js
similarity index 100%
rename from src/main/resources/org/scalatest/sorttable.js
rename to scalatest/src/main/resources/org/scalatest/sorttable.js
diff --git a/src/main/scala/org/scalatest/Alerter.scala b/scalatest/src/main/scala/org/scalatest/Alerter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Alerter.scala
rename to scalatest/src/main/scala/org/scalatest/Alerter.scala
diff --git a/src/main/scala/org/scalatest/Alerting.scala b/scalatest/src/main/scala/org/scalatest/Alerting.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Alerting.scala
rename to scalatest/src/main/scala/org/scalatest/Alerting.scala
diff --git a/src/main/scala/org/scalatest/AppendedClues.scala b/scalatest/src/main/scala/org/scalatest/AppendedClues.scala
similarity index 100%
rename from src/main/scala/org/scalatest/AppendedClues.scala
rename to scalatest/src/main/scala/org/scalatest/AppendedClues.scala
diff --git a/src/main/scala/org/scalatest/Args.scala b/scalatest/src/main/scala/org/scalatest/Args.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Args.scala
rename to scalatest/src/main/scala/org/scalatest/Args.scala
diff --git a/src/main/scala/org/scalatest/Assertions.scala b/scalatest/src/main/scala/org/scalatest/Assertions.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Assertions.scala
rename to scalatest/src/main/scala/org/scalatest/Assertions.scala
diff --git a/src/main/scala/org/scalatest/AssertionsMacro.scala b/scalatest/src/main/scala/org/scalatest/AssertionsMacro.scala
similarity index 100%
rename from src/main/scala/org/scalatest/AssertionsMacro.scala
rename to scalatest/src/main/scala/org/scalatest/AssertionsMacro.scala
diff --git a/src/main/scala/org/scalatest/BeforeAndAfter.scala b/scalatest/src/main/scala/org/scalatest/BeforeAndAfter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/BeforeAndAfter.scala
rename to scalatest/src/main/scala/org/scalatest/BeforeAndAfter.scala
diff --git a/src/main/scala/org/scalatest/BeforeAndAfterAll.scala b/scalatest/src/main/scala/org/scalatest/BeforeAndAfterAll.scala
similarity index 100%
rename from src/main/scala/org/scalatest/BeforeAndAfterAll.scala
rename to scalatest/src/main/scala/org/scalatest/BeforeAndAfterAll.scala
diff --git a/src/main/scala/org/scalatest/BeforeAndAfterAllConfigMap.scala b/scalatest/src/main/scala/org/scalatest/BeforeAndAfterAllConfigMap.scala
similarity index 100%
rename from src/main/scala/org/scalatest/BeforeAndAfterAllConfigMap.scala
rename to scalatest/src/main/scala/org/scalatest/BeforeAndAfterAllConfigMap.scala
diff --git a/src/main/scala/org/scalatest/BeforeAndAfterEach.scala b/scalatest/src/main/scala/org/scalatest/BeforeAndAfterEach.scala
similarity index 100%
rename from src/main/scala/org/scalatest/BeforeAndAfterEach.scala
rename to scalatest/src/main/scala/org/scalatest/BeforeAndAfterEach.scala
diff --git a/src/main/scala/org/scalatest/BeforeAndAfterEachTestData.scala b/scalatest/src/main/scala/org/scalatest/BeforeAndAfterEachTestData.scala
similarity index 100%
rename from src/main/scala/org/scalatest/BeforeAndAfterEachTestData.scala
rename to scalatest/src/main/scala/org/scalatest/BeforeAndAfterEachTestData.scala
diff --git a/src/main/scala/org/scalatest/CancelAfterFailure.scala b/scalatest/src/main/scala/org/scalatest/CancelAfterFailure.scala
similarity index 100%
rename from src/main/scala/org/scalatest/CancelAfterFailure.scala
rename to scalatest/src/main/scala/org/scalatest/CancelAfterFailure.scala
diff --git a/src/main/scala/org/scalatest/CatchReporter.scala b/scalatest/src/main/scala/org/scalatest/CatchReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/CatchReporter.scala
rename to scalatest/src/main/scala/org/scalatest/CatchReporter.scala
diff --git a/src/main/scala/org/scalatest/Checkpoints.scala b/scalatest/src/main/scala/org/scalatest/Checkpoints.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Checkpoints.scala
rename to scalatest/src/main/scala/org/scalatest/Checkpoints.scala
diff --git a/src/main/scala/org/scalatest/CompileMacro.scala b/scalatest/src/main/scala/org/scalatest/CompileMacro.scala
similarity index 100%
rename from src/main/scala/org/scalatest/CompileMacro.scala
rename to scalatest/src/main/scala/org/scalatest/CompileMacro.scala
diff --git a/src/main/scala/org/scalatest/ConcurrentInformer.scala b/scalatest/src/main/scala/org/scalatest/ConcurrentInformer.scala
similarity index 100%
rename from src/main/scala/org/scalatest/ConcurrentInformer.scala
rename to scalatest/src/main/scala/org/scalatest/ConcurrentInformer.scala
diff --git a/src/main/scala/org/scalatest/ConfigMap.scala b/scalatest/src/main/scala/org/scalatest/ConfigMap.scala
similarity index 100%
rename from src/main/scala/org/scalatest/ConfigMap.scala
rename to scalatest/src/main/scala/org/scalatest/ConfigMap.scala
diff --git a/src/main/scala/org/scalatest/ConfigMapWrapperSuite.scala b/scalatest/src/main/scala/org/scalatest/ConfigMapWrapperSuite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/ConfigMapWrapperSuite.scala
rename to scalatest/src/main/scala/org/scalatest/ConfigMapWrapperSuite.scala
diff --git a/src/main/scala/org/scalatest/DiagrammedAssertions.scala b/scalatest/src/main/scala/org/scalatest/DiagrammedAssertions.scala
similarity index 100%
rename from src/main/scala/org/scalatest/DiagrammedAssertions.scala
rename to scalatest/src/main/scala/org/scalatest/DiagrammedAssertions.scala
diff --git a/src/main/scala/org/scalatest/DiagrammedAssertionsMacro.scala b/scalatest/src/main/scala/org/scalatest/DiagrammedAssertionsMacro.scala
similarity index 100%
rename from src/main/scala/org/scalatest/DiagrammedAssertionsMacro.scala
rename to scalatest/src/main/scala/org/scalatest/DiagrammedAssertionsMacro.scala
diff --git a/src/main/scala/org/scalatest/DiagrammedExpr.scala b/scalatest/src/main/scala/org/scalatest/DiagrammedExpr.scala
similarity index 100%
rename from src/main/scala/org/scalatest/DiagrammedExpr.scala
rename to scalatest/src/main/scala/org/scalatest/DiagrammedExpr.scala
diff --git a/src/main/scala/org/scalatest/DiagrammedExprMacro.scala b/scalatest/src/main/scala/org/scalatest/DiagrammedExprMacro.scala
similarity index 100%
rename from src/main/scala/org/scalatest/DiagrammedExprMacro.scala
rename to scalatest/src/main/scala/org/scalatest/DiagrammedExprMacro.scala
diff --git a/src/main/scala/org/scalatest/DispatchReporter.scala b/scalatest/src/main/scala/org/scalatest/DispatchReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/DispatchReporter.scala
rename to scalatest/src/main/scala/org/scalatest/DispatchReporter.scala
diff --git a/src/main/scala/org/scalatest/DistributedSuiteSorter.scala b/scalatest/src/main/scala/org/scalatest/DistributedSuiteSorter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/DistributedSuiteSorter.scala
rename to scalatest/src/main/scala/org/scalatest/DistributedSuiteSorter.scala
diff --git a/src/main/scala/org/scalatest/DistributedTestSorter.scala b/scalatest/src/main/scala/org/scalatest/DistributedTestSorter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/DistributedTestSorter.scala
rename to scalatest/src/main/scala/org/scalatest/DistributedTestSorter.scala
diff --git a/src/main/scala/org/scalatest/Distributor.scala b/scalatest/src/main/scala/org/scalatest/Distributor.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Distributor.scala
rename to scalatest/src/main/scala/org/scalatest/Distributor.scala
diff --git a/src/main/scala/org/scalatest/Doc.scala b/scalatest/src/main/scala/org/scalatest/Doc.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Doc.scala
rename to scalatest/src/main/scala/org/scalatest/Doc.scala
diff --git a/src/main/scala/org/scalatest/DocSpec.scala b/scalatest/src/main/scala/org/scalatest/DocSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/DocSpec.scala
rename to scalatest/src/main/scala/org/scalatest/DocSpec.scala
diff --git a/src/main/scala/org/scalatest/DocSpecLike.scala b/scalatest/src/main/scala/org/scalatest/DocSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/DocSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/DocSpecLike.scala
diff --git a/src/main/scala/org/scalatest/Documenter.scala b/scalatest/src/main/scala/org/scalatest/Documenter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Documenter.scala
rename to scalatest/src/main/scala/org/scalatest/Documenter.scala
diff --git a/src/main/scala/org/scalatest/Documenting.scala b/scalatest/src/main/scala/org/scalatest/Documenting.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Documenting.scala
rename to scalatest/src/main/scala/org/scalatest/Documenting.scala
diff --git a/src/main/scala/org/scalatest/DynaTags.scala b/scalatest/src/main/scala/org/scalatest/DynaTags.scala
similarity index 100%
rename from src/main/scala/org/scalatest/DynaTags.scala
rename to scalatest/src/main/scala/org/scalatest/DynaTags.scala
diff --git a/src/main/scala/org/scalatest/EitherValues.scala b/scalatest/src/main/scala/org/scalatest/EitherValues.scala
similarity index 100%
rename from src/main/scala/org/scalatest/EitherValues.scala
rename to scalatest/src/main/scala/org/scalatest/EitherValues.scala
diff --git a/src/main/scala/org/scalatest/EncodedOrdering.scala b/scalatest/src/main/scala/org/scalatest/EncodedOrdering.scala
similarity index 100%
rename from src/main/scala/org/scalatest/EncodedOrdering.scala
rename to scalatest/src/main/scala/org/scalatest/EncodedOrdering.scala
diff --git a/src/main/scala/org/scalatest/Engine.scala b/scalatest/src/main/scala/org/scalatest/Engine.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Engine.scala
rename to scalatest/src/main/scala/org/scalatest/Engine.scala
diff --git a/src/main/scala/org/scalatest/Entry.scala b/scalatest/src/main/scala/org/scalatest/Entry.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Entry.scala
rename to scalatest/src/main/scala/org/scalatest/Entry.scala
diff --git a/src/main/scala/org/scalatest/FailureMessages.scala b/scalatest/src/main/scala/org/scalatest/FailureMessages.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FailureMessages.scala
rename to scalatest/src/main/scala/org/scalatest/FailureMessages.scala
diff --git a/src/main/scala/org/scalatest/FeatureSpec.scala b/scalatest/src/main/scala/org/scalatest/FeatureSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FeatureSpec.scala
rename to scalatest/src/main/scala/org/scalatest/FeatureSpec.scala
diff --git a/src/main/scala/org/scalatest/FeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/FeatureSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FeatureSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/FeatureSpecLike.scala
diff --git a/src/main/scala/org/scalatest/Filter.scala b/scalatest/src/main/scala/org/scalatest/Filter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Filter.scala
rename to scalatest/src/main/scala/org/scalatest/Filter.scala
diff --git a/src/main/scala/org/scalatest/FlatSpec.scala b/scalatest/src/main/scala/org/scalatest/FlatSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FlatSpec.scala
rename to scalatest/src/main/scala/org/scalatest/FlatSpec.scala
diff --git a/src/main/scala/org/scalatest/FlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/FlatSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FlatSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/FlatSpecLike.scala
diff --git a/src/main/scala/org/scalatest/FreeSpec.scala b/scalatest/src/main/scala/org/scalatest/FreeSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FreeSpec.scala
rename to scalatest/src/main/scala/org/scalatest/FreeSpec.scala
diff --git a/src/main/scala/org/scalatest/FreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/FreeSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FreeSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/FreeSpecLike.scala
diff --git a/src/main/scala/org/scalatest/FunSpec.scala b/scalatest/src/main/scala/org/scalatest/FunSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FunSpec.scala
rename to scalatest/src/main/scala/org/scalatest/FunSpec.scala
diff --git a/src/main/scala/org/scalatest/FunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/FunSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FunSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/FunSpecLike.scala
diff --git a/src/main/scala/org/scalatest/FunSuite.scala b/scalatest/src/main/scala/org/scalatest/FunSuite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FunSuite.scala
rename to scalatest/src/main/scala/org/scalatest/FunSuite.scala
diff --git a/src/main/scala/org/scalatest/FunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/FunSuiteLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/FunSuiteLike.scala
rename to scalatest/src/main/scala/org/scalatest/FunSuiteLike.scala
diff --git a/src/main/scala/org/scalatest/GivenWhenThen.scala b/scalatest/src/main/scala/org/scalatest/GivenWhenThen.scala
similarity index 100%
rename from src/main/scala/org/scalatest/GivenWhenThen.scala
rename to scalatest/src/main/scala/org/scalatest/GivenWhenThen.scala
diff --git a/src/main/scala/org/scalatest/Informer.scala b/scalatest/src/main/scala/org/scalatest/Informer.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Informer.scala
rename to scalatest/src/main/scala/org/scalatest/Informer.scala
diff --git a/src/main/scala/org/scalatest/Informing.scala b/scalatest/src/main/scala/org/scalatest/Informing.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Informing.scala
rename to scalatest/src/main/scala/org/scalatest/Informing.scala
diff --git a/src/main/scala/org/scalatest/Inside.scala b/scalatest/src/main/scala/org/scalatest/Inside.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Inside.scala
rename to scalatest/src/main/scala/org/scalatest/Inside.scala
diff --git a/src/main/scala/org/scalatest/Inspectors.scala b/scalatest/src/main/scala/org/scalatest/Inspectors.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Inspectors.scala
rename to scalatest/src/main/scala/org/scalatest/Inspectors.scala
diff --git a/src/main/scala/org/scalatest/JSuite.scala b/scalatest/src/main/scala/org/scalatest/JSuite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/JSuite.scala
rename to scalatest/src/main/scala/org/scalatest/JSuite.scala
diff --git a/src/main/scala/org/scalatest/LoneElement.scala b/scalatest/src/main/scala/org/scalatest/LoneElement.scala
similarity index 100%
rename from src/main/scala/org/scalatest/LoneElement.scala
rename to scalatest/src/main/scala/org/scalatest/LoneElement.scala
diff --git a/src/main/scala/org/scalatest/Matchers.scala b/scalatest/src/main/scala/org/scalatest/Matchers.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Matchers.scala
rename to scalatest/src/main/scala/org/scalatest/Matchers.scala
diff --git a/src/main/scala/org/scalatest/MatchersHelper.scala b/scalatest/src/main/scala/org/scalatest/MatchersHelper.scala
similarity index 100%
rename from src/main/scala/org/scalatest/MatchersHelper.scala
rename to scalatest/src/main/scala/org/scalatest/MatchersHelper.scala
diff --git a/src/main/scala/org/scalatest/NonImplicitAssertions.scala b/scalatest/src/main/scala/org/scalatest/NonImplicitAssertions.scala
similarity index 100%
rename from src/main/scala/org/scalatest/NonImplicitAssertions.scala
rename to scalatest/src/main/scala/org/scalatest/NonImplicitAssertions.scala
diff --git a/src/main/scala/org/scalatest/Notifier.scala b/scalatest/src/main/scala/org/scalatest/Notifier.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Notifier.scala
rename to scalatest/src/main/scala/org/scalatest/Notifier.scala
diff --git a/src/main/scala/org/scalatest/Notifying.scala b/scalatest/src/main/scala/org/scalatest/Notifying.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Notifying.scala
rename to scalatest/src/main/scala/org/scalatest/Notifying.scala
diff --git a/src/main/scala/org/scalatest/OneInstancePerTest.scala b/scalatest/src/main/scala/org/scalatest/OneInstancePerTest.scala
similarity index 100%
rename from src/main/scala/org/scalatest/OneInstancePerTest.scala
rename to scalatest/src/main/scala/org/scalatest/OneInstancePerTest.scala
diff --git a/src/main/scala/org/scalatest/OptionValues.scala b/scalatest/src/main/scala/org/scalatest/OptionValues.scala
similarity index 100%
rename from src/main/scala/org/scalatest/OptionValues.scala
rename to scalatest/src/main/scala/org/scalatest/OptionValues.scala
diff --git a/src/main/scala/org/scalatest/Outcome.scala b/scalatest/src/main/scala/org/scalatest/Outcome.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Outcome.scala
rename to scalatest/src/main/scala/org/scalatest/Outcome.scala
diff --git a/src/main/scala/org/scalatest/OutcomeOf.scala b/scalatest/src/main/scala/org/scalatest/OutcomeOf.scala
similarity index 100%
rename from src/main/scala/org/scalatest/OutcomeOf.scala
rename to scalatest/src/main/scala/org/scalatest/OutcomeOf.scala
diff --git a/src/main/scala/org/scalatest/ParallelTestExecution.scala b/scalatest/src/main/scala/org/scalatest/ParallelTestExecution.scala
similarity index 100%
rename from src/main/scala/org/scalatest/ParallelTestExecution.scala
rename to scalatest/src/main/scala/org/scalatest/ParallelTestExecution.scala
diff --git a/src/main/scala/org/scalatest/PartialFunctionValues.scala b/scalatest/src/main/scala/org/scalatest/PartialFunctionValues.scala
similarity index 100%
rename from src/main/scala/org/scalatest/PartialFunctionValues.scala
rename to scalatest/src/main/scala/org/scalatest/PartialFunctionValues.scala
diff --git a/src/main/scala/org/scalatest/Payloads.scala b/scalatest/src/main/scala/org/scalatest/Payloads.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Payloads.scala
rename to scalatest/src/main/scala/org/scalatest/Payloads.scala
diff --git a/src/main/scala/org/scalatest/PendingNothing.scala b/scalatest/src/main/scala/org/scalatest/PendingNothing.scala
similarity index 100%
rename from src/main/scala/org/scalatest/PendingNothing.scala
rename to scalatest/src/main/scala/org/scalatest/PendingNothing.scala
diff --git a/src/main/scala/org/scalatest/PrivateMethodTester.scala b/scalatest/src/main/scala/org/scalatest/PrivateMethodTester.scala
similarity index 100%
rename from src/main/scala/org/scalatest/PrivateMethodTester.scala
rename to scalatest/src/main/scala/org/scalatest/PrivateMethodTester.scala
diff --git a/src/main/scala/org/scalatest/PropSpec.scala b/scalatest/src/main/scala/org/scalatest/PropSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/PropSpec.scala
rename to scalatest/src/main/scala/org/scalatest/PropSpec.scala
diff --git a/src/main/scala/org/scalatest/PropSpecLike.scala b/scalatest/src/main/scala/org/scalatest/PropSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/PropSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/PropSpecLike.scala
diff --git a/src/main/scala/org/scalatest/RandomTestOrder.scala b/scalatest/src/main/scala/org/scalatest/RandomTestOrder.scala
similarity index 100%
rename from src/main/scala/org/scalatest/RandomTestOrder.scala
rename to scalatest/src/main/scala/org/scalatest/RandomTestOrder.scala
diff --git a/src/main/scala/org/scalatest/Reporter.scala b/scalatest/src/main/scala/org/scalatest/Reporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Reporter.scala
rename to scalatest/src/main/scala/org/scalatest/Reporter.scala
diff --git a/src/main/scala/org/scalatest/Rerunner.scala b/scalatest/src/main/scala/org/scalatest/Rerunner.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Rerunner.scala
rename to scalatest/src/main/scala/org/scalatest/Rerunner.scala
diff --git a/src/main/scala/org/scalatest/ResourcefulReporter.scala b/scalatest/src/main/scala/org/scalatest/ResourcefulReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/ResourcefulReporter.scala
rename to scalatest/src/main/scala/org/scalatest/ResourcefulReporter.scala
diff --git a/src/main/scala/org/scalatest/Resources.scala b/scalatest/src/main/scala/org/scalatest/Resources.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Resources.scala
rename to scalatest/src/main/scala/org/scalatest/Resources.scala
diff --git a/src/main/scala/org/scalatest/Retries.scala b/scalatest/src/main/scala/org/scalatest/Retries.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Retries.scala
rename to scalatest/src/main/scala/org/scalatest/Retries.scala
diff --git a/src/main/scala/org/scalatest/RunningTest.scala b/scalatest/src/main/scala/org/scalatest/RunningTest.scala
similarity index 100%
rename from src/main/scala/org/scalatest/RunningTest.scala
rename to scalatest/src/main/scala/org/scalatest/RunningTest.scala
diff --git a/src/main/scala/org/scalatest/ScreenshotCapturer.scala b/scalatest/src/main/scala/org/scalatest/ScreenshotCapturer.scala
similarity index 100%
rename from src/main/scala/org/scalatest/ScreenshotCapturer.scala
rename to scalatest/src/main/scala/org/scalatest/ScreenshotCapturer.scala
diff --git a/src/main/scala/org/scalatest/ScreenshotOnFailure.scala b/scalatest/src/main/scala/org/scalatest/ScreenshotOnFailure.scala
similarity index 100%
rename from src/main/scala/org/scalatest/ScreenshotOnFailure.scala
rename to scalatest/src/main/scala/org/scalatest/ScreenshotOnFailure.scala
diff --git a/src/main/scala/org/scalatest/Sequential.scala b/scalatest/src/main/scala/org/scalatest/Sequential.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Sequential.scala
rename to scalatest/src/main/scala/org/scalatest/Sequential.scala
diff --git a/src/main/scala/org/scalatest/SequentialNestedSuiteExecution.scala b/scalatest/src/main/scala/org/scalatest/SequentialNestedSuiteExecution.scala
similarity index 100%
rename from src/main/scala/org/scalatest/SequentialNestedSuiteExecution.scala
rename to scalatest/src/main/scala/org/scalatest/SequentialNestedSuiteExecution.scala
diff --git a/src/main/scala/org/scalatest/SeveredStackTraces.scala b/scalatest/src/main/scala/org/scalatest/SeveredStackTraces.scala
similarity index 100%
rename from src/main/scala/org/scalatest/SeveredStackTraces.scala
rename to scalatest/src/main/scala/org/scalatest/SeveredStackTraces.scala
diff --git a/src/main/scala/org/scalatest/Shell.scala b/scalatest/src/main/scala/org/scalatest/Shell.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Shell.scala
rename to scalatest/src/main/scala/org/scalatest/Shell.scala
diff --git a/src/main/scala/org/scalatest/Slowpoke.scala b/scalatest/src/main/scala/org/scalatest/Slowpoke.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Slowpoke.scala
rename to scalatest/src/main/scala/org/scalatest/Slowpoke.scala
diff --git a/src/main/scala/org/scalatest/SlowpokeDetector.scala b/scalatest/src/main/scala/org/scalatest/SlowpokeDetector.scala
similarity index 100%
rename from src/main/scala/org/scalatest/SlowpokeDetector.scala
rename to scalatest/src/main/scala/org/scalatest/SlowpokeDetector.scala
diff --git a/src/main/scala/org/scalatest/Spec.scala b/scalatest/src/main/scala/org/scalatest/Spec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Spec.scala
rename to scalatest/src/main/scala/org/scalatest/Spec.scala
diff --git a/src/main/scala/org/scalatest/SpecLike.scala b/scalatest/src/main/scala/org/scalatest/SpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/SpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/SpecLike.scala
diff --git a/src/main/scala/org/scalatest/Status.scala b/scalatest/src/main/scala/org/scalatest/Status.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Status.scala
rename to scalatest/src/main/scala/org/scalatest/Status.scala
diff --git a/src/main/scala/org/scalatest/Stepwise.scala b/scalatest/src/main/scala/org/scalatest/Stepwise.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Stepwise.scala
rename to scalatest/src/main/scala/org/scalatest/Stepwise.scala
diff --git a/src/main/scala/org/scalatest/StepwiseNestedSuiteExecution.scala b/scalatest/src/main/scala/org/scalatest/StepwiseNestedSuiteExecution.scala
similarity index 100%
rename from src/main/scala/org/scalatest/StepwiseNestedSuiteExecution.scala
rename to scalatest/src/main/scala/org/scalatest/StepwiseNestedSuiteExecution.scala
diff --git a/src/main/scala/org/scalatest/StopOnFailure.scala b/scalatest/src/main/scala/org/scalatest/StopOnFailure.scala
similarity index 100%
rename from src/main/scala/org/scalatest/StopOnFailure.scala
rename to scalatest/src/main/scala/org/scalatest/StopOnFailure.scala
diff --git a/src/main/scala/org/scalatest/StopOnFailureReporter.scala b/scalatest/src/main/scala/org/scalatest/StopOnFailureReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/StopOnFailureReporter.scala
rename to scalatest/src/main/scala/org/scalatest/StopOnFailureReporter.scala
diff --git a/src/main/scala/org/scalatest/Stopper.scala b/scalatest/src/main/scala/org/scalatest/Stopper.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Stopper.scala
rename to scalatest/src/main/scala/org/scalatest/Stopper.scala
diff --git a/src/main/scala/org/scalatest/StreamlinedXml.scala b/scalatest/src/main/scala/org/scalatest/StreamlinedXml.scala
similarity index 100%
rename from src/main/scala/org/scalatest/StreamlinedXml.scala
rename to scalatest/src/main/scala/org/scalatest/StreamlinedXml.scala
diff --git a/src/main/scala/org/scalatest/StreamlinedXmlEquality.scala b/scalatest/src/main/scala/org/scalatest/StreamlinedXmlEquality.scala
similarity index 100%
rename from src/main/scala/org/scalatest/StreamlinedXmlEquality.scala
rename to scalatest/src/main/scala/org/scalatest/StreamlinedXmlEquality.scala
diff --git a/src/main/scala/org/scalatest/StreamlinedXmlNormMethods.scala b/scalatest/src/main/scala/org/scalatest/StreamlinedXmlNormMethods.scala
similarity index 100%
rename from src/main/scala/org/scalatest/StreamlinedXmlNormMethods.scala
rename to scalatest/src/main/scala/org/scalatest/StreamlinedXmlNormMethods.scala
diff --git a/src/main/scala/org/scalatest/Suite.scala b/scalatest/src/main/scala/org/scalatest/Suite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Suite.scala
rename to scalatest/src/main/scala/org/scalatest/Suite.scala
diff --git a/src/main/scala/org/scalatest/SuiteHelpers.scala b/scalatest/src/main/scala/org/scalatest/SuiteHelpers.scala
similarity index 100%
rename from src/main/scala/org/scalatest/SuiteHelpers.scala
rename to scalatest/src/main/scala/org/scalatest/SuiteHelpers.scala
diff --git a/src/main/scala/org/scalatest/SuiteMixin.scala b/scalatest/src/main/scala/org/scalatest/SuiteMixin.scala
similarity index 100%
rename from src/main/scala/org/scalatest/SuiteMixin.scala
rename to scalatest/src/main/scala/org/scalatest/SuiteMixin.scala
diff --git a/src/main/scala/org/scalatest/SuiteRerunner.scala b/scalatest/src/main/scala/org/scalatest/SuiteRerunner.scala
similarity index 100%
rename from src/main/scala/org/scalatest/SuiteRerunner.scala
rename to scalatest/src/main/scala/org/scalatest/SuiteRerunner.scala
diff --git a/src/main/scala/org/scalatest/Suites.scala b/scalatest/src/main/scala/org/scalatest/Suites.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Suites.scala
rename to scalatest/src/main/scala/org/scalatest/Suites.scala
diff --git a/src/main/scala/org/scalatest/Tag.scala b/scalatest/src/main/scala/org/scalatest/Tag.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Tag.scala
rename to scalatest/src/main/scala/org/scalatest/Tag.scala
diff --git a/src/main/scala/org/scalatest/TestData.scala b/scalatest/src/main/scala/org/scalatest/TestData.scala
similarity index 100%
rename from src/main/scala/org/scalatest/TestData.scala
rename to scalatest/src/main/scala/org/scalatest/TestData.scala
diff --git a/src/main/scala/org/scalatest/TestRegistration.scala b/scalatest/src/main/scala/org/scalatest/TestRegistration.scala
similarity index 100%
rename from src/main/scala/org/scalatest/TestRegistration.scala
rename to scalatest/src/main/scala/org/scalatest/TestRegistration.scala
diff --git a/src/main/scala/org/scalatest/TestRerunner.scala b/scalatest/src/main/scala/org/scalatest/TestRerunner.scala
similarity index 100%
rename from src/main/scala/org/scalatest/TestRerunner.scala
rename to scalatest/src/main/scala/org/scalatest/TestRerunner.scala
diff --git a/src/main/scala/org/scalatest/Tracker.scala b/scalatest/src/main/scala/org/scalatest/Tracker.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Tracker.scala
rename to scalatest/src/main/scala/org/scalatest/Tracker.scala
diff --git a/src/main/scala/org/scalatest/Transformer.scala b/scalatest/src/main/scala/org/scalatest/Transformer.scala
similarity index 100%
rename from src/main/scala/org/scalatest/Transformer.scala
rename to scalatest/src/main/scala/org/scalatest/Transformer.scala
diff --git a/src/main/scala/org/scalatest/TryValues.scala b/scalatest/src/main/scala/org/scalatest/TryValues.scala
similarity index 100%
rename from src/main/scala/org/scalatest/TryValues.scala
rename to scalatest/src/main/scala/org/scalatest/TryValues.scala
diff --git a/src/main/scala/org/scalatest/WordSpec.scala b/scalatest/src/main/scala/org/scalatest/WordSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/WordSpec.scala
rename to scalatest/src/main/scala/org/scalatest/WordSpec.scala
diff --git a/src/main/scala/org/scalatest/WordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/WordSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/WordSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/WordSpecLike.scala
diff --git a/src/main/scala/org/scalatest/concurrent/AbstractPatienceConfiguration.scala b/scalatest/src/main/scala/org/scalatest/concurrent/AbstractPatienceConfiguration.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/AbstractPatienceConfiguration.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/AbstractPatienceConfiguration.scala
diff --git a/src/main/scala/org/scalatest/concurrent/AsyncAssertions.scala b/scalatest/src/main/scala/org/scalatest/concurrent/AsyncAssertions.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/AsyncAssertions.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/AsyncAssertions.scala
diff --git a/src/main/scala/org/scalatest/concurrent/ConductorFixture.scala b/scalatest/src/main/scala/org/scalatest/concurrent/ConductorFixture.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/ConductorFixture.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/ConductorFixture.scala
diff --git a/src/main/scala/org/scalatest/concurrent/ConductorMethods.scala b/scalatest/src/main/scala/org/scalatest/concurrent/ConductorMethods.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/ConductorMethods.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/ConductorMethods.scala
diff --git a/src/main/scala/org/scalatest/concurrent/Conductors.scala b/scalatest/src/main/scala/org/scalatest/concurrent/Conductors.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/Conductors.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/Conductors.scala
diff --git a/src/main/scala/org/scalatest/concurrent/DoNotInterrupt.scala b/scalatest/src/main/scala/org/scalatest/concurrent/DoNotInterrupt.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/DoNotInterrupt.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/DoNotInterrupt.scala
diff --git a/src/main/scala/org/scalatest/concurrent/Eventually.scala b/scalatest/src/main/scala/org/scalatest/concurrent/Eventually.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/Eventually.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/Eventually.scala
diff --git a/src/main/scala/org/scalatest/concurrent/Futures.scala b/scalatest/src/main/scala/org/scalatest/concurrent/Futures.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/Futures.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/Futures.scala
diff --git a/src/main/scala/org/scalatest/concurrent/IntegrationPatience.scala b/scalatest/src/main/scala/org/scalatest/concurrent/IntegrationPatience.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/IntegrationPatience.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/IntegrationPatience.scala
diff --git a/src/main/scala/org/scalatest/concurrent/Interruptor.scala b/scalatest/src/main/scala/org/scalatest/concurrent/Interruptor.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/Interruptor.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/Interruptor.scala
diff --git a/src/main/scala/org/scalatest/concurrent/JavaFutures.scala b/scalatest/src/main/scala/org/scalatest/concurrent/JavaFutures.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/JavaFutures.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/JavaFutures.scala
diff --git a/src/main/scala/org/scalatest/concurrent/PatienceConfiguration.scala b/scalatest/src/main/scala/org/scalatest/concurrent/PatienceConfiguration.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/PatienceConfiguration.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/PatienceConfiguration.scala
diff --git a/src/main/scala/org/scalatest/concurrent/PimpedReadWriteLock.scala b/scalatest/src/main/scala/org/scalatest/concurrent/PimpedReadWriteLock.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/PimpedReadWriteLock.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/PimpedReadWriteLock.scala
diff --git a/src/main/scala/org/scalatest/concurrent/PimpedThreadGroup.scala b/scalatest/src/main/scala/org/scalatest/concurrent/PimpedThreadGroup.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/PimpedThreadGroup.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/PimpedThreadGroup.scala
diff --git a/src/main/scala/org/scalatest/concurrent/ScalaFutures.scala b/scalatest/src/main/scala/org/scalatest/concurrent/ScalaFutures.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/ScalaFutures.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/ScalaFutures.scala
diff --git a/src/main/scala/org/scalatest/concurrent/ScaledTimeSpans.scala b/scalatest/src/main/scala/org/scalatest/concurrent/ScaledTimeSpans.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/ScaledTimeSpans.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/ScaledTimeSpans.scala
diff --git a/src/main/scala/org/scalatest/concurrent/SelectorInterruptor.scala b/scalatest/src/main/scala/org/scalatest/concurrent/SelectorInterruptor.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/SelectorInterruptor.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/SelectorInterruptor.scala
diff --git a/src/main/scala/org/scalatest/concurrent/SocketInterruptor.scala b/scalatest/src/main/scala/org/scalatest/concurrent/SocketInterruptor.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/SocketInterruptor.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/SocketInterruptor.scala
diff --git a/src/main/scala/org/scalatest/concurrent/TestThreadsStartingCounter.scala b/scalatest/src/main/scala/org/scalatest/concurrent/TestThreadsStartingCounter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/TestThreadsStartingCounter.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/TestThreadsStartingCounter.scala
diff --git a/src/main/scala/org/scalatest/concurrent/ThreadInterruptor.scala b/scalatest/src/main/scala/org/scalatest/concurrent/ThreadInterruptor.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/ThreadInterruptor.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/ThreadInterruptor.scala
diff --git a/src/main/scala/org/scalatest/concurrent/TimeLimitedTests.scala b/scalatest/src/main/scala/org/scalatest/concurrent/TimeLimitedTests.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/TimeLimitedTests.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/TimeLimitedTests.scala
diff --git a/src/main/scala/org/scalatest/concurrent/TimeoutTask.scala b/scalatest/src/main/scala/org/scalatest/concurrent/TimeoutTask.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/TimeoutTask.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/TimeoutTask.scala
diff --git a/src/main/scala/org/scalatest/concurrent/Timeouts.scala b/scalatest/src/main/scala/org/scalatest/concurrent/Timeouts.scala
similarity index 100%
rename from src/main/scala/org/scalatest/concurrent/Timeouts.scala
rename to scalatest/src/main/scala/org/scalatest/concurrent/Timeouts.scala
diff --git a/src/main/scala/org/scalatest/enablers/Aggregating.scala b/scalatest/src/main/scala/org/scalatest/enablers/Aggregating.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Aggregating.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Aggregating.scala
diff --git a/src/main/scala/org/scalatest/enablers/Collecting.scala b/scalatest/src/main/scala/org/scalatest/enablers/Collecting.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Collecting.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Collecting.scala
diff --git a/src/main/scala/org/scalatest/enablers/Containing.scala b/scalatest/src/main/scala/org/scalatest/enablers/Containing.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Containing.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Containing.scala
diff --git a/src/main/scala/org/scalatest/enablers/Definition.scala b/scalatest/src/main/scala/org/scalatest/enablers/Definition.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Definition.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Definition.scala
diff --git a/src/main/scala/org/scalatest/enablers/Emptiness.scala b/scalatest/src/main/scala/org/scalatest/enablers/Emptiness.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Emptiness.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Emptiness.scala
diff --git a/src/main/scala/org/scalatest/enablers/Existence.scala b/scalatest/src/main/scala/org/scalatest/enablers/Existence.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Existence.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Existence.scala
diff --git a/src/main/scala/org/scalatest/enablers/KeyMapping.scala b/scalatest/src/main/scala/org/scalatest/enablers/KeyMapping.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/KeyMapping.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/KeyMapping.scala
diff --git a/src/main/scala/org/scalatest/enablers/Length.scala b/scalatest/src/main/scala/org/scalatest/enablers/Length.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Length.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Length.scala
diff --git a/src/main/scala/org/scalatest/enablers/Messaging.scala b/scalatest/src/main/scala/org/scalatest/enablers/Messaging.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Messaging.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Messaging.scala
diff --git a/src/main/scala/org/scalatest/enablers/Readability.scala b/scalatest/src/main/scala/org/scalatest/enablers/Readability.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Readability.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Readability.scala
diff --git a/src/main/scala/org/scalatest/enablers/Sequencing.scala b/scalatest/src/main/scala/org/scalatest/enablers/Sequencing.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Sequencing.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Sequencing.scala
diff --git a/src/main/scala/org/scalatest/enablers/Size.scala b/scalatest/src/main/scala/org/scalatest/enablers/Size.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Size.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Size.scala
diff --git a/src/main/scala/org/scalatest/enablers/Slicing.scala b/scalatest/src/main/scala/org/scalatest/enablers/Slicing.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Slicing.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Slicing.scala
diff --git a/src/main/scala/org/scalatest/enablers/Sortable.scala b/scalatest/src/main/scala/org/scalatest/enablers/Sortable.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Sortable.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Sortable.scala
diff --git a/src/main/scala/org/scalatest/enablers/ValueMapping.scala b/scalatest/src/main/scala/org/scalatest/enablers/ValueMapping.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/ValueMapping.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/ValueMapping.scala
diff --git a/src/main/scala/org/scalatest/enablers/Writability.scala b/scalatest/src/main/scala/org/scalatest/enablers/Writability.scala
similarity index 100%
rename from src/main/scala/org/scalatest/enablers/Writability.scala
rename to scalatest/src/main/scala/org/scalatest/enablers/Writability.scala
diff --git a/src/main/scala/org/scalatest/events/Event.scala b/scalatest/src/main/scala/org/scalatest/events/Event.scala
similarity index 100%
rename from src/main/scala/org/scalatest/events/Event.scala
rename to scalatest/src/main/scala/org/scalatest/events/Event.scala
diff --git a/src/main/scala/org/scalatest/events/Formatter.scala b/scalatest/src/main/scala/org/scalatest/events/Formatter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/events/Formatter.scala
rename to scalatest/src/main/scala/org/scalatest/events/Formatter.scala
diff --git a/src/main/scala/org/scalatest/events/Location.scala b/scalatest/src/main/scala/org/scalatest/events/Location.scala
similarity index 100%
rename from src/main/scala/org/scalatest/events/Location.scala
rename to scalatest/src/main/scala/org/scalatest/events/Location.scala
diff --git a/src/main/scala/org/scalatest/events/NameInfo.scala b/scalatest/src/main/scala/org/scalatest/events/NameInfo.scala
similarity index 100%
rename from src/main/scala/org/scalatest/events/NameInfo.scala
rename to scalatest/src/main/scala/org/scalatest/events/NameInfo.scala
diff --git a/src/main/scala/org/scalatest/events/Ordinal.scala b/scalatest/src/main/scala/org/scalatest/events/Ordinal.scala
similarity index 100%
rename from src/main/scala/org/scalatest/events/Ordinal.scala
rename to scalatest/src/main/scala/org/scalatest/events/Ordinal.scala
diff --git a/src/main/scala/org/scalatest/events/Summary.scala b/scalatest/src/main/scala/org/scalatest/events/Summary.scala
similarity index 100%
rename from src/main/scala/org/scalatest/events/Summary.scala
rename to scalatest/src/main/scala/org/scalatest/events/Summary.scala
diff --git a/src/main/scala/org/scalatest/exceptions/DiscardedEvaluationException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/DiscardedEvaluationException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/DiscardedEvaluationException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/DiscardedEvaluationException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/DuplicateTestNameException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/DuplicateTestNameException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/DuplicateTestNameException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/DuplicateTestNameException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/GeneratorDrivenPropertyCheckFailedException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/GeneratorDrivenPropertyCheckFailedException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/GeneratorDrivenPropertyCheckFailedException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/GeneratorDrivenPropertyCheckFailedException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/ModifiableMessage.scala b/scalatest/src/main/scala/org/scalatest/exceptions/ModifiableMessage.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/ModifiableMessage.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/ModifiableMessage.scala
diff --git a/src/main/scala/org/scalatest/exceptions/ModifiablePayload.scala b/scalatest/src/main/scala/org/scalatest/exceptions/ModifiablePayload.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/ModifiablePayload.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/ModifiablePayload.scala
diff --git a/src/main/scala/org/scalatest/exceptions/NotAllowedException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/NotAllowedException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/NotAllowedException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/NotAllowedException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/PayloadField.scala b/scalatest/src/main/scala/org/scalatest/exceptions/PayloadField.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/PayloadField.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/PayloadField.scala
diff --git a/src/main/scala/org/scalatest/exceptions/PropertyCheckFailedException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/PropertyCheckFailedException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/PropertyCheckFailedException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/PropertyCheckFailedException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/StackDepth.scala b/scalatest/src/main/scala/org/scalatest/exceptions/StackDepth.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/StackDepth.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/StackDepth.scala
diff --git a/src/main/scala/org/scalatest/exceptions/StackDepthException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/StackDepthException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/StackDepthException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/StackDepthException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/TableDrivenPropertyCheckFailedException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/TableDrivenPropertyCheckFailedException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/TableDrivenPropertyCheckFailedException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/TableDrivenPropertyCheckFailedException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/TestCanceledException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/TestCanceledException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/TestCanceledException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/TestCanceledException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/TestFailedDueToTimeoutException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/TestFailedDueToTimeoutException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/TestFailedDueToTimeoutException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/TestFailedDueToTimeoutException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/TestFailedException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/TestFailedException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/TestFailedException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/TestFailedException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/TestPendingException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/TestPendingException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/TestPendingException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/TestPendingException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/TestRegistrationClosedException.scala b/scalatest/src/main/scala/org/scalatest/exceptions/TestRegistrationClosedException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/TestRegistrationClosedException.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/TestRegistrationClosedException.scala
diff --git a/src/main/scala/org/scalatest/exceptions/TimeoutField.scala b/scalatest/src/main/scala/org/scalatest/exceptions/TimeoutField.scala
similarity index 100%
rename from src/main/scala/org/scalatest/exceptions/TimeoutField.scala
rename to scalatest/src/main/scala/org/scalatest/exceptions/TimeoutField.scala
diff --git a/src/main/scala/org/scalatest/fixture/ConfigMapFixture.scala b/scalatest/src/main/scala/org/scalatest/fixture/ConfigMapFixture.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/ConfigMapFixture.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/ConfigMapFixture.scala
diff --git a/src/main/scala/org/scalatest/fixture/FeatureSpec.scala b/scalatest/src/main/scala/org/scalatest/fixture/FeatureSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FeatureSpec.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FeatureSpec.scala
diff --git a/src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala
diff --git a/src/main/scala/org/scalatest/fixture/FixtureNodeFamily.scala b/scalatest/src/main/scala/org/scalatest/fixture/FixtureNodeFamily.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FixtureNodeFamily.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FixtureNodeFamily.scala
diff --git a/src/main/scala/org/scalatest/fixture/FlatSpec.scala b/scalatest/src/main/scala/org/scalatest/fixture/FlatSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FlatSpec.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FlatSpec.scala
diff --git a/src/main/scala/org/scalatest/fixture/FlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FlatSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FlatSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FlatSpecLike.scala
diff --git a/src/main/scala/org/scalatest/fixture/FreeSpec.scala b/scalatest/src/main/scala/org/scalatest/fixture/FreeSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FreeSpec.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FreeSpec.scala
diff --git a/src/main/scala/org/scalatest/fixture/FreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FreeSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FreeSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FreeSpecLike.scala
diff --git a/src/main/scala/org/scalatest/fixture/FunSpec.scala b/scalatest/src/main/scala/org/scalatest/fixture/FunSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FunSpec.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FunSpec.scala
diff --git a/src/main/scala/org/scalatest/fixture/FunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FunSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FunSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FunSpecLike.scala
diff --git a/src/main/scala/org/scalatest/fixture/FunSuite.scala b/scalatest/src/main/scala/org/scalatest/fixture/FunSuite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FunSuite.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FunSuite.scala
diff --git a/src/main/scala/org/scalatest/fixture/FunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FunSuiteLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/FunSuiteLike.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/FunSuiteLike.scala
diff --git a/src/main/scala/org/scalatest/fixture/NoArg.scala b/scalatest/src/main/scala/org/scalatest/fixture/NoArg.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/NoArg.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/NoArg.scala
diff --git a/src/main/scala/org/scalatest/fixture/NoArgTestWrapper.scala b/scalatest/src/main/scala/org/scalatest/fixture/NoArgTestWrapper.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/NoArgTestWrapper.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/NoArgTestWrapper.scala
diff --git a/src/main/scala/org/scalatest/fixture/PropSpec.scala b/scalatest/src/main/scala/org/scalatest/fixture/PropSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/PropSpec.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/PropSpec.scala
diff --git a/src/main/scala/org/scalatest/fixture/PropSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/PropSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/PropSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/PropSpecLike.scala
diff --git a/src/main/scala/org/scalatest/fixture/Spec.scala b/scalatest/src/main/scala/org/scalatest/fixture/Spec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/Spec.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/Spec.scala
diff --git a/src/main/scala/org/scalatest/fixture/SpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/SpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/SpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/SpecLike.scala
diff --git a/src/main/scala/org/scalatest/fixture/Suite.scala b/scalatest/src/main/scala/org/scalatest/fixture/Suite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/Suite.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/Suite.scala
diff --git a/src/main/scala/org/scalatest/fixture/TestDataFixture.scala b/scalatest/src/main/scala/org/scalatest/fixture/TestDataFixture.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/TestDataFixture.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/TestDataFixture.scala
diff --git a/src/main/scala/org/scalatest/fixture/TestRegistration.scala b/scalatest/src/main/scala/org/scalatest/fixture/TestRegistration.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/TestRegistration.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/TestRegistration.scala
diff --git a/src/main/scala/org/scalatest/fixture/Transformer.scala b/scalatest/src/main/scala/org/scalatest/fixture/Transformer.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/Transformer.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/Transformer.scala
diff --git a/src/main/scala/org/scalatest/fixture/UnitFixture.scala b/scalatest/src/main/scala/org/scalatest/fixture/UnitFixture.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/UnitFixture.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/UnitFixture.scala
diff --git a/src/main/scala/org/scalatest/fixture/WordSpec.scala b/scalatest/src/main/scala/org/scalatest/fixture/WordSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/WordSpec.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/WordSpec.scala
diff --git a/src/main/scala/org/scalatest/fixture/WordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/WordSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/fixture/WordSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/fixture/WordSpecLike.scala
diff --git a/src/main/scala/org/scalatest/junit/AssertionsForJUnit.scala b/scalatest/src/main/scala/org/scalatest/junit/AssertionsForJUnit.scala
similarity index 100%
rename from src/main/scala/org/scalatest/junit/AssertionsForJUnit.scala
rename to scalatest/src/main/scala/org/scalatest/junit/AssertionsForJUnit.scala
diff --git a/src/main/scala/org/scalatest/junit/JUnit3Suite.scala b/scalatest/src/main/scala/org/scalatest/junit/JUnit3Suite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/junit/JUnit3Suite.scala
rename to scalatest/src/main/scala/org/scalatest/junit/JUnit3Suite.scala
diff --git a/src/main/scala/org/scalatest/junit/JUnitRunner.scala b/scalatest/src/main/scala/org/scalatest/junit/JUnitRunner.scala
similarity index 100%
rename from src/main/scala/org/scalatest/junit/JUnitRunner.scala
rename to scalatest/src/main/scala/org/scalatest/junit/JUnitRunner.scala
diff --git a/src/main/scala/org/scalatest/junit/JUnitSuite.scala b/scalatest/src/main/scala/org/scalatest/junit/JUnitSuite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/junit/JUnitSuite.scala
rename to scalatest/src/main/scala/org/scalatest/junit/JUnitSuite.scala
diff --git a/src/main/scala/org/scalatest/junit/JUnitSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/junit/JUnitSuiteLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/junit/JUnitSuiteLike.scala
rename to scalatest/src/main/scala/org/scalatest/junit/JUnitSuiteLike.scala
diff --git a/src/main/scala/org/scalatest/junit/JUnitTestFailedError.scala b/scalatest/src/main/scala/org/scalatest/junit/JUnitTestFailedError.scala
similarity index 100%
rename from src/main/scala/org/scalatest/junit/JUnitTestFailedError.scala
rename to scalatest/src/main/scala/org/scalatest/junit/JUnitTestFailedError.scala
diff --git a/src/main/scala/org/scalatest/junit/JUnitWrapperSuite.scala b/scalatest/src/main/scala/org/scalatest/junit/JUnitWrapperSuite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/junit/JUnitWrapperSuite.scala
rename to scalatest/src/main/scala/org/scalatest/junit/JUnitWrapperSuite.scala
diff --git a/src/main/scala/org/scalatest/junit/MyRunListener.scala b/scalatest/src/main/scala/org/scalatest/junit/MyRunListener.scala
similarity index 100%
rename from src/main/scala/org/scalatest/junit/MyRunListener.scala
rename to scalatest/src/main/scala/org/scalatest/junit/MyRunListener.scala
diff --git a/src/main/scala/org/scalatest/junit/RunNotifierReporter.scala b/scalatest/src/main/scala/org/scalatest/junit/RunNotifierReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/junit/RunNotifierReporter.scala
rename to scalatest/src/main/scala/org/scalatest/junit/RunNotifierReporter.scala
diff --git a/src/main/scala/org/scalatest/matchers/AMatcher.scala b/scalatest/src/main/scala/org/scalatest/matchers/AMatcher.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/AMatcher.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/AMatcher.scala
diff --git a/src/main/scala/org/scalatest/matchers/AnMatcher.scala b/scalatest/src/main/scala/org/scalatest/matchers/AnMatcher.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/AnMatcher.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/AnMatcher.scala
diff --git a/src/main/scala/org/scalatest/matchers/BeMatcher.scala b/scalatest/src/main/scala/org/scalatest/matchers/BeMatcher.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/BeMatcher.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/BeMatcher.scala
diff --git a/src/main/scala/org/scalatest/matchers/BePropertyMatchResult.scala b/scalatest/src/main/scala/org/scalatest/matchers/BePropertyMatchResult.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/BePropertyMatchResult.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/BePropertyMatchResult.scala
diff --git a/src/main/scala/org/scalatest/matchers/BePropertyMatcher.scala b/scalatest/src/main/scala/org/scalatest/matchers/BePropertyMatcher.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/BePropertyMatcher.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/BePropertyMatcher.scala
diff --git a/src/main/scala/org/scalatest/matchers/HavePropertyMatchResult.scala b/scalatest/src/main/scala/org/scalatest/matchers/HavePropertyMatchResult.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/HavePropertyMatchResult.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/HavePropertyMatchResult.scala
diff --git a/src/main/scala/org/scalatest/matchers/HavePropertyMatcher.scala b/scalatest/src/main/scala/org/scalatest/matchers/HavePropertyMatcher.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/HavePropertyMatcher.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/HavePropertyMatcher.scala
diff --git a/src/main/scala/org/scalatest/matchers/LazyArg.scala b/scalatest/src/main/scala/org/scalatest/matchers/LazyArg.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/LazyArg.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/LazyArg.scala
diff --git a/src/main/scala/org/scalatest/matchers/LazyMessage.scala b/scalatest/src/main/scala/org/scalatest/matchers/LazyMessage.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/LazyMessage.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/LazyMessage.scala
diff --git a/src/main/scala/org/scalatest/matchers/MatchFailed.scala b/scalatest/src/main/scala/org/scalatest/matchers/MatchFailed.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/MatchFailed.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/MatchFailed.scala
diff --git a/src/main/scala/org/scalatest/matchers/MatchPatternHelper.scala b/scalatest/src/main/scala/org/scalatest/matchers/MatchPatternHelper.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/MatchPatternHelper.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/MatchPatternHelper.scala
diff --git a/src/main/scala/org/scalatest/matchers/MatchPatternMacro.scala b/scalatest/src/main/scala/org/scalatest/matchers/MatchPatternMacro.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/MatchPatternMacro.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/MatchPatternMacro.scala
diff --git a/src/main/scala/org/scalatest/matchers/MatchResult.scala b/scalatest/src/main/scala/org/scalatest/matchers/MatchResult.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/MatchResult.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/MatchResult.scala
diff --git a/src/main/scala/org/scalatest/matchers/MatchSucceeded.scala b/scalatest/src/main/scala/org/scalatest/matchers/MatchSucceeded.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/MatchSucceeded.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/MatchSucceeded.scala
diff --git a/src/main/scala/org/scalatest/matchers/Matcher.scala b/scalatest/src/main/scala/org/scalatest/matchers/Matcher.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/Matcher.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/Matcher.scala
diff --git a/src/main/scala/org/scalatest/matchers/MatcherProducers.scala b/scalatest/src/main/scala/org/scalatest/matchers/MatcherProducers.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/MatcherProducers.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/MatcherProducers.scala
diff --git a/src/main/scala/org/scalatest/matchers/TypeMatcherHelper.scala b/scalatest/src/main/scala/org/scalatest/matchers/TypeMatcherHelper.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/TypeMatcherHelper.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/TypeMatcherHelper.scala
diff --git a/src/main/scala/org/scalatest/matchers/TypeMatcherMacro.scala b/scalatest/src/main/scala/org/scalatest/matchers/TypeMatcherMacro.scala
similarity index 100%
rename from src/main/scala/org/scalatest/matchers/TypeMatcherMacro.scala
rename to scalatest/src/main/scala/org/scalatest/matchers/TypeMatcherMacro.scala
diff --git a/src/main/scala/org/scalatest/mock/EasyMockSugar.scala b/scalatest/src/main/scala/org/scalatest/mock/EasyMockSugar.scala
similarity index 100%
rename from src/main/scala/org/scalatest/mock/EasyMockSugar.scala
rename to scalatest/src/main/scala/org/scalatest/mock/EasyMockSugar.scala
diff --git a/src/main/scala/org/scalatest/mock/JMockCycle.scala b/scalatest/src/main/scala/org/scalatest/mock/JMockCycle.scala
similarity index 100%
rename from src/main/scala/org/scalatest/mock/JMockCycle.scala
rename to scalatest/src/main/scala/org/scalatest/mock/JMockCycle.scala
diff --git a/src/main/scala/org/scalatest/mock/JMockCycleFixture.scala b/scalatest/src/main/scala/org/scalatest/mock/JMockCycleFixture.scala
similarity index 100%
rename from src/main/scala/org/scalatest/mock/JMockCycleFixture.scala
rename to scalatest/src/main/scala/org/scalatest/mock/JMockCycleFixture.scala
diff --git a/src/main/scala/org/scalatest/mock/JMockExpectations.scala b/scalatest/src/main/scala/org/scalatest/mock/JMockExpectations.scala
similarity index 100%
rename from src/main/scala/org/scalatest/mock/JMockExpectations.scala
rename to scalatest/src/main/scala/org/scalatest/mock/JMockExpectations.scala
diff --git a/src/main/scala/org/scalatest/mock/MockitoSugar.scala b/scalatest/src/main/scala/org/scalatest/mock/MockitoSugar.scala
similarity index 100%
rename from src/main/scala/org/scalatest/mock/MockitoSugar.scala
rename to scalatest/src/main/scala/org/scalatest/mock/MockitoSugar.scala
diff --git a/src/main/scala/org/scalatest/package.scala b/scalatest/src/main/scala/org/scalatest/package.scala
similarity index 100%
rename from src/main/scala/org/scalatest/package.scala
rename to scalatest/src/main/scala/org/scalatest/package.scala
diff --git a/src/main/scala/org/scalatest/path/FreeSpec.scala b/scalatest/src/main/scala/org/scalatest/path/FreeSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/path/FreeSpec.scala
rename to scalatest/src/main/scala/org/scalatest/path/FreeSpec.scala
diff --git a/src/main/scala/org/scalatest/path/FreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/path/FreeSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/path/FreeSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/path/FreeSpecLike.scala
diff --git a/src/main/scala/org/scalatest/path/FunSpec.scala b/scalatest/src/main/scala/org/scalatest/path/FunSpec.scala
similarity index 100%
rename from src/main/scala/org/scalatest/path/FunSpec.scala
rename to scalatest/src/main/scala/org/scalatest/path/FunSpec.scala
diff --git a/src/main/scala/org/scalatest/path/FunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/path/FunSpecLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/path/FunSpecLike.scala
rename to scalatest/src/main/scala/org/scalatest/path/FunSpecLike.scala
diff --git a/src/main/scala/org/scalatest/prop/Checkers.scala b/scalatest/src/main/scala/org/scalatest/prop/Checkers.scala
similarity index 100%
rename from src/main/scala/org/scalatest/prop/Checkers.scala
rename to scalatest/src/main/scala/org/scalatest/prop/Checkers.scala
diff --git a/src/main/scala/org/scalatest/prop/Configuration.scala b/scalatest/src/main/scala/org/scalatest/prop/Configuration.scala
similarity index 100%
rename from src/main/scala/org/scalatest/prop/Configuration.scala
rename to scalatest/src/main/scala/org/scalatest/prop/Configuration.scala
diff --git a/src/main/scala/org/scalatest/prop/PropertyChecks.scala b/scalatest/src/main/scala/org/scalatest/prop/PropertyChecks.scala
similarity index 100%
rename from src/main/scala/org/scalatest/prop/PropertyChecks.scala
rename to scalatest/src/main/scala/org/scalatest/prop/PropertyChecks.scala
diff --git a/src/main/scala/org/scalatest/prop/Whenever.scala b/scalatest/src/main/scala/org/scalatest/prop/Whenever.scala
similarity index 100%
rename from src/main/scala/org/scalatest/prop/Whenever.scala
rename to scalatest/src/main/scala/org/scalatest/prop/Whenever.scala
diff --git a/src/main/scala/org/scalatest/run.scala b/scalatest/src/main/scala/org/scalatest/run.scala
similarity index 100%
rename from src/main/scala/org/scalatest/run.scala
rename to scalatest/src/main/scala/org/scalatest/run.scala
diff --git a/src/main/scala/org/scalatest/selenium/Page.scala b/scalatest/src/main/scala/org/scalatest/selenium/Page.scala
similarity index 100%
rename from src/main/scala/org/scalatest/selenium/Page.scala
rename to scalatest/src/main/scala/org/scalatest/selenium/Page.scala
diff --git a/src/main/scala/org/scalatest/selenium/WebBrowser.scala b/scalatest/src/main/scala/org/scalatest/selenium/WebBrowser.scala
similarity index 100%
rename from src/main/scala/org/scalatest/selenium/WebBrowser.scala
rename to scalatest/src/main/scala/org/scalatest/selenium/WebBrowser.scala
diff --git a/src/main/scala/org/scalatest/tagobjects/CPU.scala b/scalatest/src/main/scala/org/scalatest/tagobjects/CPU.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tagobjects/CPU.scala
rename to scalatest/src/main/scala/org/scalatest/tagobjects/CPU.scala
diff --git a/src/main/scala/org/scalatest/tagobjects/ChromeBrowser.scala b/scalatest/src/main/scala/org/scalatest/tagobjects/ChromeBrowser.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tagobjects/ChromeBrowser.scala
rename to scalatest/src/main/scala/org/scalatest/tagobjects/ChromeBrowser.scala
diff --git a/src/main/scala/org/scalatest/tagobjects/Disk.scala b/scalatest/src/main/scala/org/scalatest/tagobjects/Disk.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tagobjects/Disk.scala
rename to scalatest/src/main/scala/org/scalatest/tagobjects/Disk.scala
diff --git a/src/main/scala/org/scalatest/tagobjects/FirefoxBrowser.scala b/scalatest/src/main/scala/org/scalatest/tagobjects/FirefoxBrowser.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tagobjects/FirefoxBrowser.scala
rename to scalatest/src/main/scala/org/scalatest/tagobjects/FirefoxBrowser.scala
diff --git a/src/main/scala/org/scalatest/tagobjects/HtmlUnitBrowser.scala b/scalatest/src/main/scala/org/scalatest/tagobjects/HtmlUnitBrowser.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tagobjects/HtmlUnitBrowser.scala
rename to scalatest/src/main/scala/org/scalatest/tagobjects/HtmlUnitBrowser.scala
diff --git a/src/main/scala/org/scalatest/tagobjects/InternetExplorerBrowser.scala b/scalatest/src/main/scala/org/scalatest/tagobjects/InternetExplorerBrowser.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tagobjects/InternetExplorerBrowser.scala
rename to scalatest/src/main/scala/org/scalatest/tagobjects/InternetExplorerBrowser.scala
diff --git a/src/main/scala/org/scalatest/tagobjects/Network.scala b/scalatest/src/main/scala/org/scalatest/tagobjects/Network.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tagobjects/Network.scala
rename to scalatest/src/main/scala/org/scalatest/tagobjects/Network.scala
diff --git a/src/main/scala/org/scalatest/tagobjects/Retryable.scala b/scalatest/src/main/scala/org/scalatest/tagobjects/Retryable.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tagobjects/Retryable.scala
rename to scalatest/src/main/scala/org/scalatest/tagobjects/Retryable.scala
diff --git a/src/main/scala/org/scalatest/tagobjects/SafariBrowser.scala b/scalatest/src/main/scala/org/scalatest/tagobjects/SafariBrowser.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tagobjects/SafariBrowser.scala
rename to scalatest/src/main/scala/org/scalatest/tagobjects/SafariBrowser.scala
diff --git a/src/main/scala/org/scalatest/tagobjects/Slow.scala b/scalatest/src/main/scala/org/scalatest/tagobjects/Slow.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tagobjects/Slow.scala
rename to scalatest/src/main/scala/org/scalatest/tagobjects/Slow.scala
diff --git a/src/main/scala/org/scalatest/testng/SingleTestAnnotationTransformer.scala b/scalatest/src/main/scala/org/scalatest/testng/SingleTestAnnotationTransformer.scala
similarity index 100%
rename from src/main/scala/org/scalatest/testng/SingleTestAnnotationTransformer.scala
rename to scalatest/src/main/scala/org/scalatest/testng/SingleTestAnnotationTransformer.scala
diff --git a/src/main/scala/org/scalatest/testng/TestNGSuite.scala b/scalatest/src/main/scala/org/scalatest/testng/TestNGSuite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/testng/TestNGSuite.scala
rename to scalatest/src/main/scala/org/scalatest/testng/TestNGSuite.scala
diff --git a/src/main/scala/org/scalatest/testng/TestNGSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/testng/TestNGSuiteLike.scala
similarity index 100%
rename from src/main/scala/org/scalatest/testng/TestNGSuiteLike.scala
rename to scalatest/src/main/scala/org/scalatest/testng/TestNGSuiteLike.scala
diff --git a/src/main/scala/org/scalatest/testng/TestNGWrapperSuite.scala b/scalatest/src/main/scala/org/scalatest/testng/TestNGWrapperSuite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/testng/TestNGWrapperSuite.scala
rename to scalatest/src/main/scala/org/scalatest/testng/TestNGWrapperSuite.scala
diff --git a/src/main/scala/org/scalatest/time/Now.scala b/scalatest/src/main/scala/org/scalatest/time/Now.scala
similarity index 100%
rename from src/main/scala/org/scalatest/time/Now.scala
rename to scalatest/src/main/scala/org/scalatest/time/Now.scala
diff --git a/src/main/scala/org/scalatest/time/Span.scala b/scalatest/src/main/scala/org/scalatest/time/Span.scala
similarity index 100%
rename from src/main/scala/org/scalatest/time/Span.scala
rename to scalatest/src/main/scala/org/scalatest/time/Span.scala
diff --git a/src/main/scala/org/scalatest/time/SpanSugar.scala b/scalatest/src/main/scala/org/scalatest/time/SpanSugar.scala
similarity index 100%
rename from src/main/scala/org/scalatest/time/SpanSugar.scala
rename to scalatest/src/main/scala/org/scalatest/time/SpanSugar.scala
diff --git a/src/main/scala/org/scalatest/time/Units.scala b/scalatest/src/main/scala/org/scalatest/time/Units.scala
similarity index 100%
rename from src/main/scala/org/scalatest/time/Units.scala
rename to scalatest/src/main/scala/org/scalatest/time/Units.scala
diff --git a/src/main/scala/org/scalatest/tools/AboutJDialog.scala b/scalatest/src/main/scala/org/scalatest/tools/AboutJDialog.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/AboutJDialog.scala
rename to scalatest/src/main/scala/org/scalatest/tools/AboutJDialog.scala
diff --git a/src/main/scala/org/scalatest/tools/AnsiColor.scala b/scalatest/src/main/scala/org/scalatest/tools/AnsiColor.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/AnsiColor.scala
rename to scalatest/src/main/scala/org/scalatest/tools/AnsiColor.scala
diff --git a/src/main/scala/org/scalatest/tools/AnsiReset.scala b/scalatest/src/main/scala/org/scalatest/tools/AnsiReset.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/AnsiReset.scala
rename to scalatest/src/main/scala/org/scalatest/tools/AnsiReset.scala
diff --git a/src/main/scala/org/scalatest/tools/ColorBar.scala b/scalatest/src/main/scala/org/scalatest/tools/ColorBar.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/ColorBar.scala
rename to scalatest/src/main/scala/org/scalatest/tools/ColorBar.scala
diff --git a/src/main/scala/org/scalatest/tools/ConcurrentDistributor.scala b/scalatest/src/main/scala/org/scalatest/tools/ConcurrentDistributor.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/ConcurrentDistributor.scala
rename to scalatest/src/main/scala/org/scalatest/tools/ConcurrentDistributor.scala
diff --git a/src/main/scala/org/scalatest/tools/DashboardReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/DashboardReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/DashboardReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/DashboardReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/DiscoverySuite.scala b/scalatest/src/main/scala/org/scalatest/tools/DiscoverySuite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/DiscoverySuite.scala
rename to scalatest/src/main/scala/org/scalatest/tools/DiscoverySuite.scala
diff --git a/src/main/scala/org/scalatest/tools/DistributedTestRunnerSuite.scala b/scalatest/src/main/scala/org/scalatest/tools/DistributedTestRunnerSuite.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/DistributedTestRunnerSuite.scala
rename to scalatest/src/main/scala/org/scalatest/tools/DistributedTestRunnerSuite.scala
diff --git a/src/main/scala/org/scalatest/tools/Durations.scala b/scalatest/src/main/scala/org/scalatest/tools/Durations.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/Durations.scala
rename to scalatest/src/main/scala/org/scalatest/tools/Durations.scala
diff --git a/src/main/scala/org/scalatest/tools/EventHolder.scala b/scalatest/src/main/scala/org/scalatest/tools/EventHolder.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/EventHolder.scala
rename to scalatest/src/main/scala/org/scalatest/tools/EventHolder.scala
diff --git a/src/main/scala/org/scalatest/tools/EventToPresent.scala b/scalatest/src/main/scala/org/scalatest/tools/EventToPresent.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/EventToPresent.scala
rename to scalatest/src/main/scala/org/scalatest/tools/EventToPresent.scala
diff --git a/src/main/scala/org/scalatest/tools/FileReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/FileReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/FileReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/FileReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/FilterReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/FilterReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/FilterReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/FilterReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/Fragment.scala b/scalatest/src/main/scala/org/scalatest/tools/Fragment.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/Fragment.scala
rename to scalatest/src/main/scala/org/scalatest/tools/Fragment.scala
diff --git a/src/main/scala/org/scalatest/tools/Framework.scala b/scalatest/src/main/scala/org/scalatest/tools/Framework.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/Framework.scala
rename to scalatest/src/main/scala/org/scalatest/tools/Framework.scala
diff --git a/src/main/scala/org/scalatest/tools/FriendlyParamsTranslator.scala b/scalatest/src/main/scala/org/scalatest/tools/FriendlyParamsTranslator.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/FriendlyParamsTranslator.scala
rename to scalatest/src/main/scala/org/scalatest/tools/FriendlyParamsTranslator.scala
diff --git a/src/main/scala/org/scalatest/tools/HtmlReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/HtmlReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/HtmlReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/HtmlReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/IconEmbellishedListCellRenderer.scala b/scalatest/src/main/scala/org/scalatest/tools/IconEmbellishedListCellRenderer.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/IconEmbellishedListCellRenderer.scala
rename to scalatest/src/main/scala/org/scalatest/tools/IconEmbellishedListCellRenderer.scala
diff --git a/src/main/scala/org/scalatest/tools/JUnitXmlReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/JUnitXmlReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/JUnitXmlReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/JUnitXmlReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/Memento.scala b/scalatest/src/main/scala/org/scalatest/tools/Memento.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/Memento.scala
rename to scalatest/src/main/scala/org/scalatest/tools/Memento.scala
diff --git a/src/main/scala/org/scalatest/tools/MemoryReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/MemoryReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/MemoryReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/MemoryReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/NarrowJOptionPane.scala b/scalatest/src/main/scala/org/scalatest/tools/NarrowJOptionPane.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/NarrowJOptionPane.scala
rename to scalatest/src/main/scala/org/scalatest/tools/NarrowJOptionPane.scala
diff --git a/src/main/scala/org/scalatest/tools/ParsedArgs.scala b/scalatest/src/main/scala/org/scalatest/tools/ParsedArgs.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/ParsedArgs.scala
rename to scalatest/src/main/scala/org/scalatest/tools/ParsedArgs.scala
diff --git a/src/main/scala/org/scalatest/tools/PrintReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/PrintReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/PrintReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/PrintReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/ProgressBarPanel.scala b/scalatest/src/main/scala/org/scalatest/tools/ProgressBarPanel.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/ProgressBarPanel.scala
rename to scalatest/src/main/scala/org/scalatest/tools/ProgressBarPanel.scala
diff --git a/src/main/scala/org/scalatest/tools/ReporterConfigParam.scala b/scalatest/src/main/scala/org/scalatest/tools/ReporterConfigParam.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/ReporterConfigParam.scala
rename to scalatest/src/main/scala/org/scalatest/tools/ReporterConfigParam.scala
diff --git a/src/main/scala/org/scalatest/tools/ReporterConfiguration.scala b/scalatest/src/main/scala/org/scalatest/tools/ReporterConfiguration.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/ReporterConfiguration.scala
rename to scalatest/src/main/scala/org/scalatest/tools/ReporterConfiguration.scala
diff --git a/src/main/scala/org/scalatest/tools/ReporterFactory.scala b/scalatest/src/main/scala/org/scalatest/tools/ReporterFactory.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/ReporterFactory.scala
rename to scalatest/src/main/scala/org/scalatest/tools/ReporterFactory.scala
diff --git a/src/main/scala/org/scalatest/tools/RunDoneListener.scala b/scalatest/src/main/scala/org/scalatest/tools/RunDoneListener.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/RunDoneListener.scala
rename to scalatest/src/main/scala/org/scalatest/tools/RunDoneListener.scala
diff --git a/src/main/scala/org/scalatest/tools/Runner.scala b/scalatest/src/main/scala/org/scalatest/tools/Runner.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/Runner.scala
rename to scalatest/src/main/scala/org/scalatest/tools/Runner.scala
diff --git a/src/main/scala/org/scalatest/tools/RunnerGUI.scala b/scalatest/src/main/scala/org/scalatest/tools/RunnerGUI.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/RunnerGUI.scala
rename to scalatest/src/main/scala/org/scalatest/tools/RunnerGUI.scala
diff --git a/src/main/scala/org/scalatest/tools/RunnerGUIState.scala b/scalatest/src/main/scala/org/scalatest/tools/RunnerGUIState.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/RunnerGUIState.scala
rename to scalatest/src/main/scala/org/scalatest/tools/RunnerGUIState.scala
diff --git a/src/main/scala/org/scalatest/tools/RunnerJFrame.scala b/scalatest/src/main/scala/org/scalatest/tools/RunnerJFrame.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/RunnerJFrame.scala
rename to scalatest/src/main/scala/org/scalatest/tools/RunnerJFrame.scala
diff --git a/src/main/scala/org/scalatest/tools/SbtCommandParser.scala b/scalatest/src/main/scala/org/scalatest/tools/SbtCommandParser.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/SbtCommandParser.scala
rename to scalatest/src/main/scala/org/scalatest/tools/SbtCommandParser.scala
diff --git a/src/main/scala/org/scalatest/tools/SbtDispatchReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/SbtDispatchReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/SbtDispatchReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/SbtDispatchReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/ScalaTestAntTask.scala b/scalatest/src/main/scala/org/scalatest/tools/ScalaTestAntTask.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/ScalaTestAntTask.scala
rename to scalatest/src/main/scala/org/scalatest/tools/ScalaTestAntTask.scala
diff --git a/src/main/scala/org/scalatest/tools/ScalaTestFramework.scala b/scalatest/src/main/scala/org/scalatest/tools/ScalaTestFramework.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/ScalaTestFramework.scala
rename to scalatest/src/main/scala/org/scalatest/tools/ScalaTestFramework.scala
diff --git a/src/main/scala/org/scalatest/tools/SocketReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/SocketReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/SocketReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/SocketReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/StandardErrReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/StandardErrReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/StandardErrReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/StandardErrReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/StandardOutReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/StandardOutReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/StandardOutReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/StandardOutReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/StatusJPanel.scala b/scalatest/src/main/scala/org/scalatest/tools/StatusJPanel.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/StatusJPanel.scala
rename to scalatest/src/main/scala/org/scalatest/tools/StatusJPanel.scala
diff --git a/src/main/scala/org/scalatest/tools/StringReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/StringReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/StringReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/StringReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/SuiteDiscoveryHelper.scala b/scalatest/src/main/scala/org/scalatest/tools/SuiteDiscoveryHelper.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/SuiteDiscoveryHelper.scala
rename to scalatest/src/main/scala/org/scalatest/tools/SuiteDiscoveryHelper.scala
diff --git a/src/main/scala/org/scalatest/tools/SuiteResult.scala b/scalatest/src/main/scala/org/scalatest/tools/SuiteResult.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/SuiteResult.scala
rename to scalatest/src/main/scala/org/scalatest/tools/SuiteResult.scala
diff --git a/src/main/scala/org/scalatest/tools/SuiteResultHolder.scala b/scalatest/src/main/scala/org/scalatest/tools/SuiteResultHolder.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/SuiteResultHolder.scala
rename to scalatest/src/main/scala/org/scalatest/tools/SuiteResultHolder.scala
diff --git a/src/main/scala/org/scalatest/tools/SuiteRunner.scala b/scalatest/src/main/scala/org/scalatest/tools/SuiteRunner.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/SuiteRunner.scala
rename to scalatest/src/main/scala/org/scalatest/tools/SuiteRunner.scala
diff --git a/src/main/scala/org/scalatest/tools/SuiteSortingReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/SuiteSortingReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/SuiteSortingReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/SuiteSortingReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/TestSortingReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/TestSortingReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/TestSortingReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/TestSortingReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/XmlReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/XmlReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/XmlReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/XmlReporter.scala
diff --git a/src/main/scala/org/scalatest/tools/XmlSocketReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/XmlSocketReporter.scala
similarity index 100%
rename from src/main/scala/org/scalatest/tools/XmlSocketReporter.scala
rename to scalatest/src/main/scala/org/scalatest/tools/XmlSocketReporter.scala
diff --git a/src/main/scala/org/scalatest/words/ArrayWrapper.scala b/scalatest/src/main/scala/org/scalatest/words/ArrayWrapper.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ArrayWrapper.scala
rename to scalatest/src/main/scala/org/scalatest/words/ArrayWrapper.scala
diff --git a/src/main/scala/org/scalatest/words/BeWord.scala b/scalatest/src/main/scala/org/scalatest/words/BeWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/BeWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/BeWord.scala
diff --git a/src/main/scala/org/scalatest/words/BehaveWord.scala b/scalatest/src/main/scala/org/scalatest/words/BehaveWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/BehaveWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/BehaveWord.scala
diff --git a/src/main/scala/org/scalatest/words/CanVerb.scala b/scalatest/src/main/scala/org/scalatest/words/CanVerb.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/CanVerb.scala
rename to scalatest/src/main/scala/org/scalatest/words/CanVerb.scala
diff --git a/src/main/scala/org/scalatest/words/CompileWord.scala b/scalatest/src/main/scala/org/scalatest/words/CompileWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/CompileWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/CompileWord.scala
diff --git a/src/main/scala/org/scalatest/words/ContainWord.scala b/scalatest/src/main/scala/org/scalatest/words/ContainWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ContainWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/ContainWord.scala
diff --git a/src/main/scala/org/scalatest/words/DefinedWord.scala b/scalatest/src/main/scala/org/scalatest/words/DefinedWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/DefinedWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/DefinedWord.scala
diff --git a/src/main/scala/org/scalatest/words/EmptyWord.scala b/scalatest/src/main/scala/org/scalatest/words/EmptyWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/EmptyWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/EmptyWord.scala
diff --git a/src/main/scala/org/scalatest/words/EndWithWord.scala b/scalatest/src/main/scala/org/scalatest/words/EndWithWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/EndWithWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/EndWithWord.scala
diff --git a/src/main/scala/org/scalatest/words/ExistWord.scala b/scalatest/src/main/scala/org/scalatest/words/ExistWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ExistWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/ExistWord.scala
diff --git a/src/main/scala/org/scalatest/words/FullyMatchWord.scala b/scalatest/src/main/scala/org/scalatest/words/FullyMatchWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/FullyMatchWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/FullyMatchWord.scala
diff --git a/src/main/scala/org/scalatest/words/HaveWord.scala b/scalatest/src/main/scala/org/scalatest/words/HaveWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/HaveWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/HaveWord.scala
diff --git a/src/main/scala/org/scalatest/words/IncludeWord.scala b/scalatest/src/main/scala/org/scalatest/words/IncludeWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/IncludeWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/IncludeWord.scala
diff --git a/src/main/scala/org/scalatest/words/JavaCollectionWrapper.scala b/scalatest/src/main/scala/org/scalatest/words/JavaCollectionWrapper.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/JavaCollectionWrapper.scala
rename to scalatest/src/main/scala/org/scalatest/words/JavaCollectionWrapper.scala
diff --git a/src/main/scala/org/scalatest/words/JavaMapWrapper.scala b/scalatest/src/main/scala/org/scalatest/words/JavaMapWrapper.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/JavaMapWrapper.scala
rename to scalatest/src/main/scala/org/scalatest/words/JavaMapWrapper.scala
diff --git a/src/main/scala/org/scalatest/words/LengthWord.scala b/scalatest/src/main/scala/org/scalatest/words/LengthWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/LengthWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/LengthWord.scala
diff --git a/src/main/scala/org/scalatest/words/MatchPatternWord.scala b/scalatest/src/main/scala/org/scalatest/words/MatchPatternWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/MatchPatternWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/MatchPatternWord.scala
diff --git a/src/main/scala/org/scalatest/words/MatcherWords.scala b/scalatest/src/main/scala/org/scalatest/words/MatcherWords.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/MatcherWords.scala
rename to scalatest/src/main/scala/org/scalatest/words/MatcherWords.scala
diff --git a/src/main/scala/org/scalatest/words/MustVerb.scala b/scalatest/src/main/scala/org/scalatest/words/MustVerb.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/MustVerb.scala
rename to scalatest/src/main/scala/org/scalatest/words/MustVerb.scala
diff --git a/src/main/scala/org/scalatest/words/NoExceptionWord.scala b/scalatest/src/main/scala/org/scalatest/words/NoExceptionWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/NoExceptionWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/NoExceptionWord.scala
diff --git a/src/main/scala/org/scalatest/words/NotWord.scala b/scalatest/src/main/scala/org/scalatest/words/NotWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/NotWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/NotWord.scala
diff --git a/src/main/scala/org/scalatest/words/PleaseUseNoExceptionShouldSyntaxInstead.scala b/scalatest/src/main/scala/org/scalatest/words/PleaseUseNoExceptionShouldSyntaxInstead.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/PleaseUseNoExceptionShouldSyntaxInstead.scala
rename to scalatest/src/main/scala/org/scalatest/words/PleaseUseNoExceptionShouldSyntaxInstead.scala
diff --git a/src/main/scala/org/scalatest/words/ReadableWord.scala b/scalatest/src/main/scala/org/scalatest/words/ReadableWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ReadableWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/ReadableWord.scala
diff --git a/src/main/scala/org/scalatest/words/RegexWithGroups.scala b/scalatest/src/main/scala/org/scalatest/words/RegexWithGroups.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/RegexWithGroups.scala
rename to scalatest/src/main/scala/org/scalatest/words/RegexWithGroups.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfATypeInvocation.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfATypeInvocation.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfATypeInvocation.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfATypeInvocation.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAWordToAMatcherApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAWordToAMatcherApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAWordToAMatcherApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAWordToAMatcherApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAWordToBePropertyMatcherApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAWordToBePropertyMatcherApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAWordToBePropertyMatcherApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAWordToBePropertyMatcherApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAWordToSymbolApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAWordToSymbolApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAWordToSymbolApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAWordToSymbolApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAfterWordApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAfterWordApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAfterWordApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAfterWordApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAllOfApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAllOfApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAllOfApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAllOfApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAnTypeInvocation.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAnTypeInvocation.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAnTypeInvocation.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAnTypeInvocation.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAnWordToAnMatcherApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAnWordToAnMatcherApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAnWordToAnMatcherApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAnWordToAnMatcherApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAnWordToBePropertyMatcherApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAnWordToBePropertyMatcherApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAnWordToBePropertyMatcherApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAnWordToBePropertyMatcherApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAnWordToSymbolApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAnWordToSymbolApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAnWordToSymbolApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAnWordToSymbolApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAtLeastOneOfApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAtLeastOneOfApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAtLeastOneOfApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAtLeastOneOfApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfAtMostOneOfApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfAtMostOneOfApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfAtMostOneOfApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfAtMostOneOfApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfBeWordForAType.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfBeWordForAType.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfBeWordForAType.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfBeWordForAType.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfBeWordForAnType.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfBeWordForAnType.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfBeWordForAnType.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfBeWordForAnType.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfBeWordForNoException.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfBeWordForNoException.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfBeWordForNoException.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfBeWordForNoException.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfContainWord.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfContainWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfContainWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfContainWord.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfDefinedAt.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfDefinedAt.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfDefinedAt.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfDefinedAt.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfGreaterThanComparison.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfGreaterThanComparison.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfGreaterThanComparison.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfGreaterThanComparison.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfGreaterThanOrEqualToComparison.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfGreaterThanOrEqualToComparison.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfGreaterThanOrEqualToComparison.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfGreaterThanOrEqualToComparison.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfInOrderApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfInOrderApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfInOrderApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfInOrderApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfInOrderOnlyApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfInOrderOnlyApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfInOrderOnlyApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfInOrderOnlyApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfKeyWordApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfKeyWordApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfKeyWordApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfKeyWordApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfLengthWordApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfLengthWordApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfLengthWordApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfLengthWordApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfLessThanComparison.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfLessThanComparison.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfLessThanComparison.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfLessThanComparison.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfLessThanOrEqualToComparison.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfLessThanOrEqualToComparison.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfLessThanOrEqualToComparison.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfLessThanOrEqualToComparison.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfMessageWordApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfMessageWordApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfMessageWordApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfMessageWordApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfNoneOfApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfNoneOfApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfNoneOfApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfNoneOfApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfNotExist.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfNotExist.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfNotExist.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfNotExist.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfNotWordForAny.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfNotWordForAny.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfNotWordForAny.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfNotWordForAny.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfOfTypeInvocation.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfOfTypeInvocation.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfOfTypeInvocation.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfOfTypeInvocation.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfOneOfApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfOneOfApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfOneOfApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfOneOfApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfOnlyApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfOnlyApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfOnlyApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfOnlyApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfRegexWordApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfRegexWordApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfRegexWordApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfRegexWordApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfSizeWordApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfSizeWordApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfSizeWordApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfSizeWordApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfStringPassedToVerb.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfStringPassedToVerb.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfStringPassedToVerb.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfStringPassedToVerb.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfTaggedAsInvocation.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfTaggedAsInvocation.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfTaggedAsInvocation.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfTaggedAsInvocation.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfTheSameElementsAsApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfTheSameElementsAsApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfTheSameElementsAsApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfTheSameElementsAsApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfTheSameElementsInOrderAsApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfTheSameElementsInOrderAsApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfTheSameElementsInOrderAsApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfTheSameElementsInOrderAsApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfTheSameInstanceAsApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfTheSameInstanceAsApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfTheSameInstanceAsApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfTheSameInstanceAsApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfTheTypeInvocation.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfTheTypeInvocation.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfTheTypeInvocation.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfTheTypeInvocation.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfThrownByApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfThrownByApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfThrownByApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfThrownByApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ResultOfValueWordApplication.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfValueWordApplication.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ResultOfValueWordApplication.scala
rename to scalatest/src/main/scala/org/scalatest/words/ResultOfValueWordApplication.scala
diff --git a/src/main/scala/org/scalatest/words/ShouldVerb.scala b/scalatest/src/main/scala/org/scalatest/words/ShouldVerb.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/ShouldVerb.scala
rename to scalatest/src/main/scala/org/scalatest/words/ShouldVerb.scala
diff --git a/src/main/scala/org/scalatest/words/SizeWord.scala b/scalatest/src/main/scala/org/scalatest/words/SizeWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/SizeWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/SizeWord.scala
diff --git a/src/main/scala/org/scalatest/words/SortedWord.scala b/scalatest/src/main/scala/org/scalatest/words/SortedWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/SortedWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/SortedWord.scala
diff --git a/src/main/scala/org/scalatest/words/StartWithWord.scala b/scalatest/src/main/scala/org/scalatest/words/StartWithWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/StartWithWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/StartWithWord.scala
diff --git a/src/main/scala/org/scalatest/words/StringVerbBlockRegistration.scala b/scalatest/src/main/scala/org/scalatest/words/StringVerbBlockRegistration.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/StringVerbBlockRegistration.scala
rename to scalatest/src/main/scala/org/scalatest/words/StringVerbBlockRegistration.scala
diff --git a/src/main/scala/org/scalatest/words/TypeCheckWord.scala b/scalatest/src/main/scala/org/scalatest/words/TypeCheckWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/TypeCheckWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/TypeCheckWord.scala
diff --git a/src/main/scala/org/scalatest/words/WritableWord.scala b/scalatest/src/main/scala/org/scalatest/words/WritableWord.scala
similarity index 100%
rename from src/main/scala/org/scalatest/words/WritableWord.scala
rename to scalatest/src/main/scala/org/scalatest/words/WritableWord.scala