Moved src->src/java/main and test -> src/java/test

commit: dc0051b2828ddc734f076f959a1d9d54c322654d [log] [tgz]
author: Cedric Beust <cedric@beust.com> Sat Jul 10 07:59:56 2010 -0700
committer: Cedric Beust <cedric@beust.com> Sat Jul 10 07:59:56 2010 -0700
tree: aaaf9603c7d86780dc752deaa2422ef86ad420a8
parent: 63fa709ad32ccee48aa75fa3dee897c36846f22b [diff]
diff --git a/build.properties b/build.properties
index f4f8e4a..f95e72a 100644
--- a/build.properties
+++ b/build.properties

@@ -7,8 +7,8 @@
 #classes=${build.dir}
 
 lib.dir=${basedir}/lib
-src.dir=${basedir}/src
-test.dir=${basedir}/test/src
+src.dir=${basedir}/src/main/java
+test.dir=${basedir}/src/test/java
 example.dir=${basedir}/examples
 
 #

diff --git a/src/com/beust/testng/TestNG.java b/src/main/java/com/beust/testng/TestNG.java
similarity index 100%
rename from src/com/beust/testng/TestNG.java
rename to src/main/java/com/beust/testng/TestNG.java


diff --git a/src/com/beust/testng/TestNGAntTask.java b/src/main/java/com/beust/testng/TestNGAntTask.java
similarity index 100%
rename from src/com/beust/testng/TestNGAntTask.java
rename to src/main/java/com/beust/testng/TestNGAntTask.java


diff --git a/src/org/testng/Assert.java b/src/main/java/org/testng/Assert.java
similarity index 100%
rename from src/org/testng/Assert.java
rename to src/main/java/org/testng/Assert.java


diff --git a/src/org/testng/AssertJUnit.java b/src/main/java/org/testng/AssertJUnit.java
similarity index 100%
rename from src/org/testng/AssertJUnit.java
rename to src/main/java/org/testng/AssertJUnit.java


diff --git a/src/org/testng/ClassMethodMap.java b/src/main/java/org/testng/ClassMethodMap.java
similarity index 100%
rename from src/org/testng/ClassMethodMap.java
rename to src/main/java/org/testng/ClassMethodMap.java


diff --git a/src/org/testng/FileAssert.java b/src/main/java/org/testng/FileAssert.java
similarity index 100%
rename from src/org/testng/FileAssert.java
rename to src/main/java/org/testng/FileAssert.java


diff --git a/src/org/testng/IAnnotationTransformer.java b/src/main/java/org/testng/IAnnotationTransformer.java
similarity index 100%
rename from src/org/testng/IAnnotationTransformer.java
rename to src/main/java/org/testng/IAnnotationTransformer.java


diff --git a/src/org/testng/IAnnotationTransformer2.java b/src/main/java/org/testng/IAnnotationTransformer2.java
similarity index 100%
rename from src/org/testng/IAnnotationTransformer2.java
rename to src/main/java/org/testng/IAnnotationTransformer2.java


diff --git a/src/org/testng/IAttributes.java b/src/main/java/org/testng/IAttributes.java
similarity index 100%
rename from src/org/testng/IAttributes.java
rename to src/main/java/org/testng/IAttributes.java


diff --git a/src/org/testng/IClass.java b/src/main/java/org/testng/IClass.java
similarity index 100%
rename from src/org/testng/IClass.java
rename to src/main/java/org/testng/IClass.java


diff --git a/src/org/testng/IExtraOutput.java b/src/main/java/org/testng/IExtraOutput.java
similarity index 100%
rename from src/org/testng/IExtraOutput.java
rename to src/main/java/org/testng/IExtraOutput.java


diff --git a/src/org/testng/IHookCallBack.java b/src/main/java/org/testng/IHookCallBack.java
similarity index 100%
rename from src/org/testng/IHookCallBack.java
rename to src/main/java/org/testng/IHookCallBack.java


diff --git a/src/org/testng/IHookable.java b/src/main/java/org/testng/IHookable.java
similarity index 100%
rename from src/org/testng/IHookable.java
rename to src/main/java/org/testng/IHookable.java


diff --git a/src/org/testng/IInstanceInfo.java b/src/main/java/org/testng/IInstanceInfo.java
similarity index 100%
rename from src/org/testng/IInstanceInfo.java
rename to src/main/java/org/testng/IInstanceInfo.java


diff --git a/src/org/testng/IInvokedMethod.java b/src/main/java/org/testng/IInvokedMethod.java
similarity index 100%
rename from src/org/testng/IInvokedMethod.java
rename to src/main/java/org/testng/IInvokedMethod.java


diff --git a/src/org/testng/IInvokedMethodListener.java b/src/main/java/org/testng/IInvokedMethodListener.java
similarity index 100%
rename from src/org/testng/IInvokedMethodListener.java
rename to src/main/java/org/testng/IInvokedMethodListener.java


diff --git a/src/org/testng/IInvokedMethodListener2.java b/src/main/java/org/testng/IInvokedMethodListener2.java
similarity index 100%
rename from src/org/testng/IInvokedMethodListener2.java
rename to src/main/java/org/testng/IInvokedMethodListener2.java


diff --git a/src/org/testng/IMethodInstance.java b/src/main/java/org/testng/IMethodInstance.java
similarity index 100%
rename from src/org/testng/IMethodInstance.java
rename to src/main/java/org/testng/IMethodInstance.java


diff --git a/src/org/testng/IMethodInterceptor.java b/src/main/java/org/testng/IMethodInterceptor.java
similarity index 100%
rename from src/org/testng/IMethodInterceptor.java
rename to src/main/java/org/testng/IMethodInterceptor.java


diff --git a/src/org/testng/IMethodSelector.java b/src/main/java/org/testng/IMethodSelector.java
similarity index 100%
rename from src/org/testng/IMethodSelector.java
rename to src/main/java/org/testng/IMethodSelector.java


diff --git a/src/org/testng/IMethodSelectorContext.java b/src/main/java/org/testng/IMethodSelectorContext.java
similarity index 100%
rename from src/org/testng/IMethodSelectorContext.java
rename to src/main/java/org/testng/IMethodSelectorContext.java


diff --git a/src/org/testng/IObjectFactory.java b/src/main/java/org/testng/IObjectFactory.java
similarity index 100%
rename from src/org/testng/IObjectFactory.java
rename to src/main/java/org/testng/IObjectFactory.java


diff --git a/src/org/testng/IReporter.java b/src/main/java/org/testng/IReporter.java
similarity index 100%
rename from src/org/testng/IReporter.java
rename to src/main/java/org/testng/IReporter.java


diff --git a/src/org/testng/IResultMap.java b/src/main/java/org/testng/IResultMap.java
similarity index 100%
rename from src/org/testng/IResultMap.java
rename to src/main/java/org/testng/IResultMap.java


diff --git a/src/org/testng/IRetryAnalyzer.java b/src/main/java/org/testng/IRetryAnalyzer.java
similarity index 100%
rename from src/org/testng/IRetryAnalyzer.java
rename to src/main/java/org/testng/IRetryAnalyzer.java


diff --git a/src/org/testng/ISuite.java b/src/main/java/org/testng/ISuite.java
similarity index 100%
rename from src/org/testng/ISuite.java
rename to src/main/java/org/testng/ISuite.java


diff --git a/src/org/testng/ISuiteListener.java b/src/main/java/org/testng/ISuiteListener.java
similarity index 100%
rename from src/org/testng/ISuiteListener.java
rename to src/main/java/org/testng/ISuiteListener.java


diff --git a/src/org/testng/ISuiteResult.java b/src/main/java/org/testng/ISuiteResult.java
similarity index 100%
rename from src/org/testng/ISuiteResult.java
rename to src/main/java/org/testng/ISuiteResult.java


diff --git a/src/org/testng/ITest.java b/src/main/java/org/testng/ITest.java
similarity index 100%
rename from src/org/testng/ITest.java
rename to src/main/java/org/testng/ITest.java


diff --git a/src/org/testng/ITestClass.java b/src/main/java/org/testng/ITestClass.java
similarity index 100%
rename from src/org/testng/ITestClass.java
rename to src/main/java/org/testng/ITestClass.java


diff --git a/src/org/testng/ITestClassFinder.java b/src/main/java/org/testng/ITestClassFinder.java
similarity index 100%
rename from src/org/testng/ITestClassFinder.java
rename to src/main/java/org/testng/ITestClassFinder.java


diff --git a/src/org/testng/ITestContext.java b/src/main/java/org/testng/ITestContext.java
similarity index 100%
rename from src/org/testng/ITestContext.java
rename to src/main/java/org/testng/ITestContext.java


diff --git a/src/org/testng/ITestListener.java b/src/main/java/org/testng/ITestListener.java
similarity index 100%
rename from src/org/testng/ITestListener.java
rename to src/main/java/org/testng/ITestListener.java


diff --git a/src/org/testng/ITestMethodFinder.java b/src/main/java/org/testng/ITestMethodFinder.java
similarity index 100%
rename from src/org/testng/ITestMethodFinder.java
rename to src/main/java/org/testng/ITestMethodFinder.java


diff --git a/src/org/testng/ITestNGListener.java b/src/main/java/org/testng/ITestNGListener.java
similarity index 100%
rename from src/org/testng/ITestNGListener.java
rename to src/main/java/org/testng/ITestNGListener.java


diff --git a/src/org/testng/ITestNGListenerFactory.java b/src/main/java/org/testng/ITestNGListenerFactory.java
similarity index 100%
rename from src/org/testng/ITestNGListenerFactory.java
rename to src/main/java/org/testng/ITestNGListenerFactory.java


diff --git a/src/org/testng/ITestNGMethod.java b/src/main/java/org/testng/ITestNGMethod.java
similarity index 100%
rename from src/org/testng/ITestNGMethod.java
rename to src/main/java/org/testng/ITestNGMethod.java


diff --git a/src/org/testng/ITestResult.java b/src/main/java/org/testng/ITestResult.java
similarity index 100%
rename from src/org/testng/ITestResult.java
rename to src/main/java/org/testng/ITestResult.java


diff --git a/src/org/testng/ITestRunnerFactory.java b/src/main/java/org/testng/ITestRunnerFactory.java
similarity index 100%
rename from src/org/testng/ITestRunnerFactory.java
rename to src/main/java/org/testng/ITestRunnerFactory.java


diff --git a/src/org/testng/InstanceOrderingMethodInterceptor.java b/src/main/java/org/testng/InstanceOrderingMethodInterceptor.java
similarity index 100%
rename from src/org/testng/InstanceOrderingMethodInterceptor.java
rename to src/main/java/org/testng/InstanceOrderingMethodInterceptor.java


diff --git a/src/org/testng/JUnitConverter.java b/src/main/java/org/testng/JUnitConverter.java
similarity index 100%
rename from src/org/testng/JUnitConverter.java
rename to src/main/java/org/testng/JUnitConverter.java


diff --git a/src/org/testng/JUnitConverterTask.java b/src/main/java/org/testng/JUnitConverterTask.java
similarity index 100%
rename from src/org/testng/JUnitConverterTask.java
rename to src/main/java/org/testng/JUnitConverterTask.java


diff --git a/src/org/testng/PreserveOrderMethodInterceptor.java b/src/main/java/org/testng/PreserveOrderMethodInterceptor.java
similarity index 100%
rename from src/org/testng/PreserveOrderMethodInterceptor.java
rename to src/main/java/org/testng/PreserveOrderMethodInterceptor.java


diff --git a/src/org/testng/Reporter.java b/src/main/java/org/testng/Reporter.java
similarity index 100%
rename from src/org/testng/Reporter.java
rename to src/main/java/org/testng/Reporter.java


diff --git a/src/org/testng/ReporterConfig.java b/src/main/java/org/testng/ReporterConfig.java
similarity index 100%
rename from src/org/testng/ReporterConfig.java
rename to src/main/java/org/testng/ReporterConfig.java


diff --git a/src/org/testng/SkipException.java b/src/main/java/org/testng/SkipException.java
similarity index 100%
rename from src/org/testng/SkipException.java
rename to src/main/java/org/testng/SkipException.java


diff --git a/src/org/testng/SuiteResult.java b/src/main/java/org/testng/SuiteResult.java
similarity index 100%
rename from src/org/testng/SuiteResult.java
rename to src/main/java/org/testng/SuiteResult.java


diff --git a/src/org/testng/SuiteRunState.java b/src/main/java/org/testng/SuiteRunState.java
similarity index 100%
rename from src/org/testng/SuiteRunState.java
rename to src/main/java/org/testng/SuiteRunState.java


diff --git a/src/org/testng/SuiteRunner.java b/src/main/java/org/testng/SuiteRunner.java
similarity index 100%
rename from src/org/testng/SuiteRunner.java
rename to src/main/java/org/testng/SuiteRunner.java


diff --git a/src/org/testng/TestClass.java b/src/main/java/org/testng/TestClass.java
similarity index 100%
rename from src/org/testng/TestClass.java
rename to src/main/java/org/testng/TestClass.java


diff --git a/src/org/testng/TestException.java b/src/main/java/org/testng/TestException.java
similarity index 100%
rename from src/org/testng/TestException.java
rename to src/main/java/org/testng/TestException.java


diff --git a/src/org/testng/TestListenerAdapter.java b/src/main/java/org/testng/TestListenerAdapter.java
similarity index 100%
rename from src/org/testng/TestListenerAdapter.java
rename to src/main/java/org/testng/TestListenerAdapter.java


diff --git a/src/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
similarity index 100%
rename from src/org/testng/TestNG.java
rename to src/main/java/org/testng/TestNG.java


diff --git a/src/org/testng/TestNGAntTask.java b/src/main/java/org/testng/TestNGAntTask.java
similarity index 100%
rename from src/org/testng/TestNGAntTask.java
rename to src/main/java/org/testng/TestNGAntTask.java


diff --git a/src/org/testng/TestNGCommandLineArgs.java b/src/main/java/org/testng/TestNGCommandLineArgs.java
similarity index 100%
rename from src/org/testng/TestNGCommandLineArgs.java
rename to src/main/java/org/testng/TestNGCommandLineArgs.java


diff --git a/src/org/testng/TestNGException.java b/src/main/java/org/testng/TestNGException.java
similarity index 100%
rename from src/org/testng/TestNGException.java
rename to src/main/java/org/testng/TestNGException.java


diff --git a/src/org/testng/TestNGUtils.java b/src/main/java/org/testng/TestNGUtils.java
similarity index 100%
rename from src/org/testng/TestNGUtils.java
rename to src/main/java/org/testng/TestNGUtils.java


diff --git a/src/org/testng/TestRunner.java b/src/main/java/org/testng/TestRunner.java
similarity index 100%
rename from src/org/testng/TestRunner.java
rename to src/main/java/org/testng/TestRunner.java


diff --git a/src/org/testng/TimeBombSkipException.java b/src/main/java/org/testng/TimeBombSkipException.java
similarity index 100%
rename from src/org/testng/TimeBombSkipException.java
rename to src/main/java/org/testng/TimeBombSkipException.java


diff --git a/src/org/testng/annotations/AfterClass.java b/src/main/java/org/testng/annotations/AfterClass.java
similarity index 100%
rename from src/org/testng/annotations/AfterClass.java
rename to src/main/java/org/testng/annotations/AfterClass.java


diff --git a/src/org/testng/annotations/AfterGroups.java b/src/main/java/org/testng/annotations/AfterGroups.java
similarity index 100%
rename from src/org/testng/annotations/AfterGroups.java
rename to src/main/java/org/testng/annotations/AfterGroups.java


diff --git a/src/org/testng/annotations/AfterMethod.java b/src/main/java/org/testng/annotations/AfterMethod.java
similarity index 100%
rename from src/org/testng/annotations/AfterMethod.java
rename to src/main/java/org/testng/annotations/AfterMethod.java


diff --git a/src/org/testng/annotations/AfterSuite.java b/src/main/java/org/testng/annotations/AfterSuite.java
similarity index 100%
rename from src/org/testng/annotations/AfterSuite.java
rename to src/main/java/org/testng/annotations/AfterSuite.java


diff --git a/src/org/testng/annotations/AfterTest.java b/src/main/java/org/testng/annotations/AfterTest.java
similarity index 100%
rename from src/org/testng/annotations/AfterTest.java
rename to src/main/java/org/testng/annotations/AfterTest.java


diff --git a/src/org/testng/annotations/BeforeClass.java b/src/main/java/org/testng/annotations/BeforeClass.java
similarity index 100%
rename from src/org/testng/annotations/BeforeClass.java
rename to src/main/java/org/testng/annotations/BeforeClass.java


diff --git a/src/org/testng/annotations/BeforeGroups.java b/src/main/java/org/testng/annotations/BeforeGroups.java
similarity index 100%
rename from src/org/testng/annotations/BeforeGroups.java
rename to src/main/java/org/testng/annotations/BeforeGroups.java


diff --git a/src/org/testng/annotations/BeforeMethod.java b/src/main/java/org/testng/annotations/BeforeMethod.java
similarity index 100%
rename from src/org/testng/annotations/BeforeMethod.java
rename to src/main/java/org/testng/annotations/BeforeMethod.java


diff --git a/src/org/testng/annotations/BeforeSuite.java b/src/main/java/org/testng/annotations/BeforeSuite.java
similarity index 100%
rename from src/org/testng/annotations/BeforeSuite.java
rename to src/main/java/org/testng/annotations/BeforeSuite.java


diff --git a/src/org/testng/annotations/BeforeTest.java b/src/main/java/org/testng/annotations/BeforeTest.java
similarity index 100%
rename from src/org/testng/annotations/BeforeTest.java
rename to src/main/java/org/testng/annotations/BeforeTest.java


diff --git a/src/org/testng/annotations/Configuration.java b/src/main/java/org/testng/annotations/Configuration.java
similarity index 100%
rename from src/org/testng/annotations/Configuration.java
rename to src/main/java/org/testng/annotations/Configuration.java


diff --git a/src/org/testng/annotations/DataProvider.java b/src/main/java/org/testng/annotations/DataProvider.java
similarity index 100%
rename from src/org/testng/annotations/DataProvider.java
rename to src/main/java/org/testng/annotations/DataProvider.java


diff --git a/src/org/testng/annotations/ExpectedExceptions.java b/src/main/java/org/testng/annotations/ExpectedExceptions.java
similarity index 100%
rename from src/org/testng/annotations/ExpectedExceptions.java
rename to src/main/java/org/testng/annotations/ExpectedExceptions.java


diff --git a/src/org/testng/annotations/Factory.java b/src/main/java/org/testng/annotations/Factory.java
similarity index 100%
rename from src/org/testng/annotations/Factory.java
rename to src/main/java/org/testng/annotations/Factory.java


diff --git a/src/org/testng/annotations/IAnnotation.java b/src/main/java/org/testng/annotations/IAnnotation.java
similarity index 100%
rename from src/org/testng/annotations/IAnnotation.java
rename to src/main/java/org/testng/annotations/IAnnotation.java


diff --git a/src/org/testng/annotations/IConfigurationAnnotation.java b/src/main/java/org/testng/annotations/IConfigurationAnnotation.java
similarity index 100%
rename from src/org/testng/annotations/IConfigurationAnnotation.java
rename to src/main/java/org/testng/annotations/IConfigurationAnnotation.java


diff --git a/src/org/testng/annotations/IDataProviderAnnotation.java b/src/main/java/org/testng/annotations/IDataProviderAnnotation.java
similarity index 100%
rename from src/org/testng/annotations/IDataProviderAnnotation.java
rename to src/main/java/org/testng/annotations/IDataProviderAnnotation.java


diff --git a/src/org/testng/annotations/IExpectedExceptionsAnnotation.java b/src/main/java/org/testng/annotations/IExpectedExceptionsAnnotation.java
similarity index 100%
rename from src/org/testng/annotations/IExpectedExceptionsAnnotation.java
rename to src/main/java/org/testng/annotations/IExpectedExceptionsAnnotation.java


diff --git a/src/org/testng/annotations/IFactoryAnnotation.java b/src/main/java/org/testng/annotations/IFactoryAnnotation.java
similarity index 100%
rename from src/org/testng/annotations/IFactoryAnnotation.java
rename to src/main/java/org/testng/annotations/IFactoryAnnotation.java


diff --git a/src/org/testng/annotations/IObjectFactoryAnnotation.java b/src/main/java/org/testng/annotations/IObjectFactoryAnnotation.java
similarity index 100%
rename from src/org/testng/annotations/IObjectFactoryAnnotation.java
rename to src/main/java/org/testng/annotations/IObjectFactoryAnnotation.java


diff --git a/src/org/testng/annotations/IParameterizable.java b/src/main/java/org/testng/annotations/IParameterizable.java
similarity index 100%
rename from src/org/testng/annotations/IParameterizable.java
rename to src/main/java/org/testng/annotations/IParameterizable.java


diff --git a/src/org/testng/annotations/IParametersAnnotation.java b/src/main/java/org/testng/annotations/IParametersAnnotation.java
similarity index 100%
rename from src/org/testng/annotations/IParametersAnnotation.java
rename to src/main/java/org/testng/annotations/IParametersAnnotation.java


diff --git a/src/org/testng/annotations/ITestAnnotation.java b/src/main/java/org/testng/annotations/ITestAnnotation.java
similarity index 100%
rename from src/org/testng/annotations/ITestAnnotation.java
rename to src/main/java/org/testng/annotations/ITestAnnotation.java


diff --git a/src/org/testng/annotations/ITestOrConfiguration.java b/src/main/java/org/testng/annotations/ITestOrConfiguration.java
similarity index 100%
rename from src/org/testng/annotations/ITestOrConfiguration.java
rename to src/main/java/org/testng/annotations/ITestOrConfiguration.java


diff --git a/src/org/testng/annotations/Listeners.java b/src/main/java/org/testng/annotations/Listeners.java
similarity index 100%
rename from src/org/testng/annotations/Listeners.java
rename to src/main/java/org/testng/annotations/Listeners.java


diff --git a/src/org/testng/annotations/NoInjection.java b/src/main/java/org/testng/annotations/NoInjection.java
similarity index 100%
rename from src/org/testng/annotations/NoInjection.java
rename to src/main/java/org/testng/annotations/NoInjection.java


diff --git a/src/org/testng/annotations/ObjectFactory.java b/src/main/java/org/testng/annotations/ObjectFactory.java
similarity index 100%
rename from src/org/testng/annotations/ObjectFactory.java
rename to src/main/java/org/testng/annotations/ObjectFactory.java


diff --git a/src/org/testng/annotations/Optional.java b/src/main/java/org/testng/annotations/Optional.java
similarity index 100%
rename from src/org/testng/annotations/Optional.java
rename to src/main/java/org/testng/annotations/Optional.java


diff --git a/src/org/testng/annotations/Parameters.java b/src/main/java/org/testng/annotations/Parameters.java
similarity index 100%
rename from src/org/testng/annotations/Parameters.java
rename to src/main/java/org/testng/annotations/Parameters.java


diff --git a/src/org/testng/annotations/Test.java b/src/main/java/org/testng/annotations/Test.java
similarity index 100%
rename from src/org/testng/annotations/Test.java
rename to src/main/java/org/testng/annotations/Test.java


diff --git a/src/org/testng/annotations/TestInstance.java b/src/main/java/org/testng/annotations/TestInstance.java
similarity index 100%
rename from src/org/testng/annotations/TestInstance.java
rename to src/main/java/org/testng/annotations/TestInstance.java


diff --git a/src/org/testng/collections/Lists.java b/src/main/java/org/testng/collections/Lists.java
similarity index 100%
rename from src/org/testng/collections/Lists.java
rename to src/main/java/org/testng/collections/Lists.java


diff --git a/src/org/testng/collections/Maps.java b/src/main/java/org/testng/collections/Maps.java
similarity index 100%
rename from src/org/testng/collections/Maps.java
rename to src/main/java/org/testng/collections/Maps.java


diff --git a/src/org/testng/internal/AnnotationTypeEnum.java b/src/main/java/org/testng/internal/AnnotationTypeEnum.java
similarity index 100%
rename from src/org/testng/internal/AnnotationTypeEnum.java
rename to src/main/java/org/testng/internal/AnnotationTypeEnum.java


diff --git a/src/org/testng/internal/Attributes.java b/src/main/java/org/testng/internal/Attributes.java
similarity index 100%
rename from src/org/testng/internal/Attributes.java
rename to src/main/java/org/testng/internal/Attributes.java


diff --git a/src/org/testng/internal/BaseClassFinder.java b/src/main/java/org/testng/internal/BaseClassFinder.java
similarity index 100%
rename from src/org/testng/internal/BaseClassFinder.java
rename to src/main/java/org/testng/internal/BaseClassFinder.java


diff --git a/src/org/testng/internal/BaseTestMethod.java b/src/main/java/org/testng/internal/BaseTestMethod.java
similarity index 100%
rename from src/org/testng/internal/BaseTestMethod.java
rename to src/main/java/org/testng/internal/BaseTestMethod.java


diff --git a/src/org/testng/internal/ClassHelper.java b/src/main/java/org/testng/internal/ClassHelper.java
similarity index 100%
rename from src/org/testng/internal/ClassHelper.java
rename to src/main/java/org/testng/internal/ClassHelper.java


diff --git a/src/org/testng/internal/ClassImpl.java b/src/main/java/org/testng/internal/ClassImpl.java
similarity index 100%
rename from src/org/testng/internal/ClassImpl.java
rename to src/main/java/org/testng/internal/ClassImpl.java


diff --git a/src/org/testng/internal/ClassInfoMap.java b/src/main/java/org/testng/internal/ClassInfoMap.java
similarity index 100%
rename from src/org/testng/internal/ClassInfoMap.java
rename to src/main/java/org/testng/internal/ClassInfoMap.java


diff --git a/src/org/testng/internal/ClonedMethod.java b/src/main/java/org/testng/internal/ClonedMethod.java
similarity index 100%
rename from src/org/testng/internal/ClonedMethod.java
rename to src/main/java/org/testng/internal/ClonedMethod.java


diff --git a/src/org/testng/internal/Configuration.java b/src/main/java/org/testng/internal/Configuration.java
similarity index 100%
rename from src/org/testng/internal/Configuration.java
rename to src/main/java/org/testng/internal/Configuration.java


diff --git a/src/org/testng/internal/ConfigurationGroupMethods.java b/src/main/java/org/testng/internal/ConfigurationGroupMethods.java
similarity index 100%
rename from src/org/testng/internal/ConfigurationGroupMethods.java
rename to src/main/java/org/testng/internal/ConfigurationGroupMethods.java


diff --git a/src/org/testng/internal/ConfigurationMethod.java b/src/main/java/org/testng/internal/ConfigurationMethod.java
similarity index 100%
rename from src/org/testng/internal/ConfigurationMethod.java
rename to src/main/java/org/testng/internal/ConfigurationMethod.java


diff --git a/src/org/testng/internal/Constants.java b/src/main/java/org/testng/internal/Constants.java
similarity index 100%
rename from src/org/testng/internal/Constants.java
rename to src/main/java/org/testng/internal/Constants.java


diff --git a/src/org/testng/internal/DataProviderHolder.java b/src/main/java/org/testng/internal/DataProviderHolder.java
similarity index 100%
rename from src/org/testng/internal/DataProviderHolder.java
rename to src/main/java/org/testng/internal/DataProviderHolder.java


diff --git a/src/org/testng/internal/DefaultGuiceModule.java b/src/main/java/org/testng/internal/DefaultGuiceModule.java
similarity index 100%
rename from src/org/testng/internal/DefaultGuiceModule.java
rename to src/main/java/org/testng/internal/DefaultGuiceModule.java


diff --git a/src/org/testng/internal/DefaultMethodSelectorContext.java b/src/main/java/org/testng/internal/DefaultMethodSelectorContext.java
similarity index 100%
rename from src/org/testng/internal/DefaultMethodSelectorContext.java
rename to src/main/java/org/testng/internal/DefaultMethodSelectorContext.java


diff --git a/src/org/testng/internal/DynamicGraph.java b/src/main/java/org/testng/internal/DynamicGraph.java
similarity index 100%
rename from src/org/testng/internal/DynamicGraph.java
rename to src/main/java/org/testng/internal/DynamicGraph.java


diff --git a/src/org/testng/internal/ExpectedExceptionsHolder.java b/src/main/java/org/testng/internal/ExpectedExceptionsHolder.java
similarity index 100%
rename from src/org/testng/internal/ExpectedExceptionsHolder.java
rename to src/main/java/org/testng/internal/ExpectedExceptionsHolder.java


diff --git a/src/org/testng/internal/ExtraOutput.java b/src/main/java/org/testng/internal/ExtraOutput.java
similarity index 100%
rename from src/org/testng/internal/ExtraOutput.java
rename to src/main/java/org/testng/internal/ExtraOutput.java


diff --git a/src/org/testng/internal/FactoryMethod.java b/src/main/java/org/testng/internal/FactoryMethod.java
similarity index 100%
rename from src/org/testng/internal/FactoryMethod.java
rename to src/main/java/org/testng/internal/FactoryMethod.java


diff --git a/src/org/testng/internal/Graph.java b/src/main/java/org/testng/internal/Graph.java
similarity index 100%
rename from src/org/testng/internal/Graph.java
rename to src/main/java/org/testng/internal/Graph.java


diff --git a/src/org/testng/internal/IConfiguration.java b/src/main/java/org/testng/internal/IConfiguration.java
similarity index 100%
rename from src/org/testng/internal/IConfiguration.java
rename to src/main/java/org/testng/internal/IConfiguration.java


diff --git a/src/org/testng/internal/IConfigurationListener.java b/src/main/java/org/testng/internal/IConfigurationListener.java
similarity index 100%
rename from src/org/testng/internal/IConfigurationListener.java
rename to src/main/java/org/testng/internal/IConfigurationListener.java


diff --git a/src/org/testng/internal/IInvoker.java b/src/main/java/org/testng/internal/IInvoker.java
similarity index 100%
rename from src/org/testng/internal/IInvoker.java
rename to src/main/java/org/testng/internal/IInvoker.java


diff --git a/src/org/testng/internal/IMethodWorker.java b/src/main/java/org/testng/internal/IMethodWorker.java
similarity index 100%
rename from src/org/testng/internal/IMethodWorker.java
rename to src/main/java/org/testng/internal/IMethodWorker.java


diff --git a/src/org/testng/internal/IResultListener.java b/src/main/java/org/testng/internal/IResultListener.java
similarity index 100%
rename from src/org/testng/internal/IResultListener.java
rename to src/main/java/org/testng/internal/IResultListener.java


diff --git a/src/org/testng/internal/ITestResultNotifier.java b/src/main/java/org/testng/internal/ITestResultNotifier.java
similarity index 100%
rename from src/org/testng/internal/ITestResultNotifier.java
rename to src/main/java/org/testng/internal/ITestResultNotifier.java


diff --git a/src/org/testng/internal/IWorkerFactory.java b/src/main/java/org/testng/internal/IWorkerFactory.java
similarity index 100%
rename from src/org/testng/internal/IWorkerFactory.java
rename to src/main/java/org/testng/internal/IWorkerFactory.java


diff --git a/src/org/testng/internal/InstanceInfo.java b/src/main/java/org/testng/internal/InstanceInfo.java
similarity index 100%
rename from src/org/testng/internal/InstanceInfo.java
rename to src/main/java/org/testng/internal/InstanceInfo.java


diff --git a/src/org/testng/internal/InvokeMethodRunnable.java b/src/main/java/org/testng/internal/InvokeMethodRunnable.java
similarity index 100%
rename from src/org/testng/internal/InvokeMethodRunnable.java
rename to src/main/java/org/testng/internal/InvokeMethodRunnable.java


diff --git a/src/org/testng/internal/InvokedMethod.java b/src/main/java/org/testng/internal/InvokedMethod.java
similarity index 100%
rename from src/org/testng/internal/InvokedMethod.java
rename to src/main/java/org/testng/internal/InvokedMethod.java


diff --git a/src/org/testng/internal/Invoker.java b/src/main/java/org/testng/internal/Invoker.java
similarity index 100%
rename from src/org/testng/internal/Invoker.java
rename to src/main/java/org/testng/internal/Invoker.java


diff --git a/src/org/testng/internal/MapList.java b/src/main/java/org/testng/internal/MapList.java
similarity index 100%
rename from src/org/testng/internal/MapList.java
rename to src/main/java/org/testng/internal/MapList.java


diff --git a/src/org/testng/internal/MethodHelper.java b/src/main/java/org/testng/internal/MethodHelper.java
similarity index 100%
rename from src/org/testng/internal/MethodHelper.java
rename to src/main/java/org/testng/internal/MethodHelper.java


diff --git a/src/org/testng/internal/MethodInheritance.java b/src/main/java/org/testng/internal/MethodInheritance.java
similarity index 100%
rename from src/org/testng/internal/MethodInheritance.java
rename to src/main/java/org/testng/internal/MethodInheritance.java


diff --git a/src/org/testng/internal/MethodInstance.java b/src/main/java/org/testng/internal/MethodInstance.java
similarity index 100%
rename from src/org/testng/internal/MethodInstance.java
rename to src/main/java/org/testng/internal/MethodInstance.java


diff --git a/src/org/testng/internal/MethodSelectorDescriptor.java b/src/main/java/org/testng/internal/MethodSelectorDescriptor.java
similarity index 100%
rename from src/org/testng/internal/MethodSelectorDescriptor.java
rename to src/main/java/org/testng/internal/MethodSelectorDescriptor.java


diff --git a/src/org/testng/internal/NoOpTestClass.java b/src/main/java/org/testng/internal/NoOpTestClass.java
similarity index 100%
rename from src/org/testng/internal/NoOpTestClass.java
rename to src/main/java/org/testng/internal/NoOpTestClass.java


diff --git a/src/org/testng/internal/ObjectFactoryImpl.java b/src/main/java/org/testng/internal/ObjectFactoryImpl.java
similarity index 100%
rename from src/org/testng/internal/ObjectFactoryImpl.java
rename to src/main/java/org/testng/internal/ObjectFactoryImpl.java


diff --git a/src/org/testng/internal/PackageUtils.java b/src/main/java/org/testng/internal/PackageUtils.java
similarity index 100%
rename from src/org/testng/internal/PackageUtils.java
rename to src/main/java/org/testng/internal/PackageUtils.java


diff --git a/src/org/testng/internal/ParameterHolder.java b/src/main/java/org/testng/internal/ParameterHolder.java
similarity index 100%
rename from src/org/testng/internal/ParameterHolder.java
rename to src/main/java/org/testng/internal/ParameterHolder.java


diff --git a/src/org/testng/internal/Parameters.java b/src/main/java/org/testng/internal/Parameters.java
similarity index 100%
rename from src/org/testng/internal/Parameters.java
rename to src/main/java/org/testng/internal/Parameters.java


diff --git a/src/org/testng/internal/PoolService.java b/src/main/java/org/testng/internal/PoolService.java
similarity index 100%
rename from src/org/testng/internal/PoolService.java
rename to src/main/java/org/testng/internal/PoolService.java


diff --git a/src/org/testng/internal/PropertiesFile.java b/src/main/java/org/testng/internal/PropertiesFile.java
similarity index 100%
rename from src/org/testng/internal/PropertiesFile.java
rename to src/main/java/org/testng/internal/PropertiesFile.java


diff --git a/src/org/testng/internal/PropertyUtils.java b/src/main/java/org/testng/internal/PropertyUtils.java
similarity index 100%
rename from src/org/testng/internal/PropertyUtils.java
rename to src/main/java/org/testng/internal/PropertyUtils.java


diff --git a/src/org/testng/internal/ResultMap.java b/src/main/java/org/testng/internal/ResultMap.java
similarity index 100%
rename from src/org/testng/internal/ResultMap.java
rename to src/main/java/org/testng/internal/ResultMap.java


diff --git a/src/org/testng/internal/RunInfo.java b/src/main/java/org/testng/internal/RunInfo.java
similarity index 100%
rename from src/org/testng/internal/RunInfo.java
rename to src/main/java/org/testng/internal/RunInfo.java


diff --git a/src/org/testng/internal/Tarjan.java b/src/main/java/org/testng/internal/Tarjan.java
similarity index 100%
rename from src/org/testng/internal/Tarjan.java
rename to src/main/java/org/testng/internal/Tarjan.java


diff --git a/src/org/testng/internal/TestMethodWithDataProviderMethodWorker.java b/src/main/java/org/testng/internal/TestMethodWithDataProviderMethodWorker.java
similarity index 100%
rename from src/org/testng/internal/TestMethodWithDataProviderMethodWorker.java
rename to src/main/java/org/testng/internal/TestMethodWithDataProviderMethodWorker.java


diff --git a/src/org/testng/internal/TestMethodWorker.java b/src/main/java/org/testng/internal/TestMethodWorker.java
similarity index 100%
rename from src/org/testng/internal/TestMethodWorker.java
rename to src/main/java/org/testng/internal/TestMethodWorker.java


diff --git a/src/org/testng/internal/TestNGClassFinder.java b/src/main/java/org/testng/internal/TestNGClassFinder.java
similarity index 100%
rename from src/org/testng/internal/TestNGClassFinder.java
rename to src/main/java/org/testng/internal/TestNGClassFinder.java


diff --git a/src/org/testng/internal/TestNGGuiceModule.java b/src/main/java/org/testng/internal/TestNGGuiceModule.java
similarity index 100%
rename from src/org/testng/internal/TestNGGuiceModule.java
rename to src/main/java/org/testng/internal/TestNGGuiceModule.java


diff --git a/src/org/testng/internal/TestNGMethod.java b/src/main/java/org/testng/internal/TestNGMethod.java
similarity index 100%
rename from src/org/testng/internal/TestNGMethod.java
rename to src/main/java/org/testng/internal/TestNGMethod.java


diff --git a/src/org/testng/internal/TestNGMethodFinder.java b/src/main/java/org/testng/internal/TestNGMethodFinder.java
similarity index 100%
rename from src/org/testng/internal/TestNGMethodFinder.java
rename to src/main/java/org/testng/internal/TestNGMethodFinder.java


diff --git a/src/org/testng/internal/TestNGProperty.java b/src/main/java/org/testng/internal/TestNGProperty.java
similarity index 100%
rename from src/org/testng/internal/TestNGProperty.java
rename to src/main/java/org/testng/internal/TestNGProperty.java


diff --git a/src/org/testng/internal/TestResult.java b/src/main/java/org/testng/internal/TestResult.java
similarity index 100%
rename from src/org/testng/internal/TestResult.java
rename to src/main/java/org/testng/internal/TestResult.java


diff --git a/src/org/testng/internal/Utils.java b/src/main/java/org/testng/internal/Utils.java
similarity index 100%
rename from src/org/testng/internal/Utils.java
rename to src/main/java/org/testng/internal/Utils.java


diff --git a/src/org/testng/internal/XmlMethodSelector.java b/src/main/java/org/testng/internal/XmlMethodSelector.java
similarity index 100%
rename from src/org/testng/internal/XmlMethodSelector.java
rename to src/main/java/org/testng/internal/XmlMethodSelector.java


diff --git a/src/org/testng/internal/annotations/AfterSuiteAnnotation.java b/src/main/java/org/testng/internal/annotations/AfterSuiteAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/AfterSuiteAnnotation.java
rename to src/main/java/org/testng/internal/annotations/AfterSuiteAnnotation.java


diff --git a/src/org/testng/internal/annotations/AnnotationConfiguration.java b/src/main/java/org/testng/internal/annotations/AnnotationConfiguration.java
similarity index 100%
rename from src/org/testng/internal/annotations/AnnotationConfiguration.java
rename to src/main/java/org/testng/internal/annotations/AnnotationConfiguration.java


diff --git a/src/org/testng/internal/annotations/AnnotationHelper.java b/src/main/java/org/testng/internal/annotations/AnnotationHelper.java
similarity index 100%
rename from src/org/testng/internal/annotations/AnnotationHelper.java
rename to src/main/java/org/testng/internal/annotations/AnnotationHelper.java


diff --git a/src/org/testng/internal/annotations/BaseAnnotation.java b/src/main/java/org/testng/internal/annotations/BaseAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/BaseAnnotation.java
rename to src/main/java/org/testng/internal/annotations/BaseAnnotation.java


diff --git a/src/org/testng/internal/annotations/BaseBeforeAfter.java b/src/main/java/org/testng/internal/annotations/BaseBeforeAfter.java
similarity index 100%
rename from src/org/testng/internal/annotations/BaseBeforeAfter.java
rename to src/main/java/org/testng/internal/annotations/BaseBeforeAfter.java


diff --git a/src/org/testng/internal/annotations/BeforeSuiteAnnotation.java b/src/main/java/org/testng/internal/annotations/BeforeSuiteAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/BeforeSuiteAnnotation.java
rename to src/main/java/org/testng/internal/annotations/BeforeSuiteAnnotation.java


diff --git a/src/org/testng/internal/annotations/ConfigurationAnnotation.java b/src/main/java/org/testng/internal/annotations/ConfigurationAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/ConfigurationAnnotation.java
rename to src/main/java/org/testng/internal/annotations/ConfigurationAnnotation.java


diff --git a/src/org/testng/internal/annotations/Converter.java b/src/main/java/org/testng/internal/annotations/Converter.java
similarity index 100%
rename from src/org/testng/internal/annotations/Converter.java
rename to src/main/java/org/testng/internal/annotations/Converter.java


diff --git a/src/org/testng/internal/annotations/DataProviderAnnotation.java b/src/main/java/org/testng/internal/annotations/DataProviderAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/DataProviderAnnotation.java
rename to src/main/java/org/testng/internal/annotations/DataProviderAnnotation.java


diff --git a/src/org/testng/internal/annotations/DefaultAnnotationTransformer.java b/src/main/java/org/testng/internal/annotations/DefaultAnnotationTransformer.java
similarity index 100%
rename from src/org/testng/internal/annotations/DefaultAnnotationTransformer.java
rename to src/main/java/org/testng/internal/annotations/DefaultAnnotationTransformer.java


diff --git a/src/org/testng/internal/annotations/ExpectedExceptionsAnnotation.java b/src/main/java/org/testng/internal/annotations/ExpectedExceptionsAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/ExpectedExceptionsAnnotation.java
rename to src/main/java/org/testng/internal/annotations/ExpectedExceptionsAnnotation.java


diff --git a/src/org/testng/internal/annotations/FactoryAnnotation.java b/src/main/java/org/testng/internal/annotations/FactoryAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/FactoryAnnotation.java
rename to src/main/java/org/testng/internal/annotations/FactoryAnnotation.java


diff --git a/src/org/testng/internal/annotations/IAfterClass.java b/src/main/java/org/testng/internal/annotations/IAfterClass.java
similarity index 100%
rename from src/org/testng/internal/annotations/IAfterClass.java
rename to src/main/java/org/testng/internal/annotations/IAfterClass.java


diff --git a/src/org/testng/internal/annotations/IAfterGroups.java b/src/main/java/org/testng/internal/annotations/IAfterGroups.java
similarity index 100%
rename from src/org/testng/internal/annotations/IAfterGroups.java
rename to src/main/java/org/testng/internal/annotations/IAfterGroups.java


diff --git a/src/org/testng/internal/annotations/IAfterMethod.java b/src/main/java/org/testng/internal/annotations/IAfterMethod.java
similarity index 100%
rename from src/org/testng/internal/annotations/IAfterMethod.java
rename to src/main/java/org/testng/internal/annotations/IAfterMethod.java


diff --git a/src/org/testng/internal/annotations/IAfterSuite.java b/src/main/java/org/testng/internal/annotations/IAfterSuite.java
similarity index 100%
rename from src/org/testng/internal/annotations/IAfterSuite.java
rename to src/main/java/org/testng/internal/annotations/IAfterSuite.java


diff --git a/src/org/testng/internal/annotations/IAfterTest.java b/src/main/java/org/testng/internal/annotations/IAfterTest.java
similarity index 100%
rename from src/org/testng/internal/annotations/IAfterTest.java
rename to src/main/java/org/testng/internal/annotations/IAfterTest.java


diff --git a/src/org/testng/internal/annotations/IAfterTests.java b/src/main/java/org/testng/internal/annotations/IAfterTests.java
similarity index 100%
rename from src/org/testng/internal/annotations/IAfterTests.java
rename to src/main/java/org/testng/internal/annotations/IAfterTests.java


diff --git a/src/org/testng/internal/annotations/IAnnotationFinder.java b/src/main/java/org/testng/internal/annotations/IAnnotationFinder.java
similarity index 100%
rename from src/org/testng/internal/annotations/IAnnotationFinder.java
rename to src/main/java/org/testng/internal/annotations/IAnnotationFinder.java


diff --git a/src/org/testng/internal/annotations/IAnnotationTransformer.java b/src/main/java/org/testng/internal/annotations/IAnnotationTransformer.java
similarity index 100%
rename from src/org/testng/internal/annotations/IAnnotationTransformer.java
rename to src/main/java/org/testng/internal/annotations/IAnnotationTransformer.java


diff --git a/src/org/testng/internal/annotations/IBaseBeforeAfter.java b/src/main/java/org/testng/internal/annotations/IBaseBeforeAfter.java
similarity index 100%
rename from src/org/testng/internal/annotations/IBaseBeforeAfter.java
rename to src/main/java/org/testng/internal/annotations/IBaseBeforeAfter.java


diff --git a/src/org/testng/internal/annotations/IBeforeClass.java b/src/main/java/org/testng/internal/annotations/IBeforeClass.java
similarity index 100%
rename from src/org/testng/internal/annotations/IBeforeClass.java
rename to src/main/java/org/testng/internal/annotations/IBeforeClass.java


diff --git a/src/org/testng/internal/annotations/IBeforeGroups.java b/src/main/java/org/testng/internal/annotations/IBeforeGroups.java
similarity index 100%
rename from src/org/testng/internal/annotations/IBeforeGroups.java
rename to src/main/java/org/testng/internal/annotations/IBeforeGroups.java


diff --git a/src/org/testng/internal/annotations/IBeforeMethod.java b/src/main/java/org/testng/internal/annotations/IBeforeMethod.java
similarity index 100%
rename from src/org/testng/internal/annotations/IBeforeMethod.java
rename to src/main/java/org/testng/internal/annotations/IBeforeMethod.java


diff --git a/src/org/testng/internal/annotations/IBeforeSuite.java b/src/main/java/org/testng/internal/annotations/IBeforeSuite.java
similarity index 100%
rename from src/org/testng/internal/annotations/IBeforeSuite.java
rename to src/main/java/org/testng/internal/annotations/IBeforeSuite.java


diff --git a/src/org/testng/internal/annotations/IBeforeTest.java b/src/main/java/org/testng/internal/annotations/IBeforeTest.java
similarity index 100%
rename from src/org/testng/internal/annotations/IBeforeTest.java
rename to src/main/java/org/testng/internal/annotations/IBeforeTest.java


diff --git a/src/org/testng/internal/annotations/IListeners.java b/src/main/java/org/testng/internal/annotations/IListeners.java
similarity index 100%
rename from src/org/testng/internal/annotations/IListeners.java
rename to src/main/java/org/testng/internal/annotations/IListeners.java


diff --git a/src/org/testng/internal/annotations/ITest.java b/src/main/java/org/testng/internal/annotations/ITest.java
similarity index 100%
rename from src/org/testng/internal/annotations/ITest.java
rename to src/main/java/org/testng/internal/annotations/ITest.java


diff --git a/src/org/testng/internal/annotations/JDK15AnnotationFinder.java b/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java
similarity index 100%
rename from src/org/testng/internal/annotations/JDK15AnnotationFinder.java
rename to src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java


diff --git a/src/org/testng/internal/annotations/JDK15TagFactory.java b/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java
similarity index 100%
rename from src/org/testng/internal/annotations/JDK15TagFactory.java
rename to src/main/java/org/testng/internal/annotations/JDK15TagFactory.java


diff --git a/src/org/testng/internal/annotations/ListenersAnnotation.java b/src/main/java/org/testng/internal/annotations/ListenersAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/ListenersAnnotation.java
rename to src/main/java/org/testng/internal/annotations/ListenersAnnotation.java


diff --git a/src/org/testng/internal/annotations/ObjectFactoryAnnotation.java b/src/main/java/org/testng/internal/annotations/ObjectFactoryAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/ObjectFactoryAnnotation.java
rename to src/main/java/org/testng/internal/annotations/ObjectFactoryAnnotation.java


diff --git a/src/org/testng/internal/annotations/ParametersAnnotation.java b/src/main/java/org/testng/internal/annotations/ParametersAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/ParametersAnnotation.java
rename to src/main/java/org/testng/internal/annotations/ParametersAnnotation.java


diff --git a/src/org/testng/internal/annotations/Sets.java b/src/main/java/org/testng/internal/annotations/Sets.java
similarity index 100%
rename from src/org/testng/internal/annotations/Sets.java
rename to src/main/java/org/testng/internal/annotations/Sets.java


diff --git a/src/org/testng/internal/annotations/TestAnnotation.java b/src/main/java/org/testng/internal/annotations/TestAnnotation.java
similarity index 100%
rename from src/org/testng/internal/annotations/TestAnnotation.java
rename to src/main/java/org/testng/internal/annotations/TestAnnotation.java


diff --git a/src/org/testng/internal/annotations/TestOrConfiguration.java b/src/main/java/org/testng/internal/annotations/TestOrConfiguration.java
similarity index 100%
rename from src/org/testng/internal/annotations/TestOrConfiguration.java
rename to src/main/java/org/testng/internal/annotations/TestOrConfiguration.java


diff --git a/src/org/testng/internal/remote/SlavePool.java b/src/main/java/org/testng/internal/remote/SlavePool.java
similarity index 100%
rename from src/org/testng/internal/remote/SlavePool.java
rename to src/main/java/org/testng/internal/remote/SlavePool.java


diff --git a/src/org/testng/internal/remote/SocketLinkedBlockingQueue.java b/src/main/java/org/testng/internal/remote/SocketLinkedBlockingQueue.java
similarity index 100%
rename from src/org/testng/internal/remote/SocketLinkedBlockingQueue.java
rename to src/main/java/org/testng/internal/remote/SocketLinkedBlockingQueue.java


diff --git a/src/org/testng/internal/thread/AtomicIntegerAdapter.java b/src/main/java/org/testng/internal/thread/AtomicIntegerAdapter.java
similarity index 100%
rename from src/org/testng/internal/thread/AtomicIntegerAdapter.java
rename to src/main/java/org/testng/internal/thread/AtomicIntegerAdapter.java


diff --git a/src/org/testng/internal/thread/CountDownAdapter.java b/src/main/java/org/testng/internal/thread/CountDownAdapter.java
similarity index 100%
rename from src/org/testng/internal/thread/CountDownAdapter.java
rename to src/main/java/org/testng/internal/thread/CountDownAdapter.java


diff --git a/src/org/testng/internal/thread/ExecutorAdapter.java b/src/main/java/org/testng/internal/thread/ExecutorAdapter.java
similarity index 100%
rename from src/org/testng/internal/thread/ExecutorAdapter.java
rename to src/main/java/org/testng/internal/thread/ExecutorAdapter.java


diff --git a/src/org/testng/internal/thread/FutureResultAdapter.java b/src/main/java/org/testng/internal/thread/FutureResultAdapter.java
similarity index 100%
rename from src/org/testng/internal/thread/FutureResultAdapter.java
rename to src/main/java/org/testng/internal/thread/FutureResultAdapter.java


diff --git a/src/org/testng/internal/thread/GroupThreadPoolExecutor.java b/src/main/java/org/testng/internal/thread/GroupThreadPoolExecutor.java
similarity index 100%
rename from src/org/testng/internal/thread/GroupThreadPoolExecutor.java
rename to src/main/java/org/testng/internal/thread/GroupThreadPoolExecutor.java


diff --git a/src/org/testng/internal/thread/IAtomicInteger.java b/src/main/java/org/testng/internal/thread/IAtomicInteger.java
similarity index 100%
rename from src/org/testng/internal/thread/IAtomicInteger.java
rename to src/main/java/org/testng/internal/thread/IAtomicInteger.java


diff --git a/src/org/testng/internal/thread/ICountDown.java b/src/main/java/org/testng/internal/thread/ICountDown.java
similarity index 100%
rename from src/org/testng/internal/thread/ICountDown.java
rename to src/main/java/org/testng/internal/thread/ICountDown.java


diff --git a/src/org/testng/internal/thread/IExecutor.java b/src/main/java/org/testng/internal/thread/IExecutor.java
similarity index 100%
rename from src/org/testng/internal/thread/IExecutor.java
rename to src/main/java/org/testng/internal/thread/IExecutor.java


diff --git a/src/org/testng/internal/thread/IFutureResult.java b/src/main/java/org/testng/internal/thread/IFutureResult.java
similarity index 100%
rename from src/org/testng/internal/thread/IFutureResult.java
rename to src/main/java/org/testng/internal/thread/IFutureResult.java


diff --git a/src/org/testng/internal/thread/IPooledExecutor.java b/src/main/java/org/testng/internal/thread/IPooledExecutor.java
similarity index 100%
rename from src/org/testng/internal/thread/IPooledExecutor.java
rename to src/main/java/org/testng/internal/thread/IPooledExecutor.java


diff --git a/src/org/testng/internal/thread/IThreadFactory.java b/src/main/java/org/testng/internal/thread/IThreadFactory.java
similarity index 100%
rename from src/org/testng/internal/thread/IThreadFactory.java
rename to src/main/java/org/testng/internal/thread/IThreadFactory.java


diff --git a/src/org/testng/internal/thread/PooledExecutorAdapter.java b/src/main/java/org/testng/internal/thread/PooledExecutorAdapter.java
similarity index 100%
rename from src/org/testng/internal/thread/PooledExecutorAdapter.java
rename to src/main/java/org/testng/internal/thread/PooledExecutorAdapter.java


diff --git a/src/org/testng/internal/thread/TestNGThread.java b/src/main/java/org/testng/internal/thread/TestNGThread.java
similarity index 100%
rename from src/org/testng/internal/thread/TestNGThread.java
rename to src/main/java/org/testng/internal/thread/TestNGThread.java


diff --git a/src/org/testng/internal/thread/ThreadExecutionException.java b/src/main/java/org/testng/internal/thread/ThreadExecutionException.java
similarity index 100%
rename from src/org/testng/internal/thread/ThreadExecutionException.java
rename to src/main/java/org/testng/internal/thread/ThreadExecutionException.java


diff --git a/src/org/testng/internal/thread/ThreadTimeoutException.java b/src/main/java/org/testng/internal/thread/ThreadTimeoutException.java
similarity index 100%
rename from src/org/testng/internal/thread/ThreadTimeoutException.java
rename to src/main/java/org/testng/internal/thread/ThreadTimeoutException.java


diff --git a/src/org/testng/internal/thread/ThreadUtil.java b/src/main/java/org/testng/internal/thread/ThreadUtil.java
similarity index 100%
rename from src/org/testng/internal/thread/ThreadUtil.java
rename to src/main/java/org/testng/internal/thread/ThreadUtil.java


diff --git a/src/org/testng/internal/version/VersionInfo.java b/src/main/java/org/testng/internal/version/VersionInfo.java
similarity index 100%
rename from src/org/testng/internal/version/VersionInfo.java
rename to src/main/java/org/testng/internal/version/VersionInfo.java


diff --git a/src/org/testng/junit/IJUnitTestRunner.java b/src/main/java/org/testng/junit/IJUnitTestRunner.java
similarity index 100%
rename from src/org/testng/junit/IJUnitTestRunner.java
rename to src/main/java/org/testng/junit/IJUnitTestRunner.java


diff --git a/src/org/testng/junit/JUnitDirectoryConverter.java b/src/main/java/org/testng/junit/JUnitDirectoryConverter.java
similarity index 100%
rename from src/org/testng/junit/JUnitDirectoryConverter.java
rename to src/main/java/org/testng/junit/JUnitDirectoryConverter.java


diff --git a/src/org/testng/junit/JUnitMethodFinder.java b/src/main/java/org/testng/junit/JUnitMethodFinder.java
similarity index 100%
rename from src/org/testng/junit/JUnitMethodFinder.java
rename to src/main/java/org/testng/junit/JUnitMethodFinder.java


diff --git a/src/org/testng/junit/JUnitTestConverter.java b/src/main/java/org/testng/junit/JUnitTestConverter.java
similarity index 100%
rename from src/org/testng/junit/JUnitTestConverter.java
rename to src/main/java/org/testng/junit/JUnitTestConverter.java


diff --git a/src/org/testng/junit/JUnitTestRunner.java b/src/main/java/org/testng/junit/JUnitTestRunner.java
similarity index 100%
rename from src/org/testng/junit/JUnitTestRunner.java
rename to src/main/java/org/testng/junit/JUnitTestRunner.java


diff --git a/src/org/testng/junit/JUnitUtils.java b/src/main/java/org/testng/junit/JUnitUtils.java
similarity index 100%
rename from src/org/testng/junit/JUnitUtils.java
rename to src/main/java/org/testng/junit/JUnitUtils.java


diff --git a/src/org/testng/log/TextFormatter.java b/src/main/java/org/testng/log/TextFormatter.java
similarity index 100%
rename from src/org/testng/log/TextFormatter.java
rename to src/main/java/org/testng/log/TextFormatter.java


diff --git a/src/org/testng/log4testng/Logger.java b/src/main/java/org/testng/log4testng/Logger.java
similarity index 100%
rename from src/org/testng/log4testng/Logger.java
rename to src/main/java/org/testng/log4testng/Logger.java


diff --git a/src/org/testng/remote/ConnectionInfo.java b/src/main/java/org/testng/remote/ConnectionInfo.java
similarity index 100%
rename from src/org/testng/remote/ConnectionInfo.java
rename to src/main/java/org/testng/remote/ConnectionInfo.java


diff --git a/src/org/testng/remote/RemoteSuiteWorker.java b/src/main/java/org/testng/remote/RemoteSuiteWorker.java
similarity index 100%
rename from src/org/testng/remote/RemoteSuiteWorker.java
rename to src/main/java/org/testng/remote/RemoteSuiteWorker.java


diff --git a/src/org/testng/remote/RemoteTestNG.java b/src/main/java/org/testng/remote/RemoteTestNG.java
similarity index 100%
rename from src/org/testng/remote/RemoteTestNG.java
rename to src/main/java/org/testng/remote/RemoteTestNG.java


diff --git a/src/org/testng/remote/RemoteWorker.java b/src/main/java/org/testng/remote/RemoteWorker.java
similarity index 100%
rename from src/org/testng/remote/RemoteWorker.java
rename to src/main/java/org/testng/remote/RemoteWorker.java


diff --git a/src/org/testng/remote/SuiteDispatcher.java b/src/main/java/org/testng/remote/SuiteDispatcher.java
similarity index 100%
rename from src/org/testng/remote/SuiteDispatcher.java
rename to src/main/java/org/testng/remote/SuiteDispatcher.java


diff --git a/src/org/testng/remote/SuiteSlave.java b/src/main/java/org/testng/remote/SuiteSlave.java
similarity index 100%
rename from src/org/testng/remote/SuiteSlave.java
rename to src/main/java/org/testng/remote/SuiteSlave.java


diff --git a/src/org/testng/remote/adapter/DefaultMastertAdapter.java b/src/main/java/org/testng/remote/adapter/DefaultMastertAdapter.java
similarity index 100%
rename from src/org/testng/remote/adapter/DefaultMastertAdapter.java
rename to src/main/java/org/testng/remote/adapter/DefaultMastertAdapter.java


diff --git a/src/org/testng/remote/adapter/DefaultWorkerAdapter.java b/src/main/java/org/testng/remote/adapter/DefaultWorkerAdapter.java
similarity index 100%
rename from src/org/testng/remote/adapter/DefaultWorkerAdapter.java
rename to src/main/java/org/testng/remote/adapter/DefaultWorkerAdapter.java


diff --git a/src/org/testng/remote/adapter/IMasterAdapter.java b/src/main/java/org/testng/remote/adapter/IMasterAdapter.java
similarity index 100%
rename from src/org/testng/remote/adapter/IMasterAdapter.java
rename to src/main/java/org/testng/remote/adapter/IMasterAdapter.java


diff --git a/src/org/testng/remote/adapter/IWorkerApadter.java b/src/main/java/org/testng/remote/adapter/IWorkerApadter.java
similarity index 100%
rename from src/org/testng/remote/adapter/IWorkerApadter.java
rename to src/main/java/org/testng/remote/adapter/IWorkerApadter.java


diff --git a/src/org/testng/remote/adapter/RemoteResultListener.java b/src/main/java/org/testng/remote/adapter/RemoteResultListener.java
similarity index 100%
rename from src/org/testng/remote/adapter/RemoteResultListener.java
rename to src/main/java/org/testng/remote/adapter/RemoteResultListener.java


diff --git a/src/org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java b/src/main/java/org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java
rename to src/main/java/org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java


diff --git a/src/org/testng/remote/strprotocol/GenericMessage.java b/src/main/java/org/testng/remote/strprotocol/GenericMessage.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/GenericMessage.java
rename to src/main/java/org/testng/remote/strprotocol/GenericMessage.java


diff --git a/src/org/testng/remote/strprotocol/IMessage.java b/src/main/java/org/testng/remote/strprotocol/IMessage.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/IMessage.java
rename to src/main/java/org/testng/remote/strprotocol/IMessage.java


diff --git a/src/org/testng/remote/strprotocol/IRemoteSuiteListener.java b/src/main/java/org/testng/remote/strprotocol/IRemoteSuiteListener.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/IRemoteSuiteListener.java
rename to src/main/java/org/testng/remote/strprotocol/IRemoteSuiteListener.java


diff --git a/src/org/testng/remote/strprotocol/IRemoteTestListener.java b/src/main/java/org/testng/remote/strprotocol/IRemoteTestListener.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/IRemoteTestListener.java
rename to src/main/java/org/testng/remote/strprotocol/IRemoteTestListener.java


diff --git a/src/org/testng/remote/strprotocol/IStringMessage.java b/src/main/java/org/testng/remote/strprotocol/IStringMessage.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/IStringMessage.java
rename to src/main/java/org/testng/remote/strprotocol/IStringMessage.java


diff --git a/src/org/testng/remote/strprotocol/MessageHelper.java b/src/main/java/org/testng/remote/strprotocol/MessageHelper.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/MessageHelper.java
rename to src/main/java/org/testng/remote/strprotocol/MessageHelper.java


diff --git a/src/org/testng/remote/strprotocol/RemoteMessageSenderTestListener.java b/src/main/java/org/testng/remote/strprotocol/RemoteMessageSenderTestListener.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/RemoteMessageSenderTestListener.java
rename to src/main/java/org/testng/remote/strprotocol/RemoteMessageSenderTestListener.java


diff --git a/src/org/testng/remote/strprotocol/StringMessageSenderHelper.java b/src/main/java/org/testng/remote/strprotocol/StringMessageSenderHelper.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/StringMessageSenderHelper.java
rename to src/main/java/org/testng/remote/strprotocol/StringMessageSenderHelper.java


diff --git a/src/org/testng/remote/strprotocol/SuiteMessage.java b/src/main/java/org/testng/remote/strprotocol/SuiteMessage.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/SuiteMessage.java
rename to src/main/java/org/testng/remote/strprotocol/SuiteMessage.java


diff --git a/src/org/testng/remote/strprotocol/TestMessage.java b/src/main/java/org/testng/remote/strprotocol/TestMessage.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/TestMessage.java
rename to src/main/java/org/testng/remote/strprotocol/TestMessage.java


diff --git a/src/org/testng/remote/strprotocol/TestResultMessage.java b/src/main/java/org/testng/remote/strprotocol/TestResultMessage.java
similarity index 100%
rename from src/org/testng/remote/strprotocol/TestResultMessage.java
rename to src/main/java/org/testng/remote/strprotocol/TestResultMessage.java


diff --git a/src/org/testng/reporters/DotTestListener.java b/src/main/java/org/testng/reporters/DotTestListener.java
similarity index 100%
rename from src/org/testng/reporters/DotTestListener.java
rename to src/main/java/org/testng/reporters/DotTestListener.java


diff --git a/src/org/testng/reporters/EmailableReporter.java b/src/main/java/org/testng/reporters/EmailableReporter.java
similarity index 100%
rename from src/org/testng/reporters/EmailableReporter.java
rename to src/main/java/org/testng/reporters/EmailableReporter.java


diff --git a/src/org/testng/reporters/ExitCodeListener.java b/src/main/java/org/testng/reporters/ExitCodeListener.java
similarity index 100%
rename from src/org/testng/reporters/ExitCodeListener.java
rename to src/main/java/org/testng/reporters/ExitCodeListener.java


diff --git a/src/org/testng/reporters/FailedReporter.java b/src/main/java/org/testng/reporters/FailedReporter.java
similarity index 100%
rename from src/org/testng/reporters/FailedReporter.java
rename to src/main/java/org/testng/reporters/FailedReporter.java


diff --git a/src/org/testng/reporters/HtmlHelper.java b/src/main/java/org/testng/reporters/HtmlHelper.java
similarity index 100%
rename from src/org/testng/reporters/HtmlHelper.java
rename to src/main/java/org/testng/reporters/HtmlHelper.java


diff --git a/src/org/testng/reporters/JUnitXMLReporter.java b/src/main/java/org/testng/reporters/JUnitXMLReporter.java
similarity index 100%
rename from src/org/testng/reporters/JUnitXMLReporter.java
rename to src/main/java/org/testng/reporters/JUnitXMLReporter.java


diff --git a/src/org/testng/reporters/JUnitXMLReporter2.java b/src/main/java/org/testng/reporters/JUnitXMLReporter2.java
similarity index 100%
rename from src/org/testng/reporters/JUnitXMLReporter2.java
rename to src/main/java/org/testng/reporters/JUnitXMLReporter2.java


diff --git a/src/org/testng/reporters/SuiteHTMLReporter.java b/src/main/java/org/testng/reporters/SuiteHTMLReporter.java
similarity index 100%
rename from src/org/testng/reporters/SuiteHTMLReporter.java
rename to src/main/java/org/testng/reporters/SuiteHTMLReporter.java


diff --git a/src/org/testng/reporters/TestHTMLReporter.java b/src/main/java/org/testng/reporters/TestHTMLReporter.java
similarity index 100%
rename from src/org/testng/reporters/TestHTMLReporter.java
rename to src/main/java/org/testng/reporters/TestHTMLReporter.java


diff --git a/src/org/testng/reporters/TextReporter.java b/src/main/java/org/testng/reporters/TextReporter.java
similarity index 100%
rename from src/org/testng/reporters/TextReporter.java
rename to src/main/java/org/testng/reporters/TextReporter.java


diff --git a/src/org/testng/reporters/XMLConstants.java b/src/main/java/org/testng/reporters/XMLConstants.java
similarity index 100%
rename from src/org/testng/reporters/XMLConstants.java
rename to src/main/java/org/testng/reporters/XMLConstants.java


diff --git a/src/org/testng/reporters/XMLReporter.java b/src/main/java/org/testng/reporters/XMLReporter.java
similarity index 100%
rename from src/org/testng/reporters/XMLReporter.java
rename to src/main/java/org/testng/reporters/XMLReporter.java


diff --git a/src/org/testng/reporters/XMLReporterConfig.java b/src/main/java/org/testng/reporters/XMLReporterConfig.java
similarity index 100%
rename from src/org/testng/reporters/XMLReporterConfig.java
rename to src/main/java/org/testng/reporters/XMLReporterConfig.java


diff --git a/src/org/testng/reporters/XMLStringBuffer.java b/src/main/java/org/testng/reporters/XMLStringBuffer.java
similarity index 100%
rename from src/org/testng/reporters/XMLStringBuffer.java
rename to src/main/java/org/testng/reporters/XMLStringBuffer.java


diff --git a/src/org/testng/reporters/XMLSuiteResultWriter.java b/src/main/java/org/testng/reporters/XMLSuiteResultWriter.java
similarity index 100%
rename from src/org/testng/reporters/XMLSuiteResultWriter.java
rename to src/main/java/org/testng/reporters/XMLSuiteResultWriter.java


diff --git a/src/org/testng/reporters/XMLUtils.java b/src/main/java/org/testng/reporters/XMLUtils.java
similarity index 100%
rename from src/org/testng/reporters/XMLUtils.java
rename to src/main/java/org/testng/reporters/XMLUtils.java


diff --git a/src/org/testng/reporters/util/StackTraceTools.java b/src/main/java/org/testng/reporters/util/StackTraceTools.java
similarity index 100%
rename from src/org/testng/reporters/util/StackTraceTools.java
rename to src/main/java/org/testng/reporters/util/StackTraceTools.java


diff --git a/src/org/testng/util/RetryAnalyzerCount.java b/src/main/java/org/testng/util/RetryAnalyzerCount.java
similarity index 100%
rename from src/org/testng/util/RetryAnalyzerCount.java
rename to src/main/java/org/testng/util/RetryAnalyzerCount.java


diff --git a/src/org/testng/xml/ClassSuite.java b/src/main/java/org/testng/xml/ClassSuite.java
similarity index 100%
rename from src/org/testng/xml/ClassSuite.java
rename to src/main/java/org/testng/xml/ClassSuite.java


diff --git a/src/org/testng/xml/LaunchSuite.java b/src/main/java/org/testng/xml/LaunchSuite.java
similarity index 100%
rename from src/org/testng/xml/LaunchSuite.java
rename to src/main/java/org/testng/xml/LaunchSuite.java


diff --git a/src/org/testng/xml/Parser.java b/src/main/java/org/testng/xml/Parser.java
similarity index 100%
rename from src/org/testng/xml/Parser.java
rename to src/main/java/org/testng/xml/Parser.java


diff --git a/src/org/testng/xml/SuiteGenerator.java b/src/main/java/org/testng/xml/SuiteGenerator.java
similarity index 100%
rename from src/org/testng/xml/SuiteGenerator.java
rename to src/main/java/org/testng/xml/SuiteGenerator.java


diff --git a/src/org/testng/xml/TestNGContentHandler.java b/src/main/java/org/testng/xml/TestNGContentHandler.java
similarity index 100%
rename from src/org/testng/xml/TestNGContentHandler.java
rename to src/main/java/org/testng/xml/TestNGContentHandler.java


diff --git a/src/org/testng/xml/XmlClass.java b/src/main/java/org/testng/xml/XmlClass.java
similarity index 100%
rename from src/org/testng/xml/XmlClass.java
rename to src/main/java/org/testng/xml/XmlClass.java


diff --git a/src/org/testng/xml/XmlInclude.java b/src/main/java/org/testng/xml/XmlInclude.java
similarity index 100%
rename from src/org/testng/xml/XmlInclude.java
rename to src/main/java/org/testng/xml/XmlInclude.java


diff --git a/src/org/testng/xml/XmlMethodSelector.java b/src/main/java/org/testng/xml/XmlMethodSelector.java
similarity index 100%
rename from src/org/testng/xml/XmlMethodSelector.java
rename to src/main/java/org/testng/xml/XmlMethodSelector.java


diff --git a/src/org/testng/xml/XmlPackage.java b/src/main/java/org/testng/xml/XmlPackage.java
similarity index 100%
rename from src/org/testng/xml/XmlPackage.java
rename to src/main/java/org/testng/xml/XmlPackage.java


diff --git a/src/org/testng/xml/XmlSuite.java b/src/main/java/org/testng/xml/XmlSuite.java
similarity index 100%
rename from src/org/testng/xml/XmlSuite.java
rename to src/main/java/org/testng/xml/XmlSuite.java


diff --git a/src/org/testng/xml/XmlTest.java b/src/main/java/org/testng/xml/XmlTest.java
similarity index 100%
rename from src/org/testng/xml/XmlTest.java
rename to src/main/java/org/testng/xml/XmlTest.java


diff --git a/src/testng-1.0.dtd b/src/main/java/testng-1.0.dtd
similarity index 100%
rename from src/testng-1.0.dtd
rename to src/main/java/testng-1.0.dtd


diff --git a/src/testng-1.0.dtd.html b/src/main/java/testng-1.0.dtd.html
similarity index 100%
rename from src/testng-1.0.dtd.html
rename to src/main/java/testng-1.0.dtd.html


diff --git a/src/testngtasks b/src/main/java/testngtasks
similarity index 100%
rename from src/testngtasks
rename to src/main/java/testngtasks


diff --git a/test/src/ConverterSample2.java b/src/test/java/ConverterSample2.java
similarity index 100%
rename from test/src/ConverterSample2.java
rename to src/test/java/ConverterSample2.java


diff --git a/test/src/ConverterSample4.java b/src/test/java/ConverterSample4.java
similarity index 100%
rename from test/src/ConverterSample4.java
rename to src/test/java/ConverterSample4.java


diff --git a/test/src/NoPackageTest.java b/src/test/java/NoPackageTest.java
similarity index 100%
rename from test/src/NoPackageTest.java
rename to src/test/java/NoPackageTest.java


diff --git a/test/src/build-ant.xml b/src/test/java/build-ant.xml
similarity index 100%
rename from test/src/build-ant.xml
rename to src/test/java/build-ant.xml


diff --git a/test/src/build-dogfood.xml b/src/test/java/build-dogfood.xml
similarity index 100%
rename from test/src/build-dogfood.xml
rename to src/test/java/build-dogfood.xml


diff --git a/test/src/build-sample.xml b/src/test/java/build-sample.xml
similarity index 100%
rename from test/src/build-sample.xml
rename to src/test/java/build-sample.xml


diff --git a/test/src/build.xml b/src/test/java/build.xml
similarity index 98%
rename from test/src/build.xml
rename to src/test/java/build.xml
index cd700f0..ad58331 100644
--- a/test/src/build.xml
+++ b/src/test/java/build.xml

@@ -1,4 +1,4 @@
-<project name="testng" default="all" basedir="../..">
+<project name="testng" default="all" basedir="../../..">
 
   <property file="build.properties"/>
 

diff --git a/test/src/hosts.properties b/src/test/java/hosts.properties
similarity index 100%
rename from test/src/hosts.properties
rename to src/test/java/hosts.properties


diff --git a/test/src/org/testng/AssertTest.java b/src/test/java/org/testng/AssertTest.java
similarity index 100%
rename from test/src/org/testng/AssertTest.java
rename to src/test/java/org/testng/AssertTest.java


diff --git a/test/src/org/testng/internal/conflistener/FailingAfterClass.java b/src/test/java/org/testng/internal/conflistener/FailingAfterClass.java
similarity index 100%
rename from test/src/org/testng/internal/conflistener/FailingAfterClass.java
rename to src/test/java/org/testng/internal/conflistener/FailingAfterClass.java


diff --git a/test/src/org/testng/internal/conflistener/FailingAfterSuite.java b/src/test/java/org/testng/internal/conflistener/FailingAfterSuite.java
similarity index 100%
rename from test/src/org/testng/internal/conflistener/FailingAfterSuite.java
rename to src/test/java/org/testng/internal/conflistener/FailingAfterSuite.java


diff --git a/test/src/org/testng/internal/conflistener/FailingAfterTest.java b/src/test/java/org/testng/internal/conflistener/FailingAfterTest.java
similarity index 100%
rename from test/src/org/testng/internal/conflistener/FailingAfterTest.java
rename to src/test/java/org/testng/internal/conflistener/FailingAfterTest.java


diff --git a/test/src/org/testng/internal/conflistener/FailingBeforeClass.java b/src/test/java/org/testng/internal/conflistener/FailingBeforeClass.java
similarity index 100%
rename from test/src/org/testng/internal/conflistener/FailingBeforeClass.java
rename to src/test/java/org/testng/internal/conflistener/FailingBeforeClass.java


diff --git a/test/src/org/testng/internal/conflistener/FailingBeforeSuite.java b/src/test/java/org/testng/internal/conflistener/FailingBeforeSuite.java
similarity index 100%
rename from test/src/org/testng/internal/conflistener/FailingBeforeSuite.java
rename to src/test/java/org/testng/internal/conflistener/FailingBeforeSuite.java


diff --git a/test/src/org/testng/internal/conflistener/FailingBeforeTest.java b/src/test/java/org/testng/internal/conflistener/FailingBeforeTest.java
similarity index 100%
rename from test/src/org/testng/internal/conflistener/FailingBeforeTest.java
rename to src/test/java/org/testng/internal/conflistener/FailingBeforeTest.java


diff --git a/test/src/org/testng/internal/conflistener/testng.xml b/src/test/java/org/testng/internal/conflistener/testng.xml
similarity index 100%
rename from test/src/org/testng/internal/conflistener/testng.xml
rename to src/test/java/org/testng/internal/conflistener/testng.xml


diff --git a/test/src/test/BaseDistributedTest.java b/src/test/java/test/BaseDistributedTest.java
similarity index 100%
rename from test/src/test/BaseDistributedTest.java
rename to src/test/java/test/BaseDistributedTest.java


diff --git a/test/src/test/BaseLogTest.java b/src/test/java/test/BaseLogTest.java
similarity index 100%
rename from test/src/test/BaseLogTest.java
rename to src/test/java/test/BaseLogTest.java


diff --git a/test/src/test/BaseTest.java b/src/test/java/test/BaseTest.java
similarity index 100%
rename from test/src/test/BaseTest.java
rename to src/test/java/test/BaseTest.java


diff --git a/test/src/test/ClassConfigurations.java b/src/test/java/test/ClassConfigurations.java
similarity index 100%
rename from test/src/test/ClassConfigurations.java
rename to src/test/java/test/ClassConfigurations.java


diff --git a/test/src/test/CommandLineTest.java b/src/test/java/test/CommandLineTest.java
similarity index 100%
rename from test/src/test/CommandLineTest.java
rename to src/test/java/test/CommandLineTest.java


diff --git a/test/src/test/CtorCalledOnce.java b/src/test/java/test/CtorCalledOnce.java
similarity index 100%
rename from test/src/test/CtorCalledOnce.java
rename to src/test/java/test/CtorCalledOnce.java


diff --git a/test/src/test/DynamicGraphTest.java b/src/test/java/test/DynamicGraphTest.java
similarity index 100%
rename from test/src/test/DynamicGraphTest.java
rename to src/test/java/test/DynamicGraphTest.java


diff --git a/test/src/test/Exclude.java b/src/test/java/test/Exclude.java
similarity index 100%
rename from test/src/test/Exclude.java
rename to src/test/java/test/Exclude.java


diff --git a/test/src/test/GraphTest.java b/src/test/java/test/GraphTest.java
similarity index 100%
rename from test/src/test/GraphTest.java
rename to src/test/java/test/GraphTest.java


diff --git a/test/src/test/IndividualMethodsTest.java b/src/test/java/test/IndividualMethodsTest.java
similarity index 100%
rename from test/src/test/IndividualMethodsTest.java
rename to src/test/java/test/IndividualMethodsTest.java


diff --git a/test/src/test/InvocationAndSuccessPercentageTest.java b/src/test/java/test/InvocationAndSuccessPercentageTest.java
similarity index 100%
rename from test/src/test/InvocationAndSuccessPercentageTest.java
rename to src/test/java/test/InvocationAndSuccessPercentageTest.java


diff --git a/test/src/test/JUnitTest1.java b/src/test/java/test/JUnitTest1.java
similarity index 100%
rename from test/src/test/JUnitTest1.java
rename to src/test/java/test/JUnitTest1.java


diff --git a/test/src/test/MethodTest.java b/src/test/java/test/MethodTest.java
similarity index 100%
rename from test/src/test/MethodTest.java
rename to src/test/java/test/MethodTest.java


diff --git a/test/src/test/Misc.java b/src/test/java/test/Misc.java
similarity index 100%
rename from test/src/test/Misc.java
rename to src/test/java/test/Misc.java


diff --git a/test/src/test/ParameterConstructorTest.java b/src/test/java/test/ParameterConstructorTest.java
similarity index 100%
rename from test/src/test/ParameterConstructorTest.java
rename to src/test/java/test/ParameterConstructorTest.java


diff --git a/test/src/test/SampleInheritance.java b/src/test/java/test/SampleInheritance.java
similarity index 100%
rename from test/src/test/SampleInheritance.java
rename to src/test/java/test/SampleInheritance.java


diff --git a/test/src/test/SimpleBaseTest.java b/src/test/java/test/SimpleBaseTest.java
similarity index 100%
rename from test/src/test/SimpleBaseTest.java
rename to src/test/java/test/SimpleBaseTest.java


diff --git a/test/src/test/Test1.java b/src/test/java/test/Test1.java
similarity index 100%
rename from test/src/test/Test1.java
rename to src/test/java/test/Test1.java


diff --git a/test/src/test/Test2.java b/src/test/java/test/Test2.java
similarity index 100%
rename from test/src/test/Test2.java
rename to src/test/java/test/Test2.java


diff --git a/test/src/test/TestHelper.java b/src/test/java/test/TestHelper.java
similarity index 100%
rename from test/src/test/TestHelper.java
rename to src/test/java/test/TestHelper.java


diff --git a/test/src/test/abstractconfmethod/B.java b/src/test/java/test/abstractconfmethod/B.java
similarity index 100%
rename from test/src/test/abstractconfmethod/B.java
rename to src/test/java/test/abstractconfmethod/B.java


diff --git a/test/src/test/abstractconfmethod/C.java b/src/test/java/test/abstractconfmethod/C.java
similarity index 100%
rename from test/src/test/abstractconfmethod/C.java
rename to src/test/java/test/abstractconfmethod/C.java


diff --git a/test/src/test/abstractconfmethod/foo/A.java b/src/test/java/test/abstractconfmethod/foo/A.java
similarity index 100%
rename from test/src/test/abstractconfmethod/foo/A.java
rename to src/test/java/test/abstractconfmethod/foo/A.java


diff --git a/test/src/test/access/BasePrivateAccessConfigurationMethods.java b/src/test/java/test/access/BasePrivateAccessConfigurationMethods.java
similarity index 100%
rename from test/src/test/access/BasePrivateAccessConfigurationMethods.java
rename to src/test/java/test/access/BasePrivateAccessConfigurationMethods.java


diff --git a/test/src/test/access/PrivateAccessConfigurationMethods.java b/src/test/java/test/access/PrivateAccessConfigurationMethods.java
similarity index 100%
rename from test/src/test/access/PrivateAccessConfigurationMethods.java
rename to src/test/java/test/access/PrivateAccessConfigurationMethods.java


diff --git a/test/src/test/alwaysrun/AlwaysRunAfter1.java b/src/test/java/test/alwaysrun/AlwaysRunAfter1.java
similarity index 100%
rename from test/src/test/alwaysrun/AlwaysRunAfter1.java
rename to src/test/java/test/alwaysrun/AlwaysRunAfter1.java


diff --git a/test/src/test/alwaysrun/AlwaysRunAfter2.java b/src/test/java/test/alwaysrun/AlwaysRunAfter2.java
similarity index 100%
rename from test/src/test/alwaysrun/AlwaysRunAfter2.java
rename to src/test/java/test/alwaysrun/AlwaysRunAfter2.java


diff --git a/test/src/test/alwaysrun/AlwaysRunBefore1.java b/src/test/java/test/alwaysrun/AlwaysRunBefore1.java
similarity index 100%
rename from test/src/test/alwaysrun/AlwaysRunBefore1.java
rename to src/test/java/test/alwaysrun/AlwaysRunBefore1.java


diff --git a/test/src/test/alwaysrun/AlwaysRunTest.java b/src/test/java/test/alwaysrun/AlwaysRunTest.java
similarity index 100%
rename from test/src/test/alwaysrun/AlwaysRunTest.java
rename to src/test/java/test/alwaysrun/AlwaysRunTest.java


diff --git a/test/src/test/annotationtransformer/AnnotationTransformerClassInvocationSampleTest.java b/src/test/java/test/annotationtransformer/AnnotationTransformerClassInvocationSampleTest.java
similarity index 100%
rename from test/src/test/annotationtransformer/AnnotationTransformerClassInvocationSampleTest.java
rename to src/test/java/test/annotationtransformer/AnnotationTransformerClassInvocationSampleTest.java


diff --git a/test/src/test/annotationtransformer/AnnotationTransformerClassSampleTest.java b/src/test/java/test/annotationtransformer/AnnotationTransformerClassSampleTest.java
similarity index 100%
rename from test/src/test/annotationtransformer/AnnotationTransformerClassSampleTest.java
rename to src/test/java/test/annotationtransformer/AnnotationTransformerClassSampleTest.java


diff --git a/test/src/test/annotationtransformer/AnnotationTransformerDataProviderSampleTest.java b/src/test/java/test/annotationtransformer/AnnotationTransformerDataProviderSampleTest.java
similarity index 100%
rename from test/src/test/annotationtransformer/AnnotationTransformerDataProviderSampleTest.java
rename to src/test/java/test/annotationtransformer/AnnotationTransformerDataProviderSampleTest.java


diff --git a/test/src/test/annotationtransformer/AnnotationTransformerFactorySampleTest.java b/src/test/java/test/annotationtransformer/AnnotationTransformerFactorySampleTest.java
similarity index 100%
rename from test/src/test/annotationtransformer/AnnotationTransformerFactorySampleTest.java
rename to src/test/java/test/annotationtransformer/AnnotationTransformerFactorySampleTest.java


diff --git a/test/src/test/annotationtransformer/AnnotationTransformerInTestngXml.java b/src/test/java/test/annotationtransformer/AnnotationTransformerInTestngXml.java
similarity index 100%
rename from test/src/test/annotationtransformer/AnnotationTransformerInTestngXml.java
rename to src/test/java/test/annotationtransformer/AnnotationTransformerInTestngXml.java


diff --git a/test/src/test/annotationtransformer/AnnotationTransformerSampleTest.java b/src/test/java/test/annotationtransformer/AnnotationTransformerSampleTest.java
similarity index 100%
rename from test/src/test/annotationtransformer/AnnotationTransformerSampleTest.java
rename to src/test/java/test/annotationtransformer/AnnotationTransformerSampleTest.java


diff --git a/test/src/test/annotationtransformer/AnnotationTransformerTest.java b/src/test/java/test/annotationtransformer/AnnotationTransformerTest.java
similarity index 100%
rename from test/src/test/annotationtransformer/AnnotationTransformerTest.java
rename to src/test/java/test/annotationtransformer/AnnotationTransformerTest.java


diff --git a/test/src/test/annotationtransformer/ConfigurationSampleTest.java b/src/test/java/test/annotationtransformer/ConfigurationSampleTest.java
similarity index 100%
rename from test/src/test/annotationtransformer/ConfigurationSampleTest.java
rename to src/test/java/test/annotationtransformer/ConfigurationSampleTest.java


diff --git a/test/src/test/annotationtransformer/ConfigurationTransformer.java b/src/test/java/test/annotationtransformer/ConfigurationTransformer.java
similarity index 100%
rename from test/src/test/annotationtransformer/ConfigurationTransformer.java
rename to src/test/java/test/annotationtransformer/ConfigurationTransformer.java


diff --git a/test/src/test/annotationtransformer/DataProviderTransformer.java b/src/test/java/test/annotationtransformer/DataProviderTransformer.java
similarity index 100%
rename from test/src/test/annotationtransformer/DataProviderTransformer.java
rename to src/test/java/test/annotationtransformer/DataProviderTransformer.java


diff --git a/test/src/test/annotationtransformer/FactoryTransformer.java b/src/test/java/test/annotationtransformer/FactoryTransformer.java
similarity index 100%
rename from test/src/test/annotationtransformer/FactoryTransformer.java
rename to src/test/java/test/annotationtransformer/FactoryTransformer.java


diff --git a/test/src/test/annotationtransformer/MyTimeOutTransformer.java b/src/test/java/test/annotationtransformer/MyTimeOutTransformer.java
similarity index 100%
rename from test/src/test/annotationtransformer/MyTimeOutTransformer.java
rename to src/test/java/test/annotationtransformer/MyTimeOutTransformer.java


diff --git a/test/src/test/annotationtransformer/MyTransformer.java b/src/test/java/test/annotationtransformer/MyTransformer.java
similarity index 100%
rename from test/src/test/annotationtransformer/MyTransformer.java
rename to src/test/java/test/annotationtransformer/MyTransformer.java


diff --git a/test/src/test/annotationtransformer/SimpleTest.java b/src/test/java/test/annotationtransformer/SimpleTest.java
similarity index 100%
rename from test/src/test/annotationtransformer/SimpleTest.java
rename to src/test/java/test/annotationtransformer/SimpleTest.java


diff --git a/test/src/test/ant/AntSystemPropertySet.java b/src/test/java/test/ant/AntSystemPropertySet.java
similarity index 100%
rename from test/src/test/ant/AntSystemPropertySet.java
rename to src/test/java/test/ant/AntSystemPropertySet.java


diff --git a/test/src/test/ant/DontOverrideSuiteNameTest.java b/src/test/java/test/ant/DontOverrideSuiteNameTest.java
similarity index 100%
rename from test/src/test/ant/DontOverrideSuiteNameTest.java
rename to src/test/java/test/ant/DontOverrideSuiteNameTest.java


diff --git a/test/src/test/ant/MultipleThreadTest.java b/src/test/java/test/ant/MultipleThreadTest.java
similarity index 100%
rename from test/src/test/ant/MultipleThreadTest.java
rename to src/test/java/test/ant/MultipleThreadTest.java


diff --git a/test/src/test/ant/NoPackageTest.java b/src/test/java/test/ant/NoPackageTest.java
similarity index 100%
rename from test/src/test/ant/NoPackageTest.java
rename to src/test/java/test/ant/NoPackageTest.java


diff --git a/test/src/test/ant/TestCommandLineArgs.java b/src/test/java/test/ant/TestCommandLineArgs.java
similarity index 100%
rename from test/src/test/ant/TestCommandLineArgs.java
rename to src/test/java/test/ant/TestCommandLineArgs.java


diff --git a/test/src/test/asserttests/AssertTest.java b/src/test/java/test/asserttests/AssertTest.java
similarity index 100%
rename from test/src/test/asserttests/AssertTest.java
rename to src/test/java/test/asserttests/AssertTest.java


diff --git a/test/src/test/attributes/AttributeTest.java b/src/test/java/test/attributes/AttributeTest.java
similarity index 100%
rename from test/src/test/attributes/AttributeTest.java
rename to src/test/java/test/attributes/AttributeTest.java


diff --git a/test/src/test/classgroup/First.java b/src/test/java/test/classgroup/First.java
similarity index 100%
rename from test/src/test/classgroup/First.java
rename to src/test/java/test/classgroup/First.java


diff --git a/test/src/test/classgroup/Second.java b/src/test/java/test/classgroup/Second.java
similarity index 100%
rename from test/src/test/classgroup/Second.java
rename to src/test/java/test/classgroup/Second.java


diff --git a/test/src/test/conffailure/ClassWithFailedBeforeSuite.java b/src/test/java/test/conffailure/ClassWithFailedBeforeSuite.java
similarity index 100%
rename from test/src/test/conffailure/ClassWithFailedBeforeSuite.java
rename to src/test/java/test/conffailure/ClassWithFailedBeforeSuite.java


diff --git a/test/src/test/conffailure/ClassWithFailedBeforeSuiteVerification.java b/src/test/java/test/conffailure/ClassWithFailedBeforeSuiteVerification.java
similarity index 100%
rename from test/src/test/conffailure/ClassWithFailedBeforeSuiteVerification.java
rename to src/test/java/test/conffailure/ClassWithFailedBeforeSuiteVerification.java


diff --git a/test/src/test/conffailure/ClassWithFailedBeforeTestClass.java b/src/test/java/test/conffailure/ClassWithFailedBeforeTestClass.java
similarity index 100%
rename from test/src/test/conffailure/ClassWithFailedBeforeTestClass.java
rename to src/test/java/test/conffailure/ClassWithFailedBeforeTestClass.java


diff --git a/test/src/test/conffailure/ClassWithFailedBeforeTestClassVerification.java b/src/test/java/test/conffailure/ClassWithFailedBeforeTestClassVerification.java
similarity index 100%
rename from test/src/test/conffailure/ClassWithFailedBeforeTestClassVerification.java
rename to src/test/java/test/conffailure/ClassWithFailedBeforeTestClassVerification.java


diff --git a/test/src/test/conffailure/ConfigurationFailure.java b/src/test/java/test/conffailure/ConfigurationFailure.java
similarity index 100%
rename from test/src/test/conffailure/ConfigurationFailure.java
rename to src/test/java/test/conffailure/ConfigurationFailure.java


diff --git a/test/src/test/configuration/Base.java b/src/test/java/test/configuration/Base.java
similarity index 100%
rename from test/src/test/configuration/Base.java
rename to src/test/java/test/configuration/Base.java


diff --git a/test/src/test/configuration/Base3.java b/src/test/java/test/configuration/Base3.java
similarity index 100%
rename from test/src/test/configuration/Base3.java
rename to src/test/java/test/configuration/Base3.java


diff --git a/test/src/test/configuration/BaseBeforeTestOrdering.java b/src/test/java/test/configuration/BaseBeforeTestOrdering.java
similarity index 100%
rename from test/src/test/configuration/BaseBeforeTestOrdering.java
rename to src/test/java/test/configuration/BaseBeforeTestOrdering.java


diff --git a/test/src/test/configuration/BaseGroupsASampleTest.java b/src/test/java/test/configuration/BaseGroupsASampleTest.java
similarity index 100%
rename from test/src/test/configuration/BaseGroupsASampleTest.java
rename to src/test/java/test/configuration/BaseGroupsASampleTest.java


diff --git a/test/src/test/configuration/BaseGroupsBSampleTest.java b/src/test/java/test/configuration/BaseGroupsBSampleTest.java
similarity index 100%
rename from test/src/test/configuration/BaseGroupsBSampleTest.java
rename to src/test/java/test/configuration/BaseGroupsBSampleTest.java


diff --git a/test/src/test/configuration/BaseGroupsTest.java b/src/test/java/test/configuration/BaseGroupsTest.java
similarity index 100%
rename from test/src/test/configuration/BaseGroupsTest.java
rename to src/test/java/test/configuration/BaseGroupsTest.java


diff --git a/test/src/test/configuration/BaseSuiteTest.java b/src/test/java/test/configuration/BaseSuiteTest.java
similarity index 100%
rename from test/src/test/configuration/BaseSuiteTest.java
rename to src/test/java/test/configuration/BaseSuiteTest.java


diff --git a/test/src/test/configuration/BeforeClassThreadA.java b/src/test/java/test/configuration/BeforeClassThreadA.java
similarity index 100%
rename from test/src/test/configuration/BeforeClassThreadA.java
rename to src/test/java/test/configuration/BeforeClassThreadA.java


diff --git a/test/src/test/configuration/BeforeClassThreadB.java b/src/test/java/test/configuration/BeforeClassThreadB.java
similarity index 100%
rename from test/src/test/configuration/BeforeClassThreadB.java
rename to src/test/java/test/configuration/BeforeClassThreadB.java


diff --git a/test/src/test/configuration/BeforeClassThreadTest.java b/src/test/java/test/configuration/BeforeClassThreadTest.java
similarity index 100%
rename from test/src/test/configuration/BeforeClassThreadTest.java
rename to src/test/java/test/configuration/BeforeClassThreadTest.java


diff --git a/test/src/test/configuration/BeforeMethodTest.java b/src/test/java/test/configuration/BeforeMethodTest.java
similarity index 100%
rename from test/src/test/configuration/BeforeMethodTest.java
rename to src/test/java/test/configuration/BeforeMethodTest.java


diff --git a/test/src/test/configuration/BeforeTestOrdering1Test.java b/src/test/java/test/configuration/BeforeTestOrdering1Test.java
similarity index 100%
rename from test/src/test/configuration/BeforeTestOrdering1Test.java
rename to src/test/java/test/configuration/BeforeTestOrdering1Test.java


diff --git a/test/src/test/configuration/BeforeTestOrdering2Test.java b/src/test/java/test/configuration/BeforeTestOrdering2Test.java
similarity index 100%
rename from test/src/test/configuration/BeforeTestOrdering2Test.java
rename to src/test/java/test/configuration/BeforeTestOrdering2Test.java


diff --git a/test/src/test/configuration/BeforeTestOrderingTest.java b/src/test/java/test/configuration/BeforeTestOrderingTest.java
similarity index 100%
rename from test/src/test/configuration/BeforeTestOrderingTest.java
rename to src/test/java/test/configuration/BeforeTestOrderingTest.java


diff --git a/test/src/test/configuration/ConfigurationGroupBothSampleTest.java b/src/test/java/test/configuration/ConfigurationGroupBothSampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroupBothSampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroupBothSampleTest.java


diff --git a/test/src/test/configuration/ConfigurationGroupDataProviderSampleTest.java b/src/test/java/test/configuration/ConfigurationGroupDataProviderSampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroupDataProviderSampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroupDataProviderSampleTest.java


diff --git a/test/src/test/configuration/ConfigurationGroupInvocationCountSampleTest.java b/src/test/java/test/configuration/ConfigurationGroupInvocationCountSampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroupInvocationCountSampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroupInvocationCountSampleTest.java


diff --git a/test/src/test/configuration/ConfigurationGroups1SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups1SampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroups1SampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroups1SampleTest.java


diff --git a/test/src/test/configuration/ConfigurationGroups2SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups2SampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroups2SampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroups2SampleTest.java


diff --git a/test/src/test/configuration/ConfigurationGroups3SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups3SampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroups3SampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroups3SampleTest.java


diff --git a/test/src/test/configuration/ConfigurationGroups4SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups4SampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroups4SampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroups4SampleTest.java


diff --git a/test/src/test/configuration/ConfigurationGroups5SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups5SampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroups5SampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroups5SampleTest.java


diff --git a/test/src/test/configuration/ConfigurationGroups6SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups6SampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroups6SampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroups6SampleTest.java


diff --git a/test/src/test/configuration/ConfigurationGroups7SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups7SampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroups7SampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroups7SampleTest.java


diff --git a/test/src/test/configuration/ConfigurationGroups8SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups8SampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationGroups8SampleTest.java
rename to src/test/java/test/configuration/ConfigurationGroups8SampleTest.java


diff --git a/test/src/test/configuration/ConfigurationInheritGroupsSampleTest.java b/src/test/java/test/configuration/ConfigurationInheritGroupsSampleTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationInheritGroupsSampleTest.java
rename to src/test/java/test/configuration/ConfigurationInheritGroupsSampleTest.java


diff --git a/test/src/test/configuration/ConfigurationTest.java b/src/test/java/test/configuration/ConfigurationTest.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationTest.java
rename to src/test/java/test/configuration/ConfigurationTest.java


diff --git a/test/src/test/configuration/ConfigurationWithParameters.java b/src/test/java/test/configuration/ConfigurationWithParameters.java
similarity index 100%
rename from test/src/test/configuration/ConfigurationWithParameters.java
rename to src/test/java/test/configuration/ConfigurationWithParameters.java


diff --git a/test/src/test/configuration/ExternalConfigurationClass.java b/src/test/java/test/configuration/ExternalConfigurationClass.java
similarity index 100%
rename from test/src/test/configuration/ExternalConfigurationClass.java
rename to src/test/java/test/configuration/ExternalConfigurationClass.java


diff --git a/test/src/test/configuration/GroupsTest.java b/src/test/java/test/configuration/GroupsTest.java
similarity index 100%
rename from test/src/test/configuration/GroupsTest.java
rename to src/test/java/test/configuration/GroupsTest.java


diff --git a/test/src/test/configuration/MethodCallOrderTest.java b/src/test/java/test/configuration/MethodCallOrderTest.java
similarity index 100%
rename from test/src/test/configuration/MethodCallOrderTest.java
rename to src/test/java/test/configuration/MethodCallOrderTest.java


diff --git a/test/src/test/configuration/MultipleBeforeGroupTest.java b/src/test/java/test/configuration/MultipleBeforeGroupTest.java
similarity index 100%
rename from test/src/test/configuration/MultipleBeforeGroupTest.java
rename to src/test/java/test/configuration/MultipleBeforeGroupTest.java


diff --git a/test/src/test/configuration/ReflectMethodParametrizedConfigurationMethodTest.java b/src/test/java/test/configuration/ReflectMethodParametrizedConfigurationMethodTest.java
similarity index 100%
rename from test/src/test/configuration/ReflectMethodParametrizedConfigurationMethodTest.java
rename to src/test/java/test/configuration/ReflectMethodParametrizedConfigurationMethodTest.java


diff --git a/test/src/test/configuration/SuiteFactoryOnceSample1Test.java b/src/test/java/test/configuration/SuiteFactoryOnceSample1Test.java
similarity index 100%
rename from test/src/test/configuration/SuiteFactoryOnceSample1Test.java
rename to src/test/java/test/configuration/SuiteFactoryOnceSample1Test.java


diff --git a/test/src/test/configuration/SuiteFactoryOnceSample2Test.java b/src/test/java/test/configuration/SuiteFactoryOnceSample2Test.java
similarity index 100%
rename from test/src/test/configuration/SuiteFactoryOnceSample2Test.java
rename to src/test/java/test/configuration/SuiteFactoryOnceSample2Test.java


diff --git a/test/src/test/configuration/SuiteFactoryOnceTest.java b/src/test/java/test/configuration/SuiteFactoryOnceTest.java
similarity index 100%
rename from test/src/test/configuration/SuiteFactoryOnceTest.java
rename to src/test/java/test/configuration/SuiteFactoryOnceTest.java


diff --git a/test/src/test/configuration/SuiteTest.java b/src/test/java/test/configuration/SuiteTest.java
similarity index 100%
rename from test/src/test/configuration/SuiteTest.java
rename to src/test/java/test/configuration/SuiteTest.java


diff --git a/test/src/test/configuration/VerifySuiteTest.java b/src/test/java/test/configuration/VerifySuiteTest.java
similarity index 100%
rename from test/src/test/configuration/VerifySuiteTest.java
rename to src/test/java/test/configuration/VerifySuiteTest.java


diff --git a/test/src/test/convert/JUnitConverterTest.java b/src/test/java/test/convert/JUnitConverterTest.java
similarity index 100%
rename from test/src/test/convert/JUnitConverterTest.java
rename to src/test/java/test/convert/JUnitConverterTest.java


diff --git a/test/src/test/converter/ConverterSample1.java b/src/test/java/test/converter/ConverterSample1.java
similarity index 100%
rename from test/src/test/converter/ConverterSample1.java
rename to src/test/java/test/converter/ConverterSample1.java


diff --git a/test/src/test/converter/JUnitConverterTest.java b/src/test/java/test/converter/JUnitConverterTest.java
similarity index 100%
rename from test/src/test/converter/JUnitConverterTest.java
rename to src/test/java/test/converter/JUnitConverterTest.java


diff --git a/test/src/test/cyclic/AbstractGenericTests.java b/src/test/java/test/cyclic/AbstractGenericTests.java
similarity index 100%
rename from test/src/test/cyclic/AbstractGenericTests.java
rename to src/test/java/test/cyclic/AbstractGenericTests.java


diff --git a/test/src/test/cyclic/BaseIntegrationTest.java b/src/test/java/test/cyclic/BaseIntegrationTest.java
similarity index 100%
rename from test/src/test/cyclic/BaseIntegrationTest.java
rename to src/test/java/test/cyclic/BaseIntegrationTest.java


diff --git a/test/src/test/cyclic/HibernateConcreteTests.java b/src/test/java/test/cyclic/HibernateConcreteTests.java
similarity index 100%
rename from test/src/test/cyclic/HibernateConcreteTests.java
rename to src/test/java/test/cyclic/HibernateConcreteTests.java


diff --git a/test/src/test/cyclic/SomeConcreteTests.java b/src/test/java/test/cyclic/SomeConcreteTests.java
similarity index 100%
rename from test/src/test/cyclic/SomeConcreteTests.java
rename to src/test/java/test/cyclic/SomeConcreteTests.java


diff --git a/test/src/test/dataprovider/BooleanTest.java b/src/test/java/test/dataprovider/BooleanTest.java
similarity index 100%
rename from test/src/test/dataprovider/BooleanTest.java
rename to src/test/java/test/dataprovider/BooleanTest.java


diff --git a/test/src/test/dataprovider/ClassSampleTest.java b/src/test/java/test/dataprovider/ClassSampleTest.java
similarity index 100%
rename from test/src/test/dataprovider/ClassSampleTest.java
rename to src/test/java/test/dataprovider/ClassSampleTest.java


diff --git a/test/src/test/dataprovider/ClassTest.java b/src/test/java/test/dataprovider/ClassTest.java
similarity index 100%
rename from test/src/test/dataprovider/ClassTest.java
rename to src/test/java/test/dataprovider/ClassTest.java


diff --git a/test/src/test/dataprovider/ConfigurationAndDataProvidersTest.java b/src/test/java/test/dataprovider/ConfigurationAndDataProvidersTest.java
similarity index 100%
rename from test/src/test/dataprovider/ConfigurationAndDataProvidersTest.java
rename to src/test/java/test/dataprovider/ConfigurationAndDataProvidersTest.java


diff --git a/test/src/test/dataprovider/CreateDataTest.java b/src/test/java/test/dataprovider/CreateDataTest.java
similarity index 100%
rename from test/src/test/dataprovider/CreateDataTest.java
rename to src/test/java/test/dataprovider/CreateDataTest.java


diff --git a/test/src/test/dataprovider/DataProviderAsTest.java b/src/test/java/test/dataprovider/DataProviderAsTest.java
similarity index 100%
rename from test/src/test/dataprovider/DataProviderAsTest.java
rename to src/test/java/test/dataprovider/DataProviderAsTest.java


diff --git a/test/src/test/dataprovider/DependentSampleTest.java b/src/test/java/test/dataprovider/DependentSampleTest.java
similarity index 100%
rename from test/src/test/dataprovider/DependentSampleTest.java
rename to src/test/java/test/dataprovider/DependentSampleTest.java


diff --git a/test/src/test/dataprovider/FailedDataProviderSample.java b/src/test/java/test/dataprovider/FailedDataProviderSample.java
similarity index 100%
rename from test/src/test/dataprovider/FailedDataProviderSample.java
rename to src/test/java/test/dataprovider/FailedDataProviderSample.java


diff --git a/test/src/test/dataprovider/FailedDataProviderTest.java b/src/test/java/test/dataprovider/FailedDataProviderTest.java
similarity index 100%
rename from test/src/test/dataprovider/FailedDataProviderTest.java
rename to src/test/java/test/dataprovider/FailedDataProviderTest.java


diff --git a/test/src/test/dataprovider/FailingDataProvider.java b/src/test/java/test/dataprovider/FailingDataProvider.java
similarity index 100%
rename from test/src/test/dataprovider/FailingDataProvider.java
rename to src/test/java/test/dataprovider/FailingDataProvider.java


diff --git a/test/src/test/dataprovider/FailingDataProviderTest.java b/src/test/java/test/dataprovider/FailingDataProviderTest.java
similarity index 100%
rename from test/src/test/dataprovider/FailingDataProviderTest.java
rename to src/test/java/test/dataprovider/FailingDataProviderTest.java


diff --git a/test/src/test/dataprovider/FailingIterableDataProvider.java b/src/test/java/test/dataprovider/FailingIterableDataProvider.java
similarity index 100%
rename from test/src/test/dataprovider/FailingIterableDataProvider.java
rename to src/test/java/test/dataprovider/FailingIterableDataProvider.java


diff --git a/test/src/test/dataprovider/FailingIterableDataProviderTest.java b/src/test/java/test/dataprovider/FailingIterableDataProviderTest.java
similarity index 100%
rename from test/src/test/dataprovider/FailingIterableDataProviderTest.java
rename to src/test/java/test/dataprovider/FailingIterableDataProviderTest.java


diff --git a/test/src/test/dataprovider/InheritanceATest.java b/src/test/java/test/dataprovider/InheritanceATest.java
similarity index 100%
rename from test/src/test/dataprovider/InheritanceATest.java
rename to src/test/java/test/dataprovider/InheritanceATest.java


diff --git a/test/src/test/dataprovider/InheritanceBTest.java b/src/test/java/test/dataprovider/InheritanceBTest.java
similarity index 100%
rename from test/src/test/dataprovider/InheritanceBTest.java
rename to src/test/java/test/dataprovider/InheritanceBTest.java


diff --git a/test/src/test/dataprovider/InheritedDataProviderBaseSampleTest.java b/src/test/java/test/dataprovider/InheritedDataProviderBaseSampleTest.java
similarity index 100%
rename from test/src/test/dataprovider/InheritedDataProviderBaseSampleTest.java
rename to src/test/java/test/dataprovider/InheritedDataProviderBaseSampleTest.java


diff --git a/test/src/test/dataprovider/InheritedDataProviderSample1Test.java b/src/test/java/test/dataprovider/InheritedDataProviderSample1Test.java
similarity index 100%
rename from test/src/test/dataprovider/InheritedDataProviderSample1Test.java
rename to src/test/java/test/dataprovider/InheritedDataProviderSample1Test.java


diff --git a/test/src/test/dataprovider/InheritedDataProviderTest.java b/src/test/java/test/dataprovider/InheritedDataProviderTest.java
similarity index 100%
rename from test/src/test/dataprovider/InheritedDataProviderTest.java
rename to src/test/java/test/dataprovider/InheritedDataProviderTest.java


diff --git a/test/src/test/dataprovider/InnexistentDataProvider.java b/src/test/java/test/dataprovider/InnexistentDataProvider.java
similarity index 100%
rename from test/src/test/dataprovider/InnexistentDataProvider.java
rename to src/test/java/test/dataprovider/InnexistentDataProvider.java


diff --git a/test/src/test/dataprovider/InstanceDataProviderSampleTest.java b/src/test/java/test/dataprovider/InstanceDataProviderSampleTest.java
similarity index 100%
rename from test/src/test/dataprovider/InstanceDataProviderSampleTest.java
rename to src/test/java/test/dataprovider/InstanceDataProviderSampleTest.java


diff --git a/test/src/test/dataprovider/InstanceDataProviderTest.java b/src/test/java/test/dataprovider/InstanceDataProviderTest.java
similarity index 100%
rename from test/src/test/dataprovider/InstanceDataProviderTest.java
rename to src/test/java/test/dataprovider/InstanceDataProviderTest.java


diff --git a/test/src/test/dataprovider/IterableTest.java b/src/test/java/test/dataprovider/IterableTest.java
similarity index 100%
rename from test/src/test/dataprovider/IterableTest.java
rename to src/test/java/test/dataprovider/IterableTest.java


diff --git a/test/src/test/dataprovider/MethodTest.java b/src/test/java/test/dataprovider/MethodTest.java
similarity index 100%
rename from test/src/test/dataprovider/MethodTest.java
rename to src/test/java/test/dataprovider/MethodTest.java


diff --git a/test/src/test/dataprovider/MyIterator.java b/src/test/java/test/dataprovider/MyIterator.java
similarity index 100%
rename from test/src/test/dataprovider/MyIterator.java
rename to src/test/java/test/dataprovider/MyIterator.java


diff --git a/test/src/test/dataprovider/ParallelDataProviderTest.java b/src/test/java/test/dataprovider/ParallelDataProviderTest.java
similarity index 100%
rename from test/src/test/dataprovider/ParallelDataProviderTest.java
rename to src/test/java/test/dataprovider/ParallelDataProviderTest.java


diff --git a/test/src/test/dataprovider/Sample1Test.java b/src/test/java/test/dataprovider/Sample1Test.java
similarity index 100%
rename from test/src/test/dataprovider/Sample1Test.java
rename to src/test/java/test/dataprovider/Sample1Test.java


diff --git a/test/src/test/dataprovider/StaticDataProviderSampleTest.java b/src/test/java/test/dataprovider/StaticDataProviderSampleTest.java
similarity index 100%
rename from test/src/test/dataprovider/StaticDataProviderSampleTest.java
rename to src/test/java/test/dataprovider/StaticDataProviderSampleTest.java


diff --git a/test/src/test/dataprovider/StaticProvider.java b/src/test/java/test/dataprovider/StaticProvider.java
similarity index 100%
rename from test/src/test/dataprovider/StaticProvider.java
rename to src/test/java/test/dataprovider/StaticProvider.java


diff --git a/test/src/test/dataprovider/TestContextSampleTest.java b/src/test/java/test/dataprovider/TestContextSampleTest.java
similarity index 100%
rename from test/src/test/dataprovider/TestContextSampleTest.java
rename to src/test/java/test/dataprovider/TestContextSampleTest.java


diff --git a/test/src/test/dataprovider/TestContextTest.java b/src/test/java/test/dataprovider/TestContextTest.java
similarity index 100%
rename from test/src/test/dataprovider/TestContextTest.java
rename to src/test/java/test/dataprovider/TestContextTest.java


diff --git a/test/src/test/dataprovider/TestInstanceFactory.java b/src/test/java/test/dataprovider/TestInstanceFactory.java
similarity index 100%
rename from test/src/test/dataprovider/TestInstanceFactory.java
rename to src/test/java/test/dataprovider/TestInstanceFactory.java


diff --git a/test/src/test/dataprovider/TestInstanceTest.java b/src/test/java/test/dataprovider/TestInstanceTest.java
similarity index 100%
rename from test/src/test/dataprovider/TestInstanceTest.java
rename to src/test/java/test/dataprovider/TestInstanceTest.java


diff --git a/test/src/test/dataprovider/UnnamedDataProviderTest.java b/src/test/java/test/dataprovider/UnnamedDataProviderTest.java
similarity index 100%
rename from test/src/test/dataprovider/UnnamedDataProviderTest.java
rename to src/test/java/test/dataprovider/UnnamedDataProviderTest.java


diff --git a/test/src/test/dependent/BaseOrderMethodTest.java b/src/test/java/test/dependent/BaseOrderMethodTest.java
similarity index 100%
rename from test/src/test/dependent/BaseOrderMethodTest.java
rename to src/test/java/test/dependent/BaseOrderMethodTest.java


diff --git a/test/src/test/dependent/ClassDependsOnGroups.java b/src/test/java/test/dependent/ClassDependsOnGroups.java
similarity index 100%
rename from test/src/test/dependent/ClassDependsOnGroups.java
rename to src/test/java/test/dependent/ClassDependsOnGroups.java


diff --git a/test/src/test/dependent/ClassWide1Test.java b/src/test/java/test/dependent/ClassWide1Test.java
similarity index 100%
rename from test/src/test/dependent/ClassWide1Test.java
rename to src/test/java/test/dependent/ClassWide1Test.java


diff --git a/test/src/test/dependent/ClassWide2Test.java b/src/test/java/test/dependent/ClassWide2Test.java
similarity index 100%
rename from test/src/test/dependent/ClassWide2Test.java
rename to src/test/java/test/dependent/ClassWide2Test.java


diff --git a/test/src/test/dependent/DepBugSampleTest.java b/src/test/java/test/dependent/DepBugSampleTest.java
similarity index 100%
rename from test/src/test/dependent/DepBugSampleTest.java
rename to src/test/java/test/dependent/DepBugSampleTest.java


diff --git a/test/src/test/dependent/DepBugVerifyTest.java b/src/test/java/test/dependent/DepBugVerifyTest.java
similarity index 100%
rename from test/src/test/dependent/DepBugVerifyTest.java
rename to src/test/java/test/dependent/DepBugVerifyTest.java


diff --git a/test/src/test/dependent/DependentAlwaysRunTest.java b/src/test/java/test/dependent/DependentAlwaysRunTest.java
similarity index 100%
rename from test/src/test/dependent/DependentAlwaysRunTest.java
rename to src/test/java/test/dependent/DependentAlwaysRunTest.java


diff --git a/test/src/test/dependent/DependentOnGroup1AlwaysRunSampleTest.java b/src/test/java/test/dependent/DependentOnGroup1AlwaysRunSampleTest.java
similarity index 100%
rename from test/src/test/dependent/DependentOnGroup1AlwaysRunSampleTest.java
rename to src/test/java/test/dependent/DependentOnGroup1AlwaysRunSampleTest.java


diff --git a/test/src/test/dependent/DependentOnGroup2AlwaysRunSampleTest.java b/src/test/java/test/dependent/DependentOnGroup2AlwaysRunSampleTest.java
similarity index 100%
rename from test/src/test/dependent/DependentOnGroup2AlwaysRunSampleTest.java
rename to src/test/java/test/dependent/DependentOnGroup2AlwaysRunSampleTest.java


diff --git a/test/src/test/dependent/DependentOnMethod1AlwaysRunSampleTest.java b/src/test/java/test/dependent/DependentOnMethod1AlwaysRunSampleTest.java
similarity index 100%
rename from test/src/test/dependent/DependentOnMethod1AlwaysRunSampleTest.java
rename to src/test/java/test/dependent/DependentOnMethod1AlwaysRunSampleTest.java


diff --git a/test/src/test/dependent/DependentTest.java b/src/test/java/test/dependent/DependentTest.java
similarity index 100%
rename from test/src/test/dependent/DependentTest.java
rename to src/test/java/test/dependent/DependentTest.java


diff --git a/test/src/test/dependent/DependsOnProtectedMethodTest.java b/src/test/java/test/dependent/DependsOnProtectedMethodTest.java
similarity index 100%
rename from test/src/test/dependent/DependsOnProtectedMethodTest.java
rename to src/test/java/test/dependent/DependsOnProtectedMethodTest.java


diff --git a/test/src/test/dependent/DepthDependencyTest.java b/src/test/java/test/dependent/DepthDependencyTest.java
similarity index 100%
rename from test/src/test/dependent/DepthDependencyTest.java
rename to src/test/java/test/dependent/DepthDependencyTest.java


diff --git a/test/src/test/dependent/DifferentClassDependsOnGroupsTest1.java b/src/test/java/test/dependent/DifferentClassDependsOnGroupsTest1.java
similarity index 100%
rename from test/src/test/dependent/DifferentClassDependsOnGroupsTest1.java
rename to src/test/java/test/dependent/DifferentClassDependsOnGroupsTest1.java


diff --git a/test/src/test/dependent/DifferentClassDependsOnGroupsTest2.java b/src/test/java/test/dependent/DifferentClassDependsOnGroupsTest2.java
similarity index 100%
rename from test/src/test/dependent/DifferentClassDependsOnGroupsTest2.java
rename to src/test/java/test/dependent/DifferentClassDependsOnGroupsTest2.java


diff --git a/test/src/test/dependent/ImplicitGroupInclusion2SampleTest.java b/src/test/java/test/dependent/ImplicitGroupInclusion2SampleTest.java
similarity index 100%
rename from test/src/test/dependent/ImplicitGroupInclusion2SampleTest.java
rename to src/test/java/test/dependent/ImplicitGroupInclusion2SampleTest.java


diff --git a/test/src/test/dependent/ImplicitGroupInclusion3SampleTest.java b/src/test/java/test/dependent/ImplicitGroupInclusion3SampleTest.java
similarity index 100%
rename from test/src/test/dependent/ImplicitGroupInclusion3SampleTest.java
rename to src/test/java/test/dependent/ImplicitGroupInclusion3SampleTest.java


diff --git a/test/src/test/dependent/ImplicitGroupInclusion4SampleTest.java b/src/test/java/test/dependent/ImplicitGroupInclusion4SampleTest.java
similarity index 100%
rename from test/src/test/dependent/ImplicitGroupInclusion4SampleTest.java
rename to src/test/java/test/dependent/ImplicitGroupInclusion4SampleTest.java


diff --git a/test/src/test/dependent/ImplicitGroupInclusionSampleTest.java b/src/test/java/test/dependent/ImplicitGroupInclusionSampleTest.java
similarity index 100%
rename from test/src/test/dependent/ImplicitGroupInclusionSampleTest.java
rename to src/test/java/test/dependent/ImplicitGroupInclusionSampleTest.java


diff --git a/test/src/test/dependent/ImplicitGroupInclusionTest.java b/src/test/java/test/dependent/ImplicitGroupInclusionTest.java
similarity index 100%
rename from test/src/test/dependent/ImplicitGroupInclusionTest.java
rename to src/test/java/test/dependent/ImplicitGroupInclusionTest.java


diff --git a/test/src/test/dependent/ImplicitMethodInclusionSampleTest.java b/src/test/java/test/dependent/ImplicitMethodInclusionSampleTest.java
similarity index 100%
rename from test/src/test/dependent/ImplicitMethodInclusionSampleTest.java
rename to src/test/java/test/dependent/ImplicitMethodInclusionSampleTest.java


diff --git a/test/src/test/dependent/MissingGroupSampleTest.java b/src/test/java/test/dependent/MissingGroupSampleTest.java
similarity index 100%
rename from test/src/test/dependent/MissingGroupSampleTest.java
rename to src/test/java/test/dependent/MissingGroupSampleTest.java


diff --git a/test/src/test/dependent/MissingGroupTest.java b/src/test/java/test/dependent/MissingGroupTest.java
similarity index 100%
rename from test/src/test/dependent/MissingGroupTest.java
rename to src/test/java/test/dependent/MissingGroupTest.java


diff --git a/test/src/test/dependent/MissingMethodSampleTest.java b/src/test/java/test/dependent/MissingMethodSampleTest.java
similarity index 100%
rename from test/src/test/dependent/MissingMethodSampleTest.java
rename to src/test/java/test/dependent/MissingMethodSampleTest.java


diff --git a/test/src/test/dependent/MissingMethodTest.java b/src/test/java/test/dependent/MissingMethodTest.java
similarity index 100%
rename from test/src/test/dependent/MissingMethodTest.java
rename to src/test/java/test/dependent/MissingMethodTest.java


diff --git a/test/src/test/dependent/MultiGroup1SampleTest.java b/src/test/java/test/dependent/MultiGroup1SampleTest.java
similarity index 100%
rename from test/src/test/dependent/MultiGroup1SampleTest.java
rename to src/test/java/test/dependent/MultiGroup1SampleTest.java


diff --git a/test/src/test/dependent/MultiGroup2SampleTest.java b/src/test/java/test/dependent/MultiGroup2SampleTest.java
similarity index 100%
rename from test/src/test/dependent/MultiGroup2SampleTest.java
rename to src/test/java/test/dependent/MultiGroup2SampleTest.java


diff --git a/test/src/test/dependent/MultiGroupTest.java b/src/test/java/test/dependent/MultiGroupTest.java
similarity index 100%
rename from test/src/test/dependent/MultiGroupTest.java
rename to src/test/java/test/dependent/MultiGroupTest.java


diff --git a/test/src/test/dependent/OrderMethodTest.java b/src/test/java/test/dependent/OrderMethodTest.java
similarity index 100%
rename from test/src/test/dependent/OrderMethodTest.java
rename to src/test/java/test/dependent/OrderMethodTest.java


diff --git a/test/src/test/dependent/SampleDependent1.java b/src/test/java/test/dependent/SampleDependent1.java
similarity index 100%
rename from test/src/test/dependent/SampleDependent1.java
rename to src/test/java/test/dependent/SampleDependent1.java


diff --git a/test/src/test/dependent/SampleDependentConfigurationMethods.java b/src/test/java/test/dependent/SampleDependentConfigurationMethods.java
similarity index 100%
rename from test/src/test/dependent/SampleDependentConfigurationMethods.java
rename to src/test/java/test/dependent/SampleDependentConfigurationMethods.java


diff --git a/test/src/test/dependent/SampleDependentMethods.java b/src/test/java/test/dependent/SampleDependentMethods.java
similarity index 100%
rename from test/src/test/dependent/SampleDependentMethods.java
rename to src/test/java/test/dependent/SampleDependentMethods.java


diff --git a/test/src/test/dependent/SampleDependentMethods2.java b/src/test/java/test/dependent/SampleDependentMethods2.java
similarity index 100%
rename from test/src/test/dependent/SampleDependentMethods2.java
rename to src/test/java/test/dependent/SampleDependentMethods2.java


diff --git a/test/src/test/dependent/SampleDependentMethods3.java b/src/test/java/test/dependent/SampleDependentMethods3.java
similarity index 100%
rename from test/src/test/dependent/SampleDependentMethods3.java
rename to src/test/java/test/dependent/SampleDependentMethods3.java


diff --git a/test/src/test/dependent/SampleDependentMethods4.java b/src/test/java/test/dependent/SampleDependentMethods4.java
similarity index 100%
rename from test/src/test/dependent/SampleDependentMethods4.java
rename to src/test/java/test/dependent/SampleDependentMethods4.java


diff --git a/test/src/test/dependent/SampleDependentMethods5.java b/src/test/java/test/dependent/SampleDependentMethods5.java
similarity index 100%
rename from test/src/test/dependent/SampleDependentMethods5.java
rename to src/test/java/test/dependent/SampleDependentMethods5.java


diff --git a/test/src/test/dependent/SampleDependentMethods6.java b/src/test/java/test/dependent/SampleDependentMethods6.java
similarity index 100%
rename from test/src/test/dependent/SampleDependentMethods6.java
rename to src/test/java/test/dependent/SampleDependentMethods6.java


diff --git a/test/src/test/dependent/Test1.java b/src/test/java/test/dependent/Test1.java
similarity index 100%
rename from test/src/test/dependent/Test1.java
rename to src/test/java/test/dependent/Test1.java


diff --git a/test/src/test/dependent/functionality1/Config.java b/src/test/java/test/dependent/functionality1/Config.java
similarity index 100%
rename from test/src/test/dependent/functionality1/Config.java
rename to src/test/java/test/dependent/functionality1/Config.java


diff --git a/test/src/test/dependent/functionality1/Test1.java b/src/test/java/test/dependent/functionality1/Test1.java
similarity index 100%
rename from test/src/test/dependent/functionality1/Test1.java
rename to src/test/java/test/dependent/functionality1/Test1.java


diff --git a/test/src/test/dependent/functionality1/Test2.java b/src/test/java/test/dependent/functionality1/Test2.java
similarity index 100%
rename from test/src/test/dependent/functionality1/Test2.java
rename to src/test/java/test/dependent/functionality1/Test2.java


diff --git a/test/src/test/dependsongroup/DependsOnGroupsTest.java b/src/test/java/test/dependsongroup/DependsOnGroupsTest.java
similarity index 100%
rename from test/src/test/dependsongroup/DependsOnGroupsTest.java
rename to src/test/java/test/dependsongroup/DependsOnGroupsTest.java


diff --git a/test/src/test/dependsongroup/FirstSampleTest.java b/src/test/java/test/dependsongroup/FirstSampleTest.java
similarity index 100%
rename from test/src/test/dependsongroup/FirstSampleTest.java
rename to src/test/java/test/dependsongroup/FirstSampleTest.java


diff --git a/test/src/test/dependsongroup/SecondSampleTest.java b/src/test/java/test/dependsongroup/SecondSampleTest.java
similarity index 100%
rename from test/src/test/dependsongroup/SecondSampleTest.java
rename to src/test/java/test/dependsongroup/SecondSampleTest.java


diff --git a/test/src/test/dependsongroup/TestFixture1.java b/src/test/java/test/dependsongroup/TestFixture1.java
similarity index 100%
rename from test/src/test/dependsongroup/TestFixture1.java
rename to src/test/java/test/dependsongroup/TestFixture1.java


diff --git a/test/src/test/dependsongroup/TestFixture2.java b/src/test/java/test/dependsongroup/TestFixture2.java
similarity index 100%
rename from test/src/test/dependsongroup/TestFixture2.java
rename to src/test/java/test/dependsongroup/TestFixture2.java


diff --git a/test/src/test/dependsongroup/ZeroSampleTest.java b/src/test/java/test/dependsongroup/ZeroSampleTest.java
similarity index 100%
rename from test/src/test/dependsongroup/ZeroSampleTest.java
rename to src/test/java/test/dependsongroup/ZeroSampleTest.java


diff --git a/test/src/test/dependsongroup/suite.xml b/src/test/java/test/dependsongroup/suite.xml
similarity index 100%
rename from test/src/test/dependsongroup/suite.xml
rename to src/test/java/test/dependsongroup/suite.xml


diff --git a/test/src/test/distributed/DistributedTest.java b/src/test/java/test/distributed/DistributedTest.java
similarity index 100%
rename from test/src/test/distributed/DistributedTest.java
rename to src/test/java/test/distributed/DistributedTest.java


diff --git a/test/src/test/distributed/Test1.java b/src/test/java/test/distributed/Test1.java
similarity index 100%
rename from test/src/test/distributed/Test1.java
rename to src/test/java/test/distributed/Test1.java


diff --git a/test/src/test/distributed/Test2.java b/src/test/java/test/distributed/Test2.java
similarity index 100%
rename from test/src/test/distributed/Test2.java
rename to src/test/java/test/distributed/Test2.java


diff --git a/test/src/test/expectedexceptions/ExpectedExceptionsTest.java b/src/test/java/test/expectedexceptions/ExpectedExceptionsTest.java
similarity index 100%
rename from test/src/test/expectedexceptions/ExpectedExceptionsTest.java
rename to src/test/java/test/expectedexceptions/ExpectedExceptionsTest.java


diff --git a/test/src/test/expectedexceptions/ParametersExceptionTest.java b/src/test/java/test/expectedexceptions/ParametersExceptionTest.java
similarity index 100%
rename from test/src/test/expectedexceptions/ParametersExceptionTest.java
rename to src/test/java/test/expectedexceptions/ParametersExceptionTest.java


diff --git a/test/src/test/expectedexceptions/SampleExceptions.java b/src/test/java/test/expectedexceptions/SampleExceptions.java
similarity index 100%
rename from test/src/test/expectedexceptions/SampleExceptions.java
rename to src/test/java/test/expectedexceptions/SampleExceptions.java


diff --git a/test/src/test/expectedexceptions/SampleExceptions2.java b/src/test/java/test/expectedexceptions/SampleExceptions2.java
similarity index 100%
rename from test/src/test/expectedexceptions/SampleExceptions2.java
rename to src/test/java/test/expectedexceptions/SampleExceptions2.java


diff --git a/test/src/test/expectedexceptions/WrappedExpectedException.java b/src/test/java/test/expectedexceptions/WrappedExpectedException.java
similarity index 100%
rename from test/src/test/expectedexceptions/WrappedExpectedException.java
rename to src/test/java/test/expectedexceptions/WrappedExpectedException.java


diff --git a/test/src/test/factory/Factory2Test.java b/src/test/java/test/factory/Factory2Test.java
similarity index 100%
rename from test/src/test/factory/Factory2Test.java
rename to src/test/java/test/factory/Factory2Test.java


diff --git a/test/src/test/factory/FactoryBase.java b/src/test/java/test/factory/FactoryBase.java
similarity index 100%
rename from test/src/test/factory/FactoryBase.java
rename to src/test/java/test/factory/FactoryBase.java


diff --git a/test/src/test/factory/FactoryBaseSampleTest.java b/src/test/java/test/factory/FactoryBaseSampleTest.java
similarity index 100%
rename from test/src/test/factory/FactoryBaseSampleTest.java
rename to src/test/java/test/factory/FactoryBaseSampleTest.java


diff --git a/test/src/test/factory/FactoryChild.java b/src/test/java/test/factory/FactoryChild.java
similarity index 100%
rename from test/src/test/factory/FactoryChild.java
rename to src/test/java/test/factory/FactoryChild.java


diff --git a/test/src/test/factory/FactoryFailureSampleTest.java b/src/test/java/test/factory/FactoryFailureSampleTest.java
similarity index 100%
rename from test/src/test/factory/FactoryFailureSampleTest.java
rename to src/test/java/test/factory/FactoryFailureSampleTest.java


diff --git a/test/src/test/factory/FactoryFailureTest.java b/src/test/java/test/factory/FactoryFailureTest.java
similarity index 100%
rename from test/src/test/factory/FactoryFailureTest.java
rename to src/test/java/test/factory/FactoryFailureTest.java


diff --git a/test/src/test/factory/FactoryInSeparateClass.java b/src/test/java/test/factory/FactoryInSeparateClass.java
similarity index 100%
rename from test/src/test/factory/FactoryInSeparateClass.java
rename to src/test/java/test/factory/FactoryInSeparateClass.java


diff --git a/test/src/test/factory/FactoryInSuperClassTest.java b/src/test/java/test/factory/FactoryInSuperClassTest.java
similarity index 100%
rename from test/src/test/factory/FactoryInSuperClassTest.java
rename to src/test/java/test/factory/FactoryInSuperClassTest.java


diff --git a/test/src/test/factory/FactoryInterleavingSampleA.java b/src/test/java/test/factory/FactoryInterleavingSampleA.java
similarity index 100%
rename from test/src/test/factory/FactoryInterleavingSampleA.java
rename to src/test/java/test/factory/FactoryInterleavingSampleA.java


diff --git a/test/src/test/factory/FactoryInterleavingSampleFactory.java b/src/test/java/test/factory/FactoryInterleavingSampleFactory.java
similarity index 100%
rename from test/src/test/factory/FactoryInterleavingSampleFactory.java
rename to src/test/java/test/factory/FactoryInterleavingSampleFactory.java


diff --git a/test/src/test/factory/FactoryInterleavingTest.java b/src/test/java/test/factory/FactoryInterleavingTest.java
similarity index 100%
rename from test/src/test/factory/FactoryInterleavingTest.java
rename to src/test/java/test/factory/FactoryInterleavingTest.java


diff --git a/test/src/test/factory/FactoryOrderMainTest.java b/src/test/java/test/factory/FactoryOrderMainTest.java
similarity index 100%
rename from test/src/test/factory/FactoryOrderMainTest.java
rename to src/test/java/test/factory/FactoryOrderMainTest.java


diff --git a/test/src/test/factory/FactoryOrderSampleTest.java b/src/test/java/test/factory/FactoryOrderSampleTest.java
similarity index 100%
rename from test/src/test/factory/FactoryOrderSampleTest.java
rename to src/test/java/test/factory/FactoryOrderSampleTest.java


diff --git a/test/src/test/factory/FactoryOrderTest.java b/src/test/java/test/factory/FactoryOrderTest.java
similarity index 100%
rename from test/src/test/factory/FactoryOrderTest.java
rename to src/test/java/test/factory/FactoryOrderTest.java


diff --git a/test/src/test/factory/FactoryTest.java b/src/test/java/test/factory/FactoryTest.java
similarity index 100%
rename from test/src/test/factory/FactoryTest.java
rename to src/test/java/test/factory/FactoryTest.java


diff --git a/test/src/test/factory/FactoryTest2.java b/src/test/java/test/factory/FactoryTest2.java
similarity index 100%
rename from test/src/test/factory/FactoryTest2.java
rename to src/test/java/test/factory/FactoryTest2.java


diff --git a/test/src/test/factory/FactoryWithDataProvider.java b/src/test/java/test/factory/FactoryWithDataProvider.java
similarity index 100%
rename from test/src/test/factory/FactoryWithDataProvider.java
rename to src/test/java/test/factory/FactoryWithDataProvider.java


diff --git a/test/src/test/factory/FactoryWithDataProviderTest.java b/src/test/java/test/factory/FactoryWithDataProviderTest.java
similarity index 100%
rename from test/src/test/factory/FactoryWithDataProviderTest.java
rename to src/test/java/test/factory/FactoryWithDataProviderTest.java


diff --git a/test/src/test/factory/FactoryWithInstanceInfoTest.java b/src/test/java/test/factory/FactoryWithInstanceInfoTest.java
similarity index 100%
rename from test/src/test/factory/FactoryWithInstanceInfoTest.java
rename to src/test/java/test/factory/FactoryWithInstanceInfoTest.java


diff --git a/test/src/test/factory/FactoryWithInstanceInfoTest2.java b/src/test/java/test/factory/FactoryWithInstanceInfoTest2.java
similarity index 100%
rename from test/src/test/factory/FactoryWithInstanceInfoTest2.java
rename to src/test/java/test/factory/FactoryWithInstanceInfoTest2.java


diff --git a/test/src/test/factory/MyTest.java b/src/test/java/test/factory/MyTest.java
similarity index 100%
rename from test/src/test/factory/MyTest.java
rename to src/test/java/test/factory/MyTest.java


diff --git a/test/src/test/factory/NestedFactoryTest.java b/src/test/java/test/factory/NestedFactoryTest.java
similarity index 100%
rename from test/src/test/factory/NestedFactoryTest.java
rename to src/test/java/test/factory/NestedFactoryTest.java


diff --git a/test/src/test/factory/NestedStaticFactoryTest.java b/src/test/java/test/factory/NestedStaticFactoryTest.java
similarity index 100%
rename from test/src/test/factory/NestedStaticFactoryTest.java
rename to src/test/java/test/factory/NestedStaticFactoryTest.java


diff --git a/test/src/test/factory/OddTest.java b/src/test/java/test/factory/OddTest.java
similarity index 100%
rename from test/src/test/factory/OddTest.java
rename to src/test/java/test/factory/OddTest.java


diff --git a/test/src/test/factory/Sample2.java b/src/test/java/test/factory/Sample2.java
similarity index 100%
rename from test/src/test/factory/Sample2.java
rename to src/test/java/test/factory/Sample2.java


diff --git a/test/src/test/factory/TestClassAnnotationTest.java b/src/test/java/test/factory/TestClassAnnotationTest.java
similarity index 100%
rename from test/src/test/factory/TestClassAnnotationTest.java
rename to src/test/java/test/factory/TestClassAnnotationTest.java


diff --git a/test/src/test/factory/VerifyFactoryTest.java b/src/test/java/test/factory/VerifyFactoryTest.java
similarity index 100%
rename from test/src/test/factory/VerifyFactoryTest.java
rename to src/test/java/test/factory/VerifyFactoryTest.java


diff --git a/test/src/test/factory/VerifyFactoryWithInstanceInfoTest.java b/src/test/java/test/factory/VerifyFactoryWithInstanceInfoTest.java
similarity index 100%
rename from test/src/test/factory/VerifyFactoryWithInstanceInfoTest.java
rename to src/test/java/test/factory/VerifyFactoryWithInstanceInfoTest.java


diff --git a/test/src/test/factory/classconf/XClassOrderWithFactory.java b/src/test/java/test/factory/classconf/XClassOrderWithFactory.java
similarity index 100%
rename from test/src/test/factory/classconf/XClassOrderWithFactory.java
rename to src/test/java/test/factory/classconf/XClassOrderWithFactory.java


diff --git a/test/src/test/factory/classconf/XClassOrderWithFactoryTest.java b/src/test/java/test/factory/classconf/XClassOrderWithFactoryTest.java
similarity index 100%
rename from test/src/test/factory/classconf/XClassOrderWithFactoryTest.java
rename to src/test/java/test/factory/classconf/XClassOrderWithFactoryTest.java


diff --git a/test/src/test/failedreporter/FailedReporter2SampleTest.java b/src/test/java/test/failedreporter/FailedReporter2SampleTest.java
similarity index 100%
rename from test/src/test/failedreporter/FailedReporter2SampleTest.java
rename to src/test/java/test/failedreporter/FailedReporter2SampleTest.java


diff --git a/test/src/test/failedreporter/FailedReporterSampleTest.java b/src/test/java/test/failedreporter/FailedReporterSampleTest.java
similarity index 100%
rename from test/src/test/failedreporter/FailedReporterSampleTest.java
rename to src/test/java/test/failedreporter/FailedReporterSampleTest.java


diff --git a/test/src/test/failedreporter/FailedReporterTest.java b/src/test/java/test/failedreporter/FailedReporterTest.java
similarity index 100%
rename from test/src/test/failedreporter/FailedReporterTest.java
rename to src/test/java/test/failedreporter/FailedReporterTest.java


diff --git a/test/src/test/failures/Base0.java b/src/test/java/test/failures/Base0.java
similarity index 100%
rename from test/src/test/failures/Base0.java
rename to src/test/java/test/failures/Base0.java


diff --git a/test/src/test/failures/Base1.java b/src/test/java/test/failures/Base1.java
similarity index 100%
rename from test/src/test/failures/Base1.java
rename to src/test/java/test/failures/Base1.java


diff --git a/test/src/test/failures/BaseFailuresTest.java b/src/test/java/test/failures/BaseFailuresTest.java
similarity index 100%
rename from test/src/test/failures/BaseFailuresTest.java
rename to src/test/java/test/failures/BaseFailuresTest.java


diff --git a/test/src/test/failures/Child.java b/src/test/java/test/failures/Child.java
similarity index 100%
rename from test/src/test/failures/Child.java
rename to src/test/java/test/failures/Child.java


diff --git a/test/src/test/failures/DependentTest.java b/src/test/java/test/failures/DependentTest.java
similarity index 100%
rename from test/src/test/failures/DependentTest.java
rename to src/test/java/test/failures/DependentTest.java


diff --git a/test/src/test/failures/FailuresTest.java b/src/test/java/test/failures/FailuresTest.java
similarity index 100%
rename from test/src/test/failures/FailuresTest.java
rename to src/test/java/test/failures/FailuresTest.java


diff --git a/test/src/test/groupinvocation/DummyTest.java b/src/test/java/test/groupinvocation/DummyTest.java
similarity index 100%
rename from test/src/test/groupinvocation/DummyTest.java
rename to src/test/java/test/groupinvocation/DummyTest.java


diff --git a/test/src/test/groupinvocation/DummyTest2.java b/src/test/java/test/groupinvocation/DummyTest2.java
similarity index 100%
rename from test/src/test/groupinvocation/DummyTest2.java
rename to src/test/java/test/groupinvocation/DummyTest2.java


diff --git a/test/src/test/groupinvocation/FailingBeforeGroupMethod.java b/src/test/java/test/groupinvocation/FailingBeforeGroupMethod.java
similarity index 100%
rename from test/src/test/groupinvocation/FailingBeforeGroupMethod.java
rename to src/test/java/test/groupinvocation/FailingBeforeGroupMethod.java


diff --git a/test/src/test/groupinvocation/GroupConfiguration.java b/src/test/java/test/groupinvocation/GroupConfiguration.java
similarity index 100%
rename from test/src/test/groupinvocation/GroupConfiguration.java
rename to src/test/java/test/groupinvocation/GroupConfiguration.java


diff --git a/test/src/test/groupinvocation/testng.xml b/src/test/java/test/groupinvocation/testng.xml
similarity index 100%
rename from test/src/test/groupinvocation/testng.xml
rename to src/test/java/test/groupinvocation/testng.xml


diff --git a/test/src/test/hook/HookFailureTest.java b/src/test/java/test/hook/HookFailureTest.java
similarity index 100%
rename from test/src/test/hook/HookFailureTest.java
rename to src/test/java/test/hook/HookFailureTest.java


diff --git a/test/src/test/hook/HookSuccessTest.java b/src/test/java/test/hook/HookSuccessTest.java
similarity index 100%
rename from test/src/test/hook/HookSuccessTest.java
rename to src/test/java/test/hook/HookSuccessTest.java


diff --git a/test/src/test/inheritance/BaseClassScope.java b/src/test/java/test/inheritance/BaseClassScope.java
similarity index 100%
rename from test/src/test/inheritance/BaseClassScope.java
rename to src/test/java/test/inheritance/BaseClassScope.java


diff --git a/test/src/test/inheritance/Child_1.java b/src/test/java/test/inheritance/Child_1.java
similarity index 100%
rename from test/src/test/inheritance/Child_1.java
rename to src/test/java/test/inheritance/Child_1.java


diff --git a/test/src/test/inheritance/ClassScopeTest.java b/src/test/java/test/inheritance/ClassScopeTest.java
similarity index 100%
rename from test/src/test/inheritance/ClassScopeTest.java
rename to src/test/java/test/inheritance/ClassScopeTest.java


diff --git a/test/src/test/inheritance/DChild_2.java b/src/test/java/test/inheritance/DChild_2.java
similarity index 100%
rename from test/src/test/inheritance/DChild_2.java
rename to src/test/java/test/inheritance/DChild_2.java


diff --git a/test/src/test/inheritance/VerifyTest.java b/src/test/java/test/inheritance/VerifyTest.java
similarity index 100%
rename from test/src/test/inheritance/VerifyTest.java
rename to src/test/java/test/inheritance/VerifyTest.java


diff --git a/test/src/test/inheritance/ZBase_0.java b/src/test/java/test/inheritance/ZBase_0.java
similarity index 100%
rename from test/src/test/inheritance/ZBase_0.java
rename to src/test/java/test/inheritance/ZBase_0.java


diff --git a/test/src/test/inject/InjectAfterMethodWithTestResultSampleTest.java b/src/test/java/test/inject/InjectAfterMethodWithTestResultSampleTest.java
similarity index 100%
rename from test/src/test/inject/InjectAfterMethodWithTestResultSampleTest.java
rename to src/test/java/test/inject/InjectAfterMethodWithTestResultSampleTest.java


diff --git a/test/src/test/inject/InjectAfterMethodWithTestResultTest.java b/src/test/java/test/inject/InjectAfterMethodWithTestResultTest.java
similarity index 100%
rename from test/src/test/inject/InjectAfterMethodWithTestResultTest.java
rename to src/test/java/test/inject/InjectAfterMethodWithTestResultTest.java


diff --git a/test/src/test/inject/InjectBeforeAndAfterMethodsWithTestResultSampleTest.java b/src/test/java/test/inject/InjectBeforeAndAfterMethodsWithTestResultSampleTest.java
similarity index 100%
rename from test/src/test/inject/InjectBeforeAndAfterMethodsWithTestResultSampleTest.java
rename to src/test/java/test/inject/InjectBeforeAndAfterMethodsWithTestResultSampleTest.java


diff --git a/test/src/test/inject/InjectBeforeMethodTest.java b/src/test/java/test/inject/InjectBeforeMethodTest.java
similarity index 100%
rename from test/src/test/inject/InjectBeforeMethodTest.java
rename to src/test/java/test/inject/InjectBeforeMethodTest.java


diff --git a/test/src/test/inject/InjectDataProviderTest.java b/src/test/java/test/inject/InjectDataProviderTest.java
similarity index 100%
rename from test/src/test/inject/InjectDataProviderTest.java
rename to src/test/java/test/inject/InjectDataProviderTest.java


diff --git a/test/src/test/inject/InjectTestContextTest.java b/src/test/java/test/inject/InjectTestContextTest.java
similarity index 100%
rename from test/src/test/inject/InjectTestContextTest.java
rename to src/test/java/test/inject/InjectTestContextTest.java


diff --git a/test/src/test/inject/InjectTestResultTest.java b/src/test/java/test/inject/InjectTestResultTest.java
similarity index 100%
rename from test/src/test/inject/InjectTestResultTest.java
rename to src/test/java/test/inject/InjectTestResultTest.java


diff --git a/test/src/test/inject/NoInjectionTest.java b/src/test/java/test/inject/NoInjectionTest.java
similarity index 100%
rename from test/src/test/inject/NoInjectionTest.java
rename to src/test/java/test/inject/NoInjectionTest.java


diff --git a/test/src/test/inject/Sample.java b/src/test/java/test/inject/Sample.java
similarity index 100%
rename from test/src/test/inject/Sample.java
rename to src/test/java/test/inject/Sample.java


diff --git a/test/src/test/interleavedorder/BaseTestClass.java b/src/test/java/test/interleavedorder/BaseTestClass.java
similarity index 100%
rename from test/src/test/interleavedorder/BaseTestClass.java
rename to src/test/java/test/interleavedorder/BaseTestClass.java


diff --git a/test/src/test/interleavedorder/InterleavedInvocationTest.java b/src/test/java/test/interleavedorder/InterleavedInvocationTest.java
similarity index 100%
rename from test/src/test/interleavedorder/InterleavedInvocationTest.java
rename to src/test/java/test/interleavedorder/InterleavedInvocationTest.java


diff --git a/test/src/test/interleavedorder/TestChild1.java b/src/test/java/test/interleavedorder/TestChild1.java
similarity index 100%
rename from test/src/test/interleavedorder/TestChild1.java
rename to src/test/java/test/interleavedorder/TestChild1.java


diff --git a/test/src/test/interleavedorder/TestChild2.java b/src/test/java/test/interleavedorder/TestChild2.java
similarity index 100%
rename from test/src/test/interleavedorder/TestChild2.java
rename to src/test/java/test/interleavedorder/TestChild2.java


diff --git a/test/src/test/interleavedorder/testng-order.xml b/src/test/java/test/interleavedorder/testng-order.xml
similarity index 100%
rename from test/src/test/interleavedorder/testng-order.xml
rename to src/test/java/test/interleavedorder/testng-order.xml


diff --git a/test/src/test/invocationcount/Base.java b/src/test/java/test/invocationcount/Base.java
similarity index 100%
rename from test/src/test/invocationcount/Base.java
rename to src/test/java/test/invocationcount/Base.java


diff --git a/test/src/test/invocationcount/DataProviderBase.java b/src/test/java/test/invocationcount/DataProviderBase.java
similarity index 100%
rename from test/src/test/invocationcount/DataProviderBase.java
rename to src/test/java/test/invocationcount/DataProviderBase.java


diff --git a/test/src/test/invocationcount/DataProviderFalseFalseTest.java b/src/test/java/test/invocationcount/DataProviderFalseFalseTest.java
similarity index 100%
rename from test/src/test/invocationcount/DataProviderFalseFalseTest.java
rename to src/test/java/test/invocationcount/DataProviderFalseFalseTest.java


diff --git a/test/src/test/invocationcount/DataProviderFalseTrueTest.java b/src/test/java/test/invocationcount/DataProviderFalseTrueTest.java
similarity index 100%
rename from test/src/test/invocationcount/DataProviderFalseTrueTest.java
rename to src/test/java/test/invocationcount/DataProviderFalseTrueTest.java


diff --git a/test/src/test/invocationcount/DataProviderTrueFalseTest.java b/src/test/java/test/invocationcount/DataProviderTrueFalseTest.java
similarity index 100%
rename from test/src/test/invocationcount/DataProviderTrueFalseTest.java
rename to src/test/java/test/invocationcount/DataProviderTrueFalseTest.java


diff --git a/test/src/test/invocationcount/DataProviderTrueTrueTest.java b/src/test/java/test/invocationcount/DataProviderTrueTrueTest.java
similarity index 100%
rename from test/src/test/invocationcount/DataProviderTrueTrueTest.java
rename to src/test/java/test/invocationcount/DataProviderTrueTrueTest.java


diff --git a/test/src/test/invocationcount/FailedInvocationCount.java b/src/test/java/test/invocationcount/FailedInvocationCount.java
similarity index 100%
rename from test/src/test/invocationcount/FailedInvocationCount.java
rename to src/test/java/test/invocationcount/FailedInvocationCount.java


diff --git a/test/src/test/invocationcount/FailedInvocationCount2.java b/src/test/java/test/invocationcount/FailedInvocationCount2.java
similarity index 100%
rename from test/src/test/invocationcount/FailedInvocationCount2.java
rename to src/test/java/test/invocationcount/FailedInvocationCount2.java


diff --git a/test/src/test/invocationcount/FailedInvocationCountTest.java b/src/test/java/test/invocationcount/FailedInvocationCountTest.java
similarity index 100%
rename from test/src/test/invocationcount/FailedInvocationCountTest.java
rename to src/test/java/test/invocationcount/FailedInvocationCountTest.java


diff --git a/test/src/test/invocationcount/FirstAndLastTimeTest.java b/src/test/java/test/invocationcount/FirstAndLastTimeTest.java
similarity index 100%
rename from test/src/test/invocationcount/FirstAndLastTimeTest.java
rename to src/test/java/test/invocationcount/FirstAndLastTimeTest.java


diff --git a/test/src/test/invocationcount/InvocationBase.java b/src/test/java/test/invocationcount/InvocationBase.java
similarity index 100%
rename from test/src/test/invocationcount/InvocationBase.java
rename to src/test/java/test/invocationcount/InvocationBase.java


diff --git a/test/src/test/invocationcount/InvocationCountFalseFalseTest.java b/src/test/java/test/invocationcount/InvocationCountFalseFalseTest.java
similarity index 100%
rename from test/src/test/invocationcount/InvocationCountFalseFalseTest.java
rename to src/test/java/test/invocationcount/InvocationCountFalseFalseTest.java


diff --git a/test/src/test/invocationcount/InvocationCountFalseTrueTest.java b/src/test/java/test/invocationcount/InvocationCountFalseTrueTest.java
similarity index 100%
rename from test/src/test/invocationcount/InvocationCountFalseTrueTest.java
rename to src/test/java/test/invocationcount/InvocationCountFalseTrueTest.java


diff --git a/test/src/test/invocationcount/InvocationCountTrueFalseTest.java b/src/test/java/test/invocationcount/InvocationCountTrueFalseTest.java
similarity index 100%
rename from test/src/test/invocationcount/InvocationCountTrueFalseTest.java
rename to src/test/java/test/invocationcount/InvocationCountTrueFalseTest.java


diff --git a/test/src/test/invocationcount/InvocationCountTrueTrueTest.java b/src/test/java/test/invocationcount/InvocationCountTrueTrueTest.java
similarity index 100%
rename from test/src/test/invocationcount/InvocationCountTrueTrueTest.java
rename to src/test/java/test/invocationcount/InvocationCountTrueTrueTest.java


diff --git a/test/src/test/invokedmethodlistener/Base.java b/src/test/java/test/invokedmethodlistener/Base.java
similarity index 100%
rename from test/src/test/invokedmethodlistener/Base.java
rename to src/test/java/test/invokedmethodlistener/Base.java


diff --git a/test/src/test/invokedmethodlistener/Failure.java b/src/test/java/test/invokedmethodlistener/Failure.java
similarity index 100%
rename from test/src/test/invokedmethodlistener/Failure.java
rename to src/test/java/test/invokedmethodlistener/Failure.java


diff --git a/test/src/test/invokedmethodlistener/InvokedMethodListener.java b/src/test/java/test/invokedmethodlistener/InvokedMethodListener.java
similarity index 100%
rename from test/src/test/invokedmethodlistener/InvokedMethodListener.java
rename to src/test/java/test/invokedmethodlistener/InvokedMethodListener.java


diff --git a/test/src/test/invokedmethodlistener/InvokedMethodListenerTest.java b/src/test/java/test/invokedmethodlistener/InvokedMethodListenerTest.java
similarity index 100%
rename from test/src/test/invokedmethodlistener/InvokedMethodListenerTest.java
rename to src/test/java/test/invokedmethodlistener/InvokedMethodListenerTest.java


diff --git a/test/src/test/invokedmethodlistener/MyListener.java b/src/test/java/test/invokedmethodlistener/MyListener.java
similarity index 100%
rename from test/src/test/invokedmethodlistener/MyListener.java
rename to src/test/java/test/invokedmethodlistener/MyListener.java


diff --git a/test/src/test/invokedmethodlistener/Sample.java b/src/test/java/test/invokedmethodlistener/Sample.java
similarity index 100%
rename from test/src/test/invokedmethodlistener/Sample.java
rename to src/test/java/test/invokedmethodlistener/Sample.java


diff --git a/test/src/test/invokedmethodlistener/Success.java b/src/test/java/test/invokedmethodlistener/Success.java
similarity index 100%
rename from test/src/test/invokedmethodlistener/Success.java
rename to src/test/java/test/invokedmethodlistener/Success.java


diff --git a/test/src/test/issue78/NonPublicClassTest.java b/src/test/java/test/issue78/NonPublicClassTest.java
similarity index 100%
rename from test/src/test/issue78/NonPublicClassTest.java
rename to src/test/java/test/issue78/NonPublicClassTest.java


diff --git a/test/src/test/jar/A.java b/src/test/java/test/jar/A.java
similarity index 100%
rename from test/src/test/jar/A.java
rename to src/test/java/test/jar/A.java


diff --git a/test/src/test/jar/B.java b/src/test/java/test/jar/B.java
similarity index 100%
rename from test/src/test/jar/B.java
rename to src/test/java/test/jar/B.java


diff --git a/test/src/test/jar/JarTest.java b/src/test/java/test/jar/JarTest.java
similarity index 95%
rename from test/src/test/jar/JarTest.java
rename to src/test/java/test/jar/JarTest.java
index c07a928..3a91531 100644
--- a/test/src/test/jar/JarTest.java
+++ b/src/test/java/test/jar/JarTest.java

@@ -15,7 +15,7 @@
     File currentDir = new File(".");
     String path = currentDir.getAbsolutePath();
     char s = File.separatorChar;
-    path = path + s + "test" + s + "src" + s + "test" + s + "jar" + s;
+    path = path + s + "src" + s + "test" + s + "java" + s + "test" + s + "jar" + s;
 
     return path + jarFile;
   }

diff --git a/test/src/test/jar/build b/src/test/java/test/jar/build
similarity index 100%
rename from test/src/test/jar/build
rename to src/test/java/test/jar/build


diff --git a/test/src/test/jar/test/jar/A.class b/src/test/java/test/jar/test/jar/A.class
similarity index 100%
rename from test/src/test/jar/test/jar/A.class
rename to src/test/java/test/jar/test/jar/A.class
Binary files differ

diff --git a/test/src/test/jar/test/jar/B.class b/src/test/java/test/jar/test/jar/B.class
similarity index 100%
rename from test/src/test/jar/test/jar/B.class
rename to src/test/java/test/jar/test/jar/B.class
Binary files differ

diff --git a/test/src/test/jar/testng-override.xml b/src/test/java/test/jar/testng-override.xml
similarity index 100%
rename from test/src/test/jar/testng-override.xml
rename to src/test/java/test/jar/testng-override.xml


diff --git a/test/src/test/jar/testng.xml b/src/test/java/test/jar/testng.xml
similarity index 100%
rename from test/src/test/jar/testng.xml
rename to src/test/java/test/jar/testng.xml


diff --git a/test/src/test/jar/withouttestngxml.jar b/src/test/java/test/jar/withouttestngxml.jar
similarity index 100%
rename from test/src/test/jar/withouttestngxml.jar
rename to src/test/java/test/jar/withouttestngxml.jar
Binary files differ

diff --git a/test/src/test/jar/withtestngxml.jar b/src/test/java/test/jar/withtestngxml.jar
similarity index 100%
rename from test/src/test/jar/withtestngxml.jar
rename to src/test/java/test/jar/withtestngxml.jar
Binary files differ

diff --git a/test/src/test/jarpackages/JarPackagesTest.java b/src/test/java/test/jarpackages/JarPackagesTest.java
similarity index 100%
rename from test/src/test/jarpackages/JarPackagesTest.java
rename to src/test/java/test/jarpackages/JarPackagesTest.java


diff --git a/test/src/test/jarpackages/testng.xml b/src/test/java/test/jarpackages/testng.xml
similarity index 100%
rename from test/src/test/jarpackages/testng.xml
rename to src/test/java/test/jarpackages/testng.xml


diff --git a/test/src/test/jarpackages/tests/A.java b/src/test/java/test/jarpackages/tests/A.java
similarity index 100%
rename from test/src/test/jarpackages/tests/A.java
rename to src/test/java/test/jarpackages/tests/A.java


diff --git a/test/src/test/jarpackages/tests/B.java b/src/test/java/test/jarpackages/tests/B.java
similarity index 100%
rename from test/src/test/jarpackages/tests/B.java
rename to src/test/java/test/jarpackages/tests/B.java


diff --git a/test/src/test/junit/BaseTest.java b/src/test/java/test/junit/BaseTest.java
similarity index 100%
rename from test/src/test/junit/BaseTest.java
rename to src/test/java/test/junit/BaseTest.java


diff --git a/test/src/test/junit/JUnitConstructorTest.java b/src/test/java/test/junit/JUnitConstructorTest.java
similarity index 100%
rename from test/src/test/junit/JUnitConstructorTest.java
rename to src/test/java/test/junit/JUnitConstructorTest.java


diff --git a/test/src/test/junit/JUnitEmptyTest.java b/src/test/java/test/junit/JUnitEmptyTest.java
similarity index 100%
rename from test/src/test/junit/JUnitEmptyTest.java
rename to src/test/java/test/junit/JUnitEmptyTest.java


diff --git a/test/src/test/junit/MainSuite.java b/src/test/java/test/junit/MainSuite.java
similarity index 100%
rename from test/src/test/junit/MainSuite.java
rename to src/test/java/test/junit/MainSuite.java


diff --git a/test/src/test/junit/SetNameTest.java b/src/test/java/test/junit/SetNameTest.java
similarity index 100%
rename from test/src/test/junit/SetNameTest.java
rename to src/test/java/test/junit/SetNameTest.java


diff --git a/test/src/test/junit/SetUpExceptionSampleTest.java b/src/test/java/test/junit/SetUpExceptionSampleTest.java
similarity index 100%
rename from test/src/test/junit/SetUpExceptionSampleTest.java
rename to src/test/java/test/junit/SetUpExceptionSampleTest.java


diff --git a/test/src/test/junit/SetUpExceptionTest.java b/src/test/java/test/junit/SetUpExceptionTest.java
similarity index 100%
rename from test/src/test/junit/SetUpExceptionTest.java
rename to src/test/java/test/junit/SetUpExceptionTest.java


diff --git a/test/src/test/junit/Suite1.java b/src/test/java/test/junit/Suite1.java
similarity index 100%
rename from test/src/test/junit/Suite1.java
rename to src/test/java/test/junit/Suite1.java


diff --git a/test/src/test/junit/Suite2.java b/src/test/java/test/junit/Suite2.java
similarity index 100%
rename from test/src/test/junit/Suite2.java
rename to src/test/java/test/junit/Suite2.java


diff --git a/test/src/test/junit/Suite3.java b/src/test/java/test/junit/Suite3.java
similarity index 100%
rename from test/src/test/junit/Suite3.java
rename to src/test/java/test/junit/Suite3.java


diff --git a/test/src/test/junit/Suite4.java b/src/test/java/test/junit/Suite4.java
similarity index 100%
rename from test/src/test/junit/Suite4.java
rename to src/test/java/test/junit/Suite4.java


diff --git a/test/src/test/junit/TestAa.java b/src/test/java/test/junit/TestAa.java
similarity index 100%
rename from test/src/test/junit/TestAa.java
rename to src/test/java/test/junit/TestAa.java


diff --git a/test/src/test/junit/TestAb.java b/src/test/java/test/junit/TestAb.java
similarity index 100%
rename from test/src/test/junit/TestAb.java
rename to src/test/java/test/junit/TestAb.java


diff --git a/test/src/test/junit/TestAc.java b/src/test/java/test/junit/TestAc.java
similarity index 100%
rename from test/src/test/junit/TestAc.java
rename to src/test/java/test/junit/TestAc.java


diff --git a/test/src/test/junit/TestAd.java b/src/test/java/test/junit/TestAd.java
similarity index 100%
rename from test/src/test/junit/TestAd.java
rename to src/test/java/test/junit/TestAd.java


diff --git a/test/src/test/junit/TestAe.java b/src/test/java/test/junit/TestAe.java
similarity index 100%
rename from test/src/test/junit/TestAe.java
rename to src/test/java/test/junit/TestAe.java


diff --git a/test/src/test/junit/TestAf.java b/src/test/java/test/junit/TestAf.java
similarity index 100%
rename from test/src/test/junit/TestAf.java
rename to src/test/java/test/junit/TestAf.java


diff --git a/test/src/test/junit/testsetup/ATest.java b/src/test/java/test/junit/testsetup/ATest.java
similarity index 100%
rename from test/src/test/junit/testsetup/ATest.java
rename to src/test/java/test/junit/testsetup/ATest.java


diff --git a/test/src/test/junit/testsetup/Data.java b/src/test/java/test/junit/testsetup/Data.java
similarity index 100%
rename from test/src/test/junit/testsetup/Data.java
rename to src/test/java/test/junit/testsetup/Data.java


diff --git a/test/src/test/junit/testsetup/LayerATestSuite.java b/src/test/java/test/junit/testsetup/LayerATestSuite.java
similarity index 100%
rename from test/src/test/junit/testsetup/LayerATestSuite.java
rename to src/test/java/test/junit/testsetup/LayerATestSuite.java


diff --git a/test/src/test/junit/testsetup/LoggingTestSuite.java b/src/test/java/test/junit/testsetup/LoggingTestSuite.java
similarity index 100%
rename from test/src/test/junit/testsetup/LoggingTestSuite.java
rename to src/test/java/test/junit/testsetup/LoggingTestSuite.java


diff --git a/test/src/test/junit/testsetup/SmokeSuite.java b/src/test/java/test/junit/testsetup/SmokeSuite.java
similarity index 100%
rename from test/src/test/junit/testsetup/SmokeSuite.java
rename to src/test/java/test/junit/testsetup/SmokeSuite.java


diff --git a/test/src/test/junit/testsetup/TestSuiteContainerWrapper.java b/src/test/java/test/junit/testsetup/TestSuiteContainerWrapper.java
similarity index 100%
rename from test/src/test/junit/testsetup/TestSuiteContainerWrapper.java
rename to src/test/java/test/junit/testsetup/TestSuiteContainerWrapper.java


diff --git a/test/src/test/justin/BaseTestCase.java b/src/test/java/test/justin/BaseTestCase.java
similarity index 100%
rename from test/src/test/justin/BaseTestCase.java
rename to src/test/java/test/justin/BaseTestCase.java


diff --git a/test/src/test/justin/MonthTest.java b/src/test/java/test/justin/MonthTest.java
similarity index 100%
rename from test/src/test/justin/MonthTest.java
rename to src/test/java/test/justin/MonthTest.java


diff --git a/test/src/test/listeners/ListenerTest.java b/src/test/java/test/listeners/ListenerTest.java
similarity index 100%
rename from test/src/test/listeners/ListenerTest.java
rename to src/test/java/test/listeners/ListenerTest.java


diff --git a/test/src/test/listeners/OrderedListenerSampleTest.java b/src/test/java/test/listeners/OrderedListenerSampleTest.java
similarity index 100%
rename from test/src/test/listeners/OrderedListenerSampleTest.java
rename to src/test/java/test/listeners/OrderedListenerSampleTest.java


diff --git a/test/src/test/listeners/SimpleListener.java b/src/test/java/test/listeners/SimpleListener.java
similarity index 100%
rename from test/src/test/listeners/SimpleListener.java
rename to src/test/java/test/listeners/SimpleListener.java


diff --git a/test/src/test/mannotation/MAnnotation2SampleTest.java b/src/test/java/test/mannotation/MAnnotation2SampleTest.java
similarity index 100%
rename from test/src/test/mannotation/MAnnotation2SampleTest.java
rename to src/test/java/test/mannotation/MAnnotation2SampleTest.java


diff --git a/test/src/test/mannotation/MAnnotationSampleTest.java b/src/test/java/test/mannotation/MAnnotationSampleTest.java
similarity index 100%
rename from test/src/test/mannotation/MAnnotationSampleTest.java
rename to src/test/java/test/mannotation/MAnnotationSampleTest.java


diff --git a/test/src/test/mannotation/MBase.java b/src/test/java/test/mannotation/MBase.java
similarity index 100%
rename from test/src/test/mannotation/MBase.java
rename to src/test/java/test/mannotation/MBase.java


diff --git a/test/src/test/mannotation/MBaseCapture.java b/src/test/java/test/mannotation/MBaseCapture.java
similarity index 100%
rename from test/src/test/mannotation/MBaseCapture.java
rename to src/test/java/test/mannotation/MBaseCapture.java


diff --git a/test/src/test/mannotation/MChildCaptureTest.java b/src/test/java/test/mannotation/MChildCaptureTest.java
similarity index 100%
rename from test/src/test/mannotation/MChildCaptureTest.java
rename to src/test/java/test/mannotation/MChildCaptureTest.java


diff --git a/test/src/test/mannotation/MTest1.java b/src/test/java/test/mannotation/MTest1.java
similarity index 100%
rename from test/src/test/mannotation/MTest1.java
rename to src/test/java/test/mannotation/MTest1.java


diff --git a/test/src/test/mannotation/MTest2.java b/src/test/java/test/mannotation/MTest2.java
similarity index 100%
rename from test/src/test/mannotation/MTest2.java
rename to src/test/java/test/mannotation/MTest2.java


diff --git a/test/src/test/mannotation/MTest3.java b/src/test/java/test/mannotation/MTest3.java
similarity index 100%
rename from test/src/test/mannotation/MTest3.java
rename to src/test/java/test/mannotation/MTest3.java


diff --git a/test/src/test/methodinterceptors/FastTestsFirstInterceptor.java b/src/test/java/test/methodinterceptors/FastTestsFirstInterceptor.java
similarity index 100%
rename from test/src/test/methodinterceptors/FastTestsFirstInterceptor.java
rename to src/test/java/test/methodinterceptors/FastTestsFirstInterceptor.java


diff --git a/test/src/test/methodinterceptors/FooTest.java b/src/test/java/test/methodinterceptors/FooTest.java
similarity index 100%
rename from test/src/test/methodinterceptors/FooTest.java
rename to src/test/java/test/methodinterceptors/FooTest.java


diff --git a/test/src/test/methodinterceptors/MethodInterceptorTest.java b/src/test/java/test/methodinterceptors/MethodInterceptorTest.java
similarity index 100%
rename from test/src/test/methodinterceptors/MethodInterceptorTest.java
rename to src/test/java/test/methodinterceptors/MethodInterceptorTest.java


diff --git a/test/src/test/methodinterceptors/NullMethodInterceptor.java b/src/test/java/test/methodinterceptors/NullMethodInterceptor.java
similarity index 100%
rename from test/src/test/methodinterceptors/NullMethodInterceptor.java
rename to src/test/java/test/methodinterceptors/NullMethodInterceptor.java


diff --git a/test/src/test/methods/SampleMethod1.java b/src/test/java/test/methods/SampleMethod1.java
similarity index 100%
rename from test/src/test/methods/SampleMethod1.java
rename to src/test/java/test/methods/SampleMethod1.java


diff --git a/test/src/test/methods/VerifyMethod1.java b/src/test/java/test/methods/VerifyMethod1.java
similarity index 100%
rename from test/src/test/methods/VerifyMethod1.java
rename to src/test/java/test/methods/VerifyMethod1.java


diff --git a/test/src/test/methodselectors/AllTestsMethodSelector.java b/src/test/java/test/methodselectors/AllTestsMethodSelector.java
similarity index 100%
rename from test/src/test/methodselectors/AllTestsMethodSelector.java
rename to src/test/java/test/methodselectors/AllTestsMethodSelector.java


diff --git a/test/src/test/methodselectors/BeanShellTest.java b/src/test/java/test/methodselectors/BeanShellTest.java
similarity index 100%
rename from test/src/test/methodselectors/BeanShellTest.java
rename to src/test/java/test/methodselectors/BeanShellTest.java


diff --git a/test/src/test/methodselectors/MethodSelectorTest.java b/src/test/java/test/methodselectors/MethodSelectorTest.java
similarity index 100%
rename from test/src/test/methodselectors/MethodSelectorTest.java
rename to src/test/java/test/methodselectors/MethodSelectorTest.java


diff --git a/test/src/test/methodselectors/NoTest.java b/src/test/java/test/methodselectors/NoTest.java
similarity index 100%
rename from test/src/test/methodselectors/NoTest.java
rename to src/test/java/test/methodselectors/NoTest.java


diff --git a/test/src/test/methodselectors/NoTestSelector.java b/src/test/java/test/methodselectors/NoTestSelector.java
similarity index 100%
rename from test/src/test/methodselectors/NoTestSelector.java
rename to src/test/java/test/methodselectors/NoTestSelector.java


diff --git a/test/src/test/methodselectors/PrioritySampleTest.java b/src/test/java/test/methodselectors/PrioritySampleTest.java
similarity index 100%
rename from test/src/test/methodselectors/PrioritySampleTest.java
rename to src/test/java/test/methodselectors/PrioritySampleTest.java


diff --git a/test/src/test/methodselectors/PriorityTest.java b/src/test/java/test/methodselectors/PriorityTest.java
similarity index 100%
rename from test/src/test/methodselectors/PriorityTest.java
rename to src/test/java/test/methodselectors/PriorityTest.java


diff --git a/test/src/test/methodselectors/SampleTest.java b/src/test/java/test/methodselectors/SampleTest.java
similarity index 100%
rename from test/src/test/methodselectors/SampleTest.java
rename to src/test/java/test/methodselectors/SampleTest.java


diff --git a/test/src/test/methodselectors/Test2MethodSelector.java b/src/test/java/test/methodselectors/Test2MethodSelector.java
similarity index 100%
rename from test/src/test/methodselectors/Test2MethodSelector.java
rename to src/test/java/test/methodselectors/Test2MethodSelector.java


diff --git a/test/src/test/morten/SampleTest.java b/src/test/java/test/morten/SampleTest.java
similarity index 100%
rename from test/src/test/morten/SampleTest.java
rename to src/test/java/test/morten/SampleTest.java


diff --git a/test/src/test/morten/SampleTestFactory.java b/src/test/java/test/morten/SampleTestFactory.java
similarity index 100%
rename from test/src/test/morten/SampleTestFactory.java
rename to src/test/java/test/morten/SampleTestFactory.java


diff --git a/test/src/test/multiple/Test1.java b/src/test/java/test/multiple/Test1.java
similarity index 100%
rename from test/src/test/multiple/Test1.java
rename to src/test/java/test/multiple/Test1.java


diff --git a/test/src/test/multiple/TestMultiple.java b/src/test/java/test/multiple/TestMultiple.java
similarity index 100%
rename from test/src/test/multiple/TestMultiple.java
rename to src/test/java/test/multiple/TestMultiple.java


diff --git a/test/src/test/multiple/ThisFactory.java b/src/test/java/test/multiple/ThisFactory.java
similarity index 100%
rename from test/src/test/multiple/ThisFactory.java
rename to src/test/java/test/multiple/ThisFactory.java


diff --git a/test/src/test/nested/GarfTest.java b/src/test/java/test/nested/GarfTest.java
similarity index 100%
rename from test/src/test/nested/GarfTest.java
rename to src/test/java/test/nested/GarfTest.java


diff --git a/test/src/test/nested/foo/AccountTypeEnum.java b/src/test/java/test/nested/foo/AccountTypeEnum.java
similarity index 100%
rename from test/src/test/nested/foo/AccountTypeEnum.java
rename to src/test/java/test/nested/foo/AccountTypeEnum.java


diff --git a/test/src/test/objectfactory/BadMethodFactoryFactory.java b/src/test/java/test/objectfactory/BadMethodFactoryFactory.java
similarity index 100%
rename from test/src/test/objectfactory/BadMethodFactoryFactory.java
rename to src/test/java/test/objectfactory/BadMethodFactoryFactory.java


diff --git a/test/src/test/objectfactory/CombinedTestAndObjectFactorySample.java b/src/test/java/test/objectfactory/CombinedTestAndObjectFactorySample.java
similarity index 100%
rename from test/src/test/objectfactory/CombinedTestAndObjectFactorySample.java
rename to src/test/java/test/objectfactory/CombinedTestAndObjectFactorySample.java


diff --git a/test/src/test/objectfactory/CombinedTestAndObjectFactoryTest.java b/src/test/java/test/objectfactory/CombinedTestAndObjectFactoryTest.java
similarity index 100%
rename from test/src/test/objectfactory/CombinedTestAndObjectFactoryTest.java
rename to src/test/java/test/objectfactory/CombinedTestAndObjectFactoryTest.java


diff --git a/test/src/test/objectfactory/ContextAwareFactoryFactory.java b/src/test/java/test/objectfactory/ContextAwareFactoryFactory.java
similarity index 100%
rename from test/src/test/objectfactory/ContextAwareFactoryFactory.java
rename to src/test/java/test/objectfactory/ContextAwareFactoryFactory.java


diff --git a/test/src/test/objectfactory/CustomFactoryTest.java b/src/test/java/test/objectfactory/CustomFactoryTest.java
similarity index 100%
rename from test/src/test/objectfactory/CustomFactoryTest.java
rename to src/test/java/test/objectfactory/CustomFactoryTest.java


diff --git a/test/src/test/objectfactory/LoggingObjectFactory.java b/src/test/java/test/objectfactory/LoggingObjectFactory.java
similarity index 100%
rename from test/src/test/objectfactory/LoggingObjectFactory.java
rename to src/test/java/test/objectfactory/LoggingObjectFactory.java


diff --git a/test/src/test/objectfactory/MyFactoryFactory.java b/src/test/java/test/objectfactory/MyFactoryFactory.java
similarity index 100%
rename from test/src/test/objectfactory/MyFactoryFactory.java
rename to src/test/java/test/objectfactory/MyFactoryFactory.java


diff --git a/test/src/test/objectfactory/Simple.java b/src/test/java/test/objectfactory/Simple.java
similarity index 100%
rename from test/src/test/objectfactory/Simple.java
rename to src/test/java/test/objectfactory/Simple.java


diff --git a/test/src/test/parameters/BeforeSampleTest.java b/src/test/java/test/parameters/BeforeSampleTest.java
similarity index 100%
rename from test/src/test/parameters/BeforeSampleTest.java
rename to src/test/java/test/parameters/BeforeSampleTest.java


diff --git a/test/src/test/parameters/InheritFromSuiteChild1.java b/src/test/java/test/parameters/InheritFromSuiteChild1.java
similarity index 100%
rename from test/src/test/parameters/InheritFromSuiteChild1.java
rename to src/test/java/test/parameters/InheritFromSuiteChild1.java


diff --git a/test/src/test/parameters/InheritFromSuiteChild2.java b/src/test/java/test/parameters/InheritFromSuiteChild2.java
similarity index 100%
rename from test/src/test/parameters/InheritFromSuiteChild2.java
rename to src/test/java/test/parameters/InheritFromSuiteChild2.java


diff --git a/test/src/test/parameters/InheritFromSuiteChild3.java b/src/test/java/test/parameters/InheritFromSuiteChild3.java
similarity index 100%
rename from test/src/test/parameters/InheritFromSuiteChild3.java
rename to src/test/java/test/parameters/InheritFromSuiteChild3.java


diff --git a/test/src/test/parameters/OptionalParameterTest.java b/src/test/java/test/parameters/OptionalParameterTest.java
similarity index 100%
rename from test/src/test/parameters/OptionalParameterTest.java
rename to src/test/java/test/parameters/OptionalParameterTest.java


diff --git a/test/src/test/parameters/ParameterSample.java b/src/test/java/test/parameters/ParameterSample.java
similarity index 100%
rename from test/src/test/parameters/ParameterSample.java
rename to src/test/java/test/parameters/ParameterSample.java


diff --git a/test/src/test/parameters/ParameterTest.java b/src/test/java/test/parameters/ParameterTest.java
similarity index 100%
rename from test/src/test/parameters/ParameterTest.java
rename to src/test/java/test/parameters/ParameterTest.java


diff --git a/test/src/test/parameters/SuiteSampleTest.java b/src/test/java/test/parameters/SuiteSampleTest.java
similarity index 100%
rename from test/src/test/parameters/SuiteSampleTest.java
rename to src/test/java/test/parameters/SuiteSampleTest.java


diff --git a/test/src/test/pholser/Captor.java b/src/test/java/test/pholser/Captor.java
similarity index 100%
rename from test/src/test/pholser/Captor.java
rename to src/test/java/test/pholser/Captor.java


diff --git a/test/src/test/pholser/Demo.java b/src/test/java/test/pholser/Demo.java
similarity index 100%
rename from test/src/test/pholser/Demo.java
rename to src/test/java/test/pholser/Demo.java


diff --git a/test/src/test/pholser/Saboteur.java b/src/test/java/test/pholser/Saboteur.java
similarity index 100%
rename from test/src/test/pholser/Saboteur.java
rename to src/test/java/test/pholser/Saboteur.java


diff --git a/test/src/test/pkg/PackageTest.java b/src/test/java/test/pkg/PackageTest.java
similarity index 100%
rename from test/src/test/pkg/PackageTest.java
rename to src/test/java/test/pkg/PackageTest.java


diff --git a/test/src/test/pkg2/Test1.java b/src/test/java/test/pkg2/Test1.java
similarity index 100%
rename from test/src/test/pkg2/Test1.java
rename to src/test/java/test/pkg2/Test1.java


diff --git a/test/src/test/pkg2/Test2.java b/src/test/java/test/pkg2/Test2.java
similarity index 100%
rename from test/src/test/pkg2/Test2.java
rename to src/test/java/test/pkg2/Test2.java


diff --git a/test/src/test/pkg2/Test3.java b/src/test/java/test/pkg2/Test3.java
similarity index 100%
rename from test/src/test/pkg2/Test3.java
rename to src/test/java/test/pkg2/Test3.java


diff --git a/test/src/test/preserveorder/AAA.java b/src/test/java/test/preserveorder/AAA.java
similarity index 100%
rename from test/src/test/preserveorder/AAA.java
rename to src/test/java/test/preserveorder/AAA.java


diff --git a/test/src/test/preserveorder/B.java b/src/test/java/test/preserveorder/B.java
similarity index 100%
rename from test/src/test/preserveorder/B.java
rename to src/test/java/test/preserveorder/B.java


diff --git a/test/src/test/preserveorder/C.java b/src/test/java/test/preserveorder/C.java
similarity index 100%
rename from test/src/test/preserveorder/C.java
rename to src/test/java/test/preserveorder/C.java


diff --git a/test/src/test/preserveorder/PreserveOrderTest.java b/src/test/java/test/preserveorder/PreserveOrderTest.java
similarity index 100%
rename from test/src/test/preserveorder/PreserveOrderTest.java
rename to src/test/java/test/preserveorder/PreserveOrderTest.java


diff --git a/test/src/test/priority/BaseSample.java b/src/test/java/test/priority/BaseSample.java
similarity index 100%
rename from test/src/test/priority/BaseSample.java
rename to src/test/java/test/priority/BaseSample.java


diff --git a/test/src/test/priority/Priority2SampleTest.java b/src/test/java/test/priority/Priority2SampleTest.java
similarity index 100%
rename from test/src/test/priority/Priority2SampleTest.java
rename to src/test/java/test/priority/Priority2SampleTest.java


diff --git a/test/src/test/priority/PriorityTest.java b/src/test/java/test/priority/PriorityTest.java
similarity index 100%
rename from test/src/test/priority/PriorityTest.java
rename to src/test/java/test/priority/PriorityTest.java


diff --git a/test/src/test/priority/WithPrioritySampleTest.java b/src/test/java/test/priority/WithPrioritySampleTest.java
similarity index 100%
rename from test/src/test/priority/WithPrioritySampleTest.java
rename to src/test/java/test/priority/WithPrioritySampleTest.java


diff --git a/test/src/test/priority/WithoutPrioritySampleTest.java b/src/test/java/test/priority/WithoutPrioritySampleTest.java
similarity index 100%
rename from test/src/test/priority/WithoutPrioritySampleTest.java
rename to src/test/java/test/priority/WithoutPrioritySampleTest.java


diff --git a/test/src/test/privatemethod/PrivateMethodTest.java b/src/test/java/test/privatemethod/PrivateMethodTest.java
similarity index 100%
rename from test/src/test/privatemethod/PrivateMethodTest.java
rename to src/test/java/test/privatemethod/PrivateMethodTest.java


diff --git a/test/src/test/regression/BeforeTestFailingTest.java b/src/test/java/test/regression/BeforeTestFailingTest.java
similarity index 100%
rename from test/src/test/regression/BeforeTestFailingTest.java
rename to src/test/java/test/regression/BeforeTestFailingTest.java


diff --git a/test/src/test/regression/MyTestngTest.java b/src/test/java/test/regression/MyTestngTest.java
similarity index 100%
rename from test/src/test/regression/MyTestngTest.java
rename to src/test/java/test/regression/MyTestngTest.java


diff --git a/test/src/test/regression/MyTestngTest2.java b/src/test/java/test/regression/MyTestngTest2.java
similarity index 100%
rename from test/src/test/regression/MyTestngTest2.java
rename to src/test/java/test/regression/MyTestngTest2.java


diff --git a/test/src/test/regression/groupsordering/A.java b/src/test/java/test/regression/groupsordering/A.java
similarity index 100%
rename from test/src/test/regression/groupsordering/A.java
rename to src/test/java/test/regression/groupsordering/A.java


diff --git a/test/src/test/regression/groupsordering/B.java b/src/test/java/test/regression/groupsordering/B.java
similarity index 100%
rename from test/src/test/regression/groupsordering/B.java
rename to src/test/java/test/regression/groupsordering/B.java


diff --git a/test/src/test/regression/groupsordering/Base.java b/src/test/java/test/regression/groupsordering/Base.java
similarity index 100%
rename from test/src/test/regression/groupsordering/Base.java
rename to src/test/java/test/regression/groupsordering/Base.java


diff --git a/test/src/test/regression/groupsordering/testng.xml b/src/test/java/test/regression/groupsordering/testng.xml
similarity index 100%
rename from test/src/test/regression/groupsordering/testng.xml
rename to src/test/java/test/regression/groupsordering/testng.xml


diff --git a/test/src/test/reports/A.java b/src/test/java/test/reports/A.java
similarity index 100%
rename from test/src/test/reports/A.java
rename to src/test/java/test/reports/A.java


diff --git a/test/src/test/reports/B.java b/src/test/java/test/reports/B.java
similarity index 100%
rename from test/src/test/reports/B.java
rename to src/test/java/test/reports/B.java


diff --git a/test/src/test/reports/EmailableReportDriver.java b/src/test/java/test/reports/EmailableReportDriver.java
similarity index 100%
rename from test/src/test/reports/EmailableReportDriver.java
rename to src/test/java/test/reports/EmailableReportDriver.java


diff --git a/test/src/test/reports/ReportTest.java b/src/test/java/test/reports/ReportTest.java
similarity index 100%
rename from test/src/test/reports/ReportTest.java
rename to src/test/java/test/reports/ReportTest.java


diff --git a/test/src/test/reports/ReporterSampleTest.java b/src/test/java/test/reports/ReporterSampleTest.java
similarity index 100%
rename from test/src/test/reports/ReporterSampleTest.java
rename to src/test/java/test/reports/ReporterSampleTest.java


diff --git a/test/src/test/retryAnalyzer/RetryAnalyzerTest.java b/src/test/java/test/retryAnalyzer/RetryAnalyzerTest.java
similarity index 100%
rename from test/src/test/retryAnalyzer/RetryAnalyzerTest.java
rename to src/test/java/test/retryAnalyzer/RetryAnalyzerTest.java


diff --git a/test/src/test/sample/AfterClassCalledAtEnd.java b/src/test/java/test/sample/AfterClassCalledAtEnd.java
similarity index 100%
rename from test/src/test/sample/AfterClassCalledAtEnd.java
rename to src/test/java/test/sample/AfterClassCalledAtEnd.java


diff --git a/test/src/test/sample/AllJUnitTests.java b/src/test/java/test/sample/AllJUnitTests.java
similarity index 100%
rename from test/src/test/sample/AllJUnitTests.java
rename to src/test/java/test/sample/AllJUnitTests.java


diff --git a/test/src/test/sample/BaseAfterClassCalledAtEnd.java b/src/test/java/test/sample/BaseAfterClassCalledAtEnd.java
similarity index 100%
rename from test/src/test/sample/BaseAfterClassCalledAtEnd.java
rename to src/test/java/test/sample/BaseAfterClassCalledAtEnd.java


diff --git a/test/src/test/sample/BaseSample1.java b/src/test/java/test/sample/BaseSample1.java
similarity index 100%
rename from test/src/test/sample/BaseSample1.java
rename to src/test/java/test/sample/BaseSample1.java


diff --git a/test/src/test/sample/BaseSampleInheritance.java b/src/test/java/test/sample/BaseSampleInheritance.java
similarity index 100%
rename from test/src/test/sample/BaseSampleInheritance.java
rename to src/test/java/test/sample/BaseSampleInheritance.java


diff --git a/test/src/test/sample/Basic1.java b/src/test/java/test/sample/Basic1.java
similarity index 100%
rename from test/src/test/sample/Basic1.java
rename to src/test/java/test/sample/Basic1.java


diff --git a/test/src/test/sample/Basic2.java b/src/test/java/test/sample/Basic2.java
similarity index 100%
rename from test/src/test/sample/Basic2.java
rename to src/test/java/test/sample/Basic2.java


diff --git a/test/src/test/sample/ConverterSample3.java b/src/test/java/test/sample/ConverterSample3.java
similarity index 100%
rename from test/src/test/sample/ConverterSample3.java
rename to src/test/java/test/sample/ConverterSample3.java


diff --git a/test/src/test/sample/InvocationCountTest.java b/src/test/java/test/sample/InvocationCountTest.java
similarity index 100%
rename from test/src/test/sample/InvocationCountTest.java
rename to src/test/java/test/sample/InvocationCountTest.java


diff --git a/test/src/test/sample/JUnitSample1.java b/src/test/java/test/sample/JUnitSample1.java
similarity index 100%
rename from test/src/test/sample/JUnitSample1.java
rename to src/test/java/test/sample/JUnitSample1.java


diff --git a/test/src/test/sample/JUnitSample2.java b/src/test/java/test/sample/JUnitSample2.java
similarity index 100%
rename from test/src/test/sample/JUnitSample2.java
rename to src/test/java/test/sample/JUnitSample2.java


diff --git a/test/src/test/sample/JUnitSample3.java b/src/test/java/test/sample/JUnitSample3.java
similarity index 100%
rename from test/src/test/sample/JUnitSample3.java
rename to src/test/java/test/sample/JUnitSample3.java


diff --git a/test/src/test/sample/PartialGroupTest.java b/src/test/java/test/sample/PartialGroupTest.java
similarity index 100%
rename from test/src/test/sample/PartialGroupTest.java
rename to src/test/java/test/sample/PartialGroupTest.java


diff --git a/test/src/test/sample/PartialGroupVerification.java b/src/test/java/test/sample/PartialGroupVerification.java
similarity index 100%
rename from test/src/test/sample/PartialGroupVerification.java
rename to src/test/java/test/sample/PartialGroupVerification.java


diff --git a/test/src/test/sample/README.txt b/src/test/java/test/sample/README.txt
similarity index 100%
rename from test/src/test/sample/README.txt
rename to src/test/java/test/sample/README.txt


diff --git a/test/src/test/sample/Sample1.java b/src/test/java/test/sample/Sample1.java
similarity index 100%
rename from test/src/test/sample/Sample1.java
rename to src/test/java/test/sample/Sample1.java


diff --git a/test/src/test/sample/Sample2.java b/src/test/java/test/sample/Sample2.java
similarity index 100%
rename from test/src/test/sample/Sample2.java
rename to src/test/java/test/sample/Sample2.java


diff --git a/test/src/test/sample/Scope.java b/src/test/java/test/sample/Scope.java
similarity index 100%
rename from test/src/test/sample/Scope.java
rename to src/test/java/test/sample/Scope.java


diff --git a/test/src/test/sample/SetUpWithParameterTest.java b/src/test/java/test/sample/SetUpWithParameterTest.java
similarity index 100%
rename from test/src/test/sample/SetUpWithParameterTest.java
rename to src/test/java/test/sample/SetUpWithParameterTest.java


diff --git a/test/src/test/simple/IncludedExcludedSampleTest.java b/src/test/java/test/simple/IncludedExcludedSampleTest.java
similarity index 100%
rename from test/src/test/simple/IncludedExcludedSampleTest.java
rename to src/test/java/test/simple/IncludedExcludedSampleTest.java


diff --git a/test/src/test/simple/IncludedExcludedTest.java b/src/test/java/test/simple/IncludedExcludedTest.java
similarity index 100%
rename from test/src/test/simple/IncludedExcludedTest.java
rename to src/test/java/test/simple/IncludedExcludedTest.java


diff --git a/test/src/test/simple/SimpleTest.java b/src/test/java/test/simple/SimpleTest.java
similarity index 100%
rename from test/src/test/simple/SimpleTest.java
rename to src/test/java/test/simple/SimpleTest.java


diff --git a/test/src/test/skipex/ConfigurationSkippedExceptionTest.java b/src/test/java/test/skipex/ConfigurationSkippedExceptionTest.java
similarity index 100%
rename from test/src/test/skipex/ConfigurationSkippedExceptionTest.java
rename to src/test/java/test/skipex/ConfigurationSkippedExceptionTest.java


diff --git a/test/src/test/skipex/SkippedExceptionTest.java b/src/test/java/test/skipex/SkippedExceptionTest.java
similarity index 100%
rename from test/src/test/skipex/SkippedExceptionTest.java
rename to src/test/java/test/skipex/SkippedExceptionTest.java


diff --git a/test/src/test/skipex/TestSkippedExceptionTest.java b/src/test/java/test/skipex/TestSkippedExceptionTest.java
similarity index 100%
rename from test/src/test/skipex/TestSkippedExceptionTest.java
rename to src/test/java/test/skipex/TestSkippedExceptionTest.java


diff --git a/test/src/test/superclass/Base1.java b/src/test/java/test/superclass/Base1.java
similarity index 100%
rename from test/src/test/superclass/Base1.java
rename to src/test/java/test/superclass/Base1.java


diff --git a/test/src/test/superclass/Base2.java b/src/test/java/test/superclass/Base2.java
similarity index 100%
rename from test/src/test/superclass/Base2.java
rename to src/test/java/test/superclass/Base2.java


diff --git a/test/src/test/superclass/BaseSampleTest3.java b/src/test/java/test/superclass/BaseSampleTest3.java
similarity index 100%
rename from test/src/test/superclass/BaseSampleTest3.java
rename to src/test/java/test/superclass/BaseSampleTest3.java


diff --git a/test/src/test/superclass/Child1Test.java b/src/test/java/test/superclass/Child1Test.java
similarity index 100%
rename from test/src/test/superclass/Child1Test.java
rename to src/test/java/test/superclass/Child1Test.java


diff --git a/test/src/test/superclass/Child2Test.java b/src/test/java/test/superclass/Child2Test.java
similarity index 100%
rename from test/src/test/superclass/Child2Test.java
rename to src/test/java/test/superclass/Child2Test.java


diff --git a/test/src/test/superclass/ChildSampleTest3.java b/src/test/java/test/superclass/ChildSampleTest3.java
similarity index 100%
rename from test/src/test/superclass/ChildSampleTest3.java
rename to src/test/java/test/superclass/ChildSampleTest3.java


diff --git a/test/src/test/superclass/MainTest.java b/src/test/java/test/superclass/MainTest.java
similarity index 100%
rename from test/src/test/superclass/MainTest.java
rename to src/test/java/test/superclass/MainTest.java


diff --git a/test/src/test/superclass/Test3.java b/src/test/java/test/superclass/Test3.java
similarity index 100%
rename from test/src/test/superclass/Test3.java
rename to src/test/java/test/superclass/Test3.java


diff --git a/test/src/test/testng106/FailingSuiteFixture.java b/src/test/java/test/testng106/FailingSuiteFixture.java
similarity index 100%
rename from test/src/test/testng106/FailingSuiteFixture.java
rename to src/test/java/test/testng106/FailingSuiteFixture.java


diff --git a/test/src/test/testng106/Test1.java b/src/test/java/test/testng106/Test1.java
similarity index 100%
rename from test/src/test/testng106/Test1.java
rename to src/test/java/test/testng106/Test1.java


diff --git a/test/src/test/testng106/Test2.java b/src/test/java/test/testng106/Test2.java
similarity index 100%
rename from test/src/test/testng106/Test2.java
rename to src/test/java/test/testng106/Test2.java


diff --git a/test/src/test/testng106/testng-106.xml b/src/test/java/test/testng106/testng-106.xml
similarity index 100%
rename from test/src/test/testng106/testng-106.xml
rename to src/test/java/test/testng106/testng-106.xml


diff --git a/test/src/test/testng109/SkippedTestWithExpectedException.java b/src/test/java/test/testng109/SkippedTestWithExpectedException.java
similarity index 100%
rename from test/src/test/testng109/SkippedTestWithExpectedException.java
rename to src/test/java/test/testng109/SkippedTestWithExpectedException.java


diff --git a/test/src/test/testng195/AfterMethodSampleTest.java b/src/test/java/test/testng195/AfterMethodSampleTest.java
similarity index 100%
rename from test/src/test/testng195/AfterMethodSampleTest.java
rename to src/test/java/test/testng195/AfterMethodSampleTest.java


diff --git a/test/src/test/testng195/AfterMethodTest.java b/src/test/java/test/testng195/AfterMethodTest.java
similarity index 100%
rename from test/src/test/testng195/AfterMethodTest.java
rename to src/test/java/test/testng195/AfterMethodTest.java


diff --git a/test/src/test/testng249/B.java b/src/test/java/test/testng249/B.java
similarity index 100%
rename from test/src/test/testng249/B.java
rename to src/test/java/test/testng249/B.java


diff --git a/test/src/test/testng249/Base.java b/src/test/java/test/testng249/Base.java
similarity index 100%
rename from test/src/test/testng249/Base.java
rename to src/test/java/test/testng249/Base.java


diff --git a/test/src/test/testng249/VerifyTest.java b/src/test/java/test/testng249/VerifyTest.java
similarity index 100%
rename from test/src/test/testng249/VerifyTest.java
rename to src/test/java/test/testng249/VerifyTest.java


diff --git a/test/src/test/testng285/BugBase.java b/src/test/java/test/testng285/BugBase.java
similarity index 100%
rename from test/src/test/testng285/BugBase.java
rename to src/test/java/test/testng285/BugBase.java


diff --git a/test/src/test/testng285/Derived.java b/src/test/java/test/testng285/Derived.java
similarity index 100%
rename from test/src/test/testng285/Derived.java
rename to src/test/java/test/testng285/Derived.java


diff --git a/test/src/test/testng285/TestNG285Test.java b/src/test/java/test/testng285/TestNG285Test.java
similarity index 100%
rename from test/src/test/testng285/TestNG285Test.java
rename to src/test/java/test/testng285/TestNG285Test.java


diff --git a/test/src/test/testng317/ClassA.java b/src/test/java/test/testng317/ClassA.java
similarity index 100%
rename from test/src/test/testng317/ClassA.java
rename to src/test/java/test/testng317/ClassA.java


diff --git a/test/src/test/testng317/ClassB.java b/src/test/java/test/testng317/ClassB.java
similarity index 100%
rename from test/src/test/testng317/ClassB.java
rename to src/test/java/test/testng317/ClassB.java


diff --git a/test/src/test/testng317/VerifyTest.java b/src/test/java/test/testng317/VerifyTest.java
similarity index 100%
rename from test/src/test/testng317/VerifyTest.java
rename to src/test/java/test/testng317/VerifyTest.java


diff --git a/test/src/test/testng37/NullParameterTest.java b/src/test/java/test/testng37/NullParameterTest.java
similarity index 100%
rename from test/src/test/testng37/NullParameterTest.java
rename to src/test/java/test/testng37/NullParameterTest.java


diff --git a/test/src/test/testng37/testng-37.xml b/src/test/java/test/testng37/testng-37.xml
similarity index 100%
rename from test/src/test/testng37/testng-37.xml
rename to src/test/java/test/testng37/testng-37.xml


diff --git a/test/src/test/testng387/FailedDPTest.java b/src/test/java/test/testng387/FailedDPTest.java
similarity index 100%
rename from test/src/test/testng387/FailedDPTest.java
rename to src/test/java/test/testng387/FailedDPTest.java


diff --git a/test/src/test/testng56/ParallelTest.java b/src/test/java/test/testng56/ParallelTest.java
similarity index 100%
rename from test/src/test/testng56/ParallelTest.java
rename to src/test/java/test/testng56/ParallelTest.java


diff --git a/test/src/test/testng56/testng-56.xml b/src/test/java/test/testng56/testng-56.xml
similarity index 100%
rename from test/src/test/testng56/testng-56.xml
rename to src/test/java/test/testng56/testng-56.xml


diff --git a/test/src/test/testng59/Test1.java b/src/test/java/test/testng59/Test1.java
similarity index 100%
rename from test/src/test/testng59/Test1.java
rename to src/test/java/test/testng59/Test1.java


diff --git a/test/src/test/testng59/Test2.java b/src/test/java/test/testng59/Test2.java
similarity index 100%
rename from test/src/test/testng59/Test2.java
rename to src/test/java/test/testng59/Test2.java


diff --git a/test/src/test/testng59/testng-59.xml b/src/test/java/test/testng59/testng-59.xml
similarity index 100%
rename from test/src/test/testng59/testng-59.xml
rename to src/test/java/test/testng59/testng-59.xml


diff --git a/test/src/test/testng93/SingleTestTest.java b/src/test/java/test/testng93/SingleTestTest.java
similarity index 100%
rename from test/src/test/testng93/SingleTestTest.java
rename to src/test/java/test/testng93/SingleTestTest.java


diff --git a/test/src/test/testng93/testng-93.xml b/src/test/java/test/testng93/testng-93.xml
similarity index 100%
rename from test/src/test/testng93/testng-93.xml
rename to src/test/java/test/testng93/testng-93.xml


diff --git a/test/src/test/thread/B.java b/src/test/java/test/thread/B.java
similarity index 100%
rename from test/src/test/thread/B.java
rename to src/test/java/test/thread/B.java


diff --git a/test/src/test/thread/BaseSequentialSample.java b/src/test/java/test/thread/BaseSequentialSample.java
similarity index 100%
rename from test/src/test/thread/BaseSequentialSample.java
rename to src/test/java/test/thread/BaseSequentialSample.java


diff --git a/test/src/test/thread/BaseThreadTest.java b/src/test/java/test/thread/BaseThreadTest.java
similarity index 100%
rename from test/src/test/thread/BaseThreadTest.java
rename to src/test/java/test/thread/BaseThreadTest.java


diff --git a/test/src/test/thread/DataProviderThreadPoolSizeSampleTest.java b/src/test/java/test/thread/DataProviderThreadPoolSizeSampleTest.java
similarity index 100%
rename from test/src/test/thread/DataProviderThreadPoolSizeSampleTest.java
rename to src/test/java/test/thread/DataProviderThreadPoolSizeSampleTest.java


diff --git a/test/src/test/thread/DataProviderThreadPoolSizeTest.java b/src/test/java/test/thread/DataProviderThreadPoolSizeTest.java
similarity index 100%
rename from test/src/test/thread/DataProviderThreadPoolSizeTest.java
rename to src/test/java/test/thread/DataProviderThreadPoolSizeTest.java


diff --git a/test/src/test/thread/FactorySampleTest.java b/src/test/java/test/thread/FactorySampleTest.java
similarity index 100%
rename from test/src/test/thread/FactorySampleTest.java
rename to src/test/java/test/thread/FactorySampleTest.java


diff --git a/test/src/test/thread/FactoryTest.java b/src/test/java/test/thread/FactoryTest.java
similarity index 100%
rename from test/src/test/thread/FactoryTest.java
rename to src/test/java/test/thread/FactoryTest.java


diff --git a/test/src/test/thread/Helper.java b/src/test/java/test/thread/Helper.java
similarity index 100%
rename from test/src/test/thread/Helper.java
rename to src/test/java/test/thread/Helper.java


diff --git a/test/src/test/thread/MultiThreadedDependentSampleTest.java b/src/test/java/test/thread/MultiThreadedDependentSampleTest.java
similarity index 100%
rename from test/src/test/thread/MultiThreadedDependentSampleTest.java
rename to src/test/java/test/thread/MultiThreadedDependentSampleTest.java


diff --git a/test/src/test/thread/MultiThreadedDependentTest.java b/src/test/java/test/thread/MultiThreadedDependentTest.java
similarity index 100%
rename from test/src/test/thread/MultiThreadedDependentTest.java
rename to src/test/java/test/thread/MultiThreadedDependentTest.java


diff --git a/test/src/test/thread/ParallelTestTest.java b/src/test/java/test/thread/ParallelTestTest.java
similarity index 100%
rename from test/src/test/thread/ParallelTestTest.java
rename to src/test/java/test/thread/ParallelTestTest.java


diff --git a/test/src/test/thread/SequentialSample2Test.java b/src/test/java/test/thread/SequentialSample2Test.java
similarity index 100%
rename from test/src/test/thread/SequentialSample2Test.java
rename to src/test/java/test/thread/SequentialSample2Test.java


diff --git a/test/src/test/thread/SequentialSample3Test.java b/src/test/java/test/thread/SequentialSample3Test.java
similarity index 100%
rename from test/src/test/thread/SequentialSample3Test.java
rename to src/test/java/test/thread/SequentialSample3Test.java


diff --git a/test/src/test/thread/SequentialSampleTest.java b/src/test/java/test/thread/SequentialSampleTest.java
similarity index 100%
rename from test/src/test/thread/SequentialSampleTest.java
rename to src/test/java/test/thread/SequentialSampleTest.java


diff --git a/test/src/test/thread/SequentialTest.java b/src/test/java/test/thread/SequentialTest.java
similarity index 100%
rename from test/src/test/thread/SequentialTest.java
rename to src/test/java/test/thread/SequentialTest.java


diff --git a/test/src/test/thread/SingleThreadedSample2Test.java b/src/test/java/test/thread/SingleThreadedSample2Test.java
similarity index 100%
rename from test/src/test/thread/SingleThreadedSample2Test.java
rename to src/test/java/test/thread/SingleThreadedSample2Test.java


diff --git a/test/src/test/thread/SingleThreadedSample3Test.java b/src/test/java/test/thread/SingleThreadedSample3Test.java
similarity index 100%
rename from test/src/test/thread/SingleThreadedSample3Test.java
rename to src/test/java/test/thread/SingleThreadedSample3Test.java


diff --git a/test/src/test/thread/SingleThreadedSampleTest.java b/src/test/java/test/thread/SingleThreadedSampleTest.java
similarity index 100%
rename from test/src/test/thread/SingleThreadedSampleTest.java
rename to src/test/java/test/thread/SingleThreadedSampleTest.java


diff --git a/test/src/test/thread/SuiteThreadCountTest.java b/src/test/java/test/thread/SuiteThreadCountTest.java
similarity index 100%
rename from test/src/test/thread/SuiteThreadCountTest.java
rename to src/test/java/test/thread/SuiteThreadCountTest.java


diff --git a/test/src/test/thread/Test1Test.java b/src/test/java/test/thread/Test1Test.java
similarity index 100%
rename from test/src/test/thread/Test1Test.java
rename to src/test/java/test/thread/Test1Test.java


diff --git a/test/src/test/thread/Test2Test.java b/src/test/java/test/thread/Test2Test.java
similarity index 100%
rename from test/src/test/thread/Test2Test.java
rename to src/test/java/test/thread/Test2Test.java


diff --git a/test/src/test/thread/TestThreadCountTest.java b/src/test/java/test/thread/TestThreadCountTest.java
similarity index 100%
rename from test/src/test/thread/TestThreadCountTest.java
rename to src/test/java/test/thread/TestThreadCountTest.java


diff --git a/test/src/test/thread/ThreadPoolSizeTest.java b/src/test/java/test/thread/ThreadPoolSizeTest.java
similarity index 100%
rename from test/src/test/thread/ThreadPoolSizeTest.java
rename to src/test/java/test/thread/ThreadPoolSizeTest.java


diff --git a/test/src/test/thread/testng.xml b/src/test/java/test/thread/testng.xml
similarity index 100%
rename from test/src/test/thread/testng.xml
rename to src/test/java/test/thread/testng.xml


diff --git a/test/src/test/timeout/InvocationTimeOutSampleTest.java b/src/test/java/test/timeout/InvocationTimeOutSampleTest.java
similarity index 100%
rename from test/src/test/timeout/InvocationTimeOutSampleTest.java
rename to src/test/java/test/timeout/InvocationTimeOutSampleTest.java


diff --git a/test/src/test/timeout/TestTimeOutSampleTest.java b/src/test/java/test/timeout/TestTimeOutSampleTest.java
similarity index 100%
rename from test/src/test/timeout/TestTimeOutSampleTest.java
rename to src/test/java/test/timeout/TestTimeOutSampleTest.java


diff --git a/test/src/test/timeout/TimeOutFromXmlTest.java b/src/test/java/test/timeout/TimeOutFromXmlTest.java
similarity index 100%
rename from test/src/test/timeout/TimeOutFromXmlTest.java
rename to src/test/java/test/timeout/TimeOutFromXmlTest.java


diff --git a/test/src/test/timeout/TimeOutSample2Test.java b/src/test/java/test/timeout/TimeOutSample2Test.java
similarity index 100%
rename from test/src/test/timeout/TimeOutSample2Test.java
rename to src/test/java/test/timeout/TimeOutSample2Test.java


diff --git a/test/src/test/timeout/TimeOutSampleTest.java b/src/test/java/test/timeout/TimeOutSampleTest.java
similarity index 100%
rename from test/src/test/timeout/TimeOutSampleTest.java
rename to src/test/java/test/timeout/TimeOutSampleTest.java


diff --git a/test/src/test/timeout/TimeOutTest.java b/src/test/java/test/timeout/TimeOutTest.java
similarity index 100%
rename from test/src/test/timeout/TimeOutTest.java
rename to src/test/java/test/timeout/TimeOutTest.java


diff --git a/test/src/test/tmp/A.java b/src/test/java/test/tmp/A.java
similarity index 100%
rename from test/src/test/tmp/A.java
rename to src/test/java/test/tmp/A.java


diff --git a/test/src/test/tmp/AA.java b/src/test/java/test/tmp/AA.java
similarity index 100%
rename from test/src/test/tmp/AA.java
rename to src/test/java/test/tmp/AA.java


diff --git a/test/src/test/tmp/AFactory.java b/src/test/java/test/tmp/AFactory.java
similarity index 100%
rename from test/src/test/tmp/AFactory.java
rename to src/test/java/test/tmp/AFactory.java


diff --git a/test/src/test/tmp/AnnotationTransformer.java b/src/test/java/test/tmp/AnnotationTransformer.java
similarity index 100%
rename from test/src/test/tmp/AnnotationTransformer.java
rename to src/test/java/test/tmp/AnnotationTransformer.java


diff --git a/test/src/test/tmp/AssertEqualsTest.java b/src/test/java/test/tmp/AssertEqualsTest.java
similarity index 100%
rename from test/src/test/tmp/AssertEqualsTest.java
rename to src/test/java/test/tmp/AssertEqualsTest.java


diff --git a/test/src/test/tmp/B.java b/src/test/java/test/tmp/B.java
similarity index 100%
rename from test/src/test/tmp/B.java
rename to src/test/java/test/tmp/B.java


diff --git a/test/src/test/tmp/BListener.java b/src/test/java/test/tmp/BListener.java
similarity index 100%
rename from test/src/test/tmp/BListener.java
rename to src/test/java/test/tmp/BListener.java


diff --git a/test/src/test/tmp/Base.java b/src/test/java/test/tmp/Base.java
similarity index 100%
rename from test/src/test/tmp/Base.java
rename to src/test/java/test/tmp/Base.java


diff --git a/test/src/test/tmp/BeforeGroupTest.java b/src/test/java/test/tmp/BeforeGroupTest.java
similarity index 100%
rename from test/src/test/tmp/BeforeGroupTest.java
rename to src/test/java/test/tmp/BeforeGroupTest.java


diff --git a/test/src/test/tmp/C.java b/src/test/java/test/tmp/C.java
similarity index 100%
rename from test/src/test/tmp/C.java
rename to src/test/java/test/tmp/C.java


diff --git a/test/src/test/tmp/ChildTest.java b/src/test/java/test/tmp/ChildTest.java
similarity index 100%
rename from test/src/test/tmp/ChildTest.java
rename to src/test/java/test/tmp/ChildTest.java


diff --git a/test/src/test/tmp/ConcreteTest.java b/src/test/java/test/tmp/ConcreteTest.java
similarity index 100%
rename from test/src/test/tmp/ConcreteTest.java
rename to src/test/java/test/tmp/ConcreteTest.java


diff --git a/test/src/test/tmp/DataDrivenTest.java b/src/test/java/test/tmp/DataDrivenTest.java
similarity index 100%
rename from test/src/test/tmp/DataDrivenTest.java
rename to src/test/java/test/tmp/DataDrivenTest.java


diff --git a/test/src/test/tmp/ExponentTest.java b/src/test/java/test/tmp/ExponentTest.java
similarity index 100%
rename from test/src/test/tmp/ExponentTest.java
rename to src/test/java/test/tmp/ExponentTest.java


diff --git a/test/src/test/tmp/Fixturable.java b/src/test/java/test/tmp/Fixturable.java
similarity index 100%
rename from test/src/test/tmp/Fixturable.java
rename to src/test/java/test/tmp/Fixturable.java


diff --git a/test/src/test/tmp/IgnoreUntil.java b/src/test/java/test/tmp/IgnoreUntil.java
similarity index 100%
rename from test/src/test/tmp/IgnoreUntil.java
rename to src/test/java/test/tmp/IgnoreUntil.java


diff --git a/test/src/test/tmp/ParamTest.java b/src/test/java/test/tmp/ParamTest.java
similarity index 100%
rename from test/src/test/tmp/ParamTest.java
rename to src/test/java/test/tmp/ParamTest.java


diff --git a/test/src/test/tmp/ParentTest.java b/src/test/java/test/tmp/ParentTest.java
similarity index 100%
rename from test/src/test/tmp/ParentTest.java
rename to src/test/java/test/tmp/ParentTest.java


diff --git a/test/src/test/tmp/RegisterCommandTest.java b/src/test/java/test/tmp/RegisterCommandTest.java
similarity index 100%
rename from test/src/test/tmp/RegisterCommandTest.java
rename to src/test/java/test/tmp/RegisterCommandTest.java


diff --git a/test/src/test/tmp/RetryAnalyzer.java b/src/test/java/test/tmp/RetryAnalyzer.java
similarity index 100%
rename from test/src/test/tmp/RetryAnalyzer.java
rename to src/test/java/test/tmp/RetryAnalyzer.java


diff --git a/test/src/test/tmp/StaticInitializerTest.java b/src/test/java/test/tmp/StaticInitializerTest.java
similarity index 100%
rename from test/src/test/tmp/StaticInitializerTest.java
rename to src/test/java/test/tmp/StaticInitializerTest.java


diff --git a/test/src/test/tmp/Sub.java b/src/test/java/test/tmp/Sub.java
similarity index 100%
rename from test/src/test/tmp/Sub.java
rename to src/test/java/test/tmp/Sub.java


diff --git a/test/src/test/tmp/Test0.java b/src/test/java/test/tmp/Test0.java
similarity index 100%
rename from test/src/test/tmp/Test0.java
rename to src/test/java/test/tmp/Test0.java


diff --git a/test/src/test/tmp/Test1.java b/src/test/java/test/tmp/Test1.java
similarity index 100%
rename from test/src/test/tmp/Test1.java
rename to src/test/java/test/tmp/Test1.java


diff --git a/test/src/test/tmp/TestA.java b/src/test/java/test/tmp/TestA.java
similarity index 100%
rename from test/src/test/tmp/TestA.java
rename to src/test/java/test/tmp/TestA.java


diff --git a/test/src/test/tmp/TestB.java b/src/test/java/test/tmp/TestB.java
similarity index 100%
rename from test/src/test/tmp/TestB.java
rename to src/test/java/test/tmp/TestB.java


diff --git a/test/src/test/tmp/TestCaseFactory.java b/src/test/java/test/tmp/TestCaseFactory.java
similarity index 100%
rename from test/src/test/tmp/TestCaseFactory.java
rename to src/test/java/test/tmp/TestCaseFactory.java


diff --git a/test/src/test/tmp/TestFixture.java b/src/test/java/test/tmp/TestFixture.java
similarity index 100%
rename from test/src/test/tmp/TestFixture.java
rename to src/test/java/test/tmp/TestFixture.java


diff --git a/test/src/test/tmp/TestNGBug.java b/src/test/java/test/tmp/TestNGBug.java
similarity index 100%
rename from test/src/test/tmp/TestNGBug.java
rename to src/test/java/test/tmp/TestNGBug.java


diff --git a/test/src/test/tmp/Test_TestListenerAppender.java b/src/test/java/test/tmp/Test_TestListenerAppender.java
similarity index 100%
rename from test/src/test/tmp/Test_TestListenerAppender.java
rename to src/test/java/test/tmp/Test_TestListenerAppender.java


diff --git a/test/src/test/tmp/TimeBombTest.java b/src/test/java/test/tmp/TimeBombTest.java
similarity index 100%
rename from test/src/test/tmp/TimeBombTest.java
rename to src/test/java/test/tmp/TimeBombTest.java


diff --git a/test/src/test/tmp/Tmp.java b/src/test/java/test/tmp/Tmp.java
similarity index 100%
rename from test/src/test/tmp/Tmp.java
rename to src/test/java/test/tmp/Tmp.java


diff --git a/test/src/test/tmp/Tn.java b/src/test/java/test/tmp/Tn.java
similarity index 100%
rename from test/src/test/tmp/Tn.java
rename to src/test/java/test/tmp/Tn.java


diff --git a/test/src/test/tmp/p1/ContainerTest.java b/src/test/java/test/tmp/p1/ContainerTest.java
similarity index 100%
rename from test/src/test/tmp/p1/ContainerTest.java
rename to src/test/java/test/tmp/p1/ContainerTest.java


diff --git a/test/src/test/tmp/p2/ServiceTest.java b/src/test/java/test/tmp/p2/ServiceTest.java
similarity index 100%
rename from test/src/test/tmp/p2/ServiceTest.java
rename to src/test/java/test/tmp/p2/ServiceTest.java


diff --git a/test/src/test/tmp/verify/Verify.java b/src/test/java/test/tmp/verify/Verify.java
similarity index 100%
rename from test/src/test/tmp/verify/Verify.java
rename to src/test/java/test/tmp/verify/Verify.java


diff --git a/test/src/test/tmp/verify/VerifyInterceptor.java b/src/test/java/test/tmp/verify/VerifyInterceptor.java
similarity index 100%
rename from test/src/test/tmp/verify/VerifyInterceptor.java
rename to src/test/java/test/tmp/verify/VerifyInterceptor.java


diff --git a/test/src/test/tmp/verify/VerifyTest.java b/src/test/java/test/tmp/verify/VerifyTest.java
similarity index 100%
rename from test/src/test/tmp/verify/VerifyTest.java
rename to src/test/java/test/tmp/verify/VerifyTest.java


diff --git a/test/src/test/triangle/Base.java b/src/test/java/test/triangle/Base.java
similarity index 100%
rename from test/src/test/triangle/Base.java
rename to src/test/java/test/triangle/Base.java


diff --git a/test/src/test/triangle/CheckCount.java b/src/test/java/test/triangle/CheckCount.java
similarity index 100%
rename from test/src/test/triangle/CheckCount.java
rename to src/test/java/test/triangle/CheckCount.java


diff --git a/test/src/test/triangle/Child1.java b/src/test/java/test/triangle/Child1.java
similarity index 100%
rename from test/src/test/triangle/Child1.java
rename to src/test/java/test/triangle/Child1.java


diff --git a/test/src/test/triangle/Child2.java b/src/test/java/test/triangle/Child2.java
similarity index 100%
rename from test/src/test/triangle/Child2.java
rename to src/test/java/test/triangle/Child2.java


diff --git a/test/src/test/triangle/CountCalls.java b/src/test/java/test/triangle/CountCalls.java
similarity index 100%
rename from test/src/test/triangle/CountCalls.java
rename to src/test/java/test/triangle/CountCalls.java


diff --git a/test/src/test/uniquesuite/BaseAfter.java b/src/test/java/test/uniquesuite/BaseAfter.java
similarity index 100%
rename from test/src/test/uniquesuite/BaseAfter.java
rename to src/test/java/test/uniquesuite/BaseAfter.java


diff --git a/test/src/test/uniquesuite/BaseBefore.java b/src/test/java/test/uniquesuite/BaseBefore.java
similarity index 100%
rename from test/src/test/uniquesuite/BaseBefore.java
rename to src/test/java/test/uniquesuite/BaseBefore.java


diff --git a/test/src/test/uniquesuite/TestAfter.java b/src/test/java/test/uniquesuite/TestAfter.java
similarity index 100%
rename from test/src/test/uniquesuite/TestAfter.java
rename to src/test/java/test/uniquesuite/TestAfter.java


diff --git a/test/src/test/uniquesuite/TestAfter1.java b/src/test/java/test/uniquesuite/TestAfter1.java
similarity index 100%
rename from test/src/test/uniquesuite/TestAfter1.java
rename to src/test/java/test/uniquesuite/TestAfter1.java


diff --git a/test/src/test/uniquesuite/TestAfter2.java b/src/test/java/test/uniquesuite/TestAfter2.java
similarity index 100%
rename from test/src/test/uniquesuite/TestAfter2.java
rename to src/test/java/test/uniquesuite/TestAfter2.java


diff --git a/test/src/test/uniquesuite/TestBefore1.java b/src/test/java/test/uniquesuite/TestBefore1.java
similarity index 100%
rename from test/src/test/uniquesuite/TestBefore1.java
rename to src/test/java/test/uniquesuite/TestBefore1.java


diff --git a/test/src/test/uniquesuite/TestBefore2.java b/src/test/java/test/uniquesuite/TestBefore2.java
similarity index 100%
rename from test/src/test/uniquesuite/TestBefore2.java
rename to src/test/java/test/uniquesuite/TestBefore2.java


diff --git a/test/src/test/v6/A.java b/src/test/java/test/v6/A.java
similarity index 100%
rename from test/src/test/v6/A.java
rename to src/test/java/test/v6/A.java


diff --git a/test/src/test/v6/B.java b/src/test/java/test/v6/B.java
similarity index 100%
rename from test/src/test/v6/B.java
rename to src/test/java/test/v6/B.java


diff --git a/test/src/test/v6/C.java b/src/test/java/test/v6/C.java
similarity index 100%
rename from test/src/test/v6/C.java
rename to src/test/java/test/v6/C.java


diff --git a/test/src/test/verify/Verifier.java b/src/test/java/test/verify/Verifier.java
similarity index 100%
rename from test/src/test/verify/Verifier.java
rename to src/test/java/test/verify/Verifier.java


diff --git a/test/src/test/verify/Verify.java b/src/test/java/test/verify/Verify.java
similarity index 100%
rename from test/src/test/verify/Verify.java
rename to src/test/java/test/verify/Verify.java


diff --git a/test/src/test/verify/Verify2SampleTest.java b/src/test/java/test/verify/Verify2SampleTest.java
similarity index 100%
rename from test/src/test/verify/Verify2SampleTest.java
rename to src/test/java/test/verify/Verify2SampleTest.java


diff --git a/test/src/test/verify/Verify3Base.java b/src/test/java/test/verify/Verify3Base.java
similarity index 100%
rename from test/src/test/verify/Verify3Base.java
rename to src/test/java/test/verify/Verify3Base.java


diff --git a/test/src/test/verify/Verify3SampleTest.java b/src/test/java/test/verify/Verify3SampleTest.java
similarity index 100%
rename from test/src/test/verify/Verify3SampleTest.java
rename to src/test/java/test/verify/Verify3SampleTest.java


diff --git a/test/src/test/verify/VerifyMethodInterceptor.java b/src/test/java/test/verify/VerifyMethodInterceptor.java
similarity index 100%
rename from test/src/test/verify/VerifyMethodInterceptor.java
rename to src/test/java/test/verify/VerifyMethodInterceptor.java


diff --git a/test/src/test/verify/VerifyNoListenersSampleTest.java b/src/test/java/test/verify/VerifyNoListenersSampleTest.java
similarity index 100%
rename from test/src/test/verify/VerifyNoListenersSampleTest.java
rename to src/test/java/test/verify/VerifyNoListenersSampleTest.java


diff --git a/test/src/test/verify/VerifySampleTest.java b/src/test/java/test/verify/VerifySampleTest.java
similarity index 100%
rename from test/src/test/verify/VerifySampleTest.java
rename to src/test/java/test/verify/VerifySampleTest.java


diff --git a/test/src/test/verify/VerifyTest.java b/src/test/java/test/verify/VerifyTest.java
similarity index 100%
rename from test/src/test/verify/VerifyTest.java
rename to src/test/java/test/verify/VerifyTest.java


diff --git a/test/src/test/verify/VerifyTestListener.java b/src/test/java/test/verify/VerifyTestListener.java
similarity index 100%
rename from test/src/test/verify/VerifyTestListener.java
rename to src/test/java/test/verify/VerifyTestListener.java


diff --git a/test/src/test/xml/XmlVerifyTest.java b/src/test/java/test/xml/XmlVerifyTest.java
similarity index 96%
rename from test/src/test/xml/XmlVerifyTest.java
rename to src/test/java/test/xml/XmlVerifyTest.java
index ffc2935..aa59762 100644
--- a/test/src/test/xml/XmlVerifyTest.java
+++ b/src/test/java/test/xml/XmlVerifyTest.java

@@ -24,7 +24,7 @@
     File currentDir = new File(".");
     String path = currentDir.getAbsolutePath();
     char s = File.separatorChar;
-    path = path + s + "test" + s + "src" + s + "test" + s + "xml" + s;
+    path = path + s + "src" + s + "test" + s + "java" + s + "test" + s + "xml" + s;
     return path + file;
   }
 

diff --git a/test/src/test/xml/invalid-testng.xml b/src/test/java/test/xml/invalid-testng.xml
similarity index 100%
rename from test/src/test/xml/invalid-testng.xml
rename to src/test/java/test/xml/invalid-testng.xml


diff --git a/test/src/test/xml/suite1-1.xml b/src/test/java/test/xml/suite1-1.xml
similarity index 100%
rename from test/src/test/xml/suite1-1.xml
rename to src/test/java/test/xml/suite1-1.xml


diff --git a/test/src/test/xml/suite1-2.xml b/src/test/java/test/xml/suite1-2.xml
similarity index 100%
rename from test/src/test/xml/suite1-2.xml
rename to src/test/java/test/xml/suite1-2.xml


diff --git a/test/src/test/xml/suite1.xml b/src/test/java/test/xml/suite1.xml
similarity index 100%
rename from test/src/test/xml/suite1.xml
rename to src/test/java/test/xml/suite1.xml


diff --git a/test/src/testhelper/OutputDirectoryPatch.java b/src/test/java/testhelper/OutputDirectoryPatch.java
similarity index 100%
rename from test/src/testhelper/OutputDirectoryPatch.java
rename to src/test/java/testhelper/OutputDirectoryPatch.java


diff --git a/test/src/testng-annconv.xml b/src/test/java/testng-annconv.xml
similarity index 100%
rename from test/src/testng-annconv.xml
rename to src/test/java/testng-annconv.xml


diff --git a/test/src/testng-ant.xml b/src/test/java/testng-ant.xml
similarity index 100%
rename from test/src/testng-ant.xml
rename to src/test/java/testng-ant.xml


diff --git a/test/src/testng-single.xml b/src/test/java/testng-single.xml
similarity index 100%
rename from test/src/testng-single.xml
rename to src/test/java/testng-single.xml


diff --git a/test/src/testng-single2.xml b/src/test/java/testng-single2.xml
similarity index 100%
rename from test/src/testng-single2.xml
rename to src/test/java/testng-single2.xml


diff --git a/test/src/testng.xml b/src/test/java/testng.xml
similarity index 100%
rename from test/src/testng.xml
rename to src/test/java/testng.xml
commit	dc0051b2828ddc734f076f959a1d9d54c322654d	[log] [tgz]
author	Cedric Beust <cedric@beust.com>	Sat Jul 10 07:59:56 2010 -0700
committer	Cedric Beust <cedric@beust.com>	Sat Jul 10 07:59:56 2010 -0700
tree	aaaf9603c7d86780dc752deaa2422ef86ad420a8
parent	63fa709ad32ccee48aa75fa3dee897c36846f22b [diff]