diff --git a/build.gradle b/build.gradle
index 746bff7..72a4712 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,7 @@ allprojects {
 
 subprojects {
     apply plugin: 'java'
+    apply plugin: 'eclipse'
 	
 	sourceCompatibility = 1.6
 	targetCompatibility = 1.6
diff --git a/org.springsource.loaded.testdata.groovy/.classpath b/org.springsource.loaded.testdata.groovy/.classpath
deleted file mode 100644
index b15c0d4..0000000
--- a/org.springsource.loaded.testdata.groovy/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
-	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.springsource.loaded.testdata.plugin/.classpath b/org.springsource.loaded.testdata.plugin/.classpath
deleted file mode 100644
index d38fca2..0000000
--- a/org.springsource.loaded.testdata.plugin/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry exported="true" kind="src" path="/org.springsource.loaded"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.springsource.loaded.testdata.superloader/.classpath b/org.springsource.loaded.testdata.superloader/.classpath
deleted file mode 100644
index 806897a..0000000
--- a/org.springsource.loaded.testdata.superloader/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.springsource.loaded.testdata/.settings/org.eclipse.jdt.core.prefs b/org.springsource.loaded.testdata/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b64f5f4..0000000
--- a/org.springsource.loaded.testdata/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Feb 08 11:33:02 PST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.springsource.loaded/.classpath b/org.springsource.loaded/.classpath
deleted file mode 100644
index bcdba5f..0000000
--- a/org.springsource.loaded/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
-	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
-	<classpathentry kind="con" path="GROOVY_SUPPORT"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/settings.gradle b/settings.gradle
index 8e81d17..012ce5a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,7 @@
-include "org.springsource.loaded"
-include "org.springsource.loaded.testdata"
-include "org.springsource.loaded.testdata.groovy"
-include "org.springsource.loaded.testdata.plugin"
-include "org.springsource.loaded.testdata.subloader"
-include "org.springsource.loaded.testdata.superloader"
+include "springloaded-core"
+include "testdata"
+include "testdata-groovy"
+include "testdata-plugin"
+include "testdata-subloader"
+include "testdata-superloader"
 
-findProject(":org.springsource.loaded").name="springloaded-core"
diff --git a/springloaded-core/.classpath b/springloaded-core/.classpath
new file mode 100644
index 0000000..3c19b99
--- /dev/null
+++ b/springloaded-core/.classpath
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer" exported="true"/>
+	<classpathentry kind="con" path="GROOVY_DSL_SUPPORT" exported="true"/>
+	<classpathentry kind="con" path="GROOVY_SUPPORT"/>
+	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/asm/asm/3.2/jar/9bc1511dec6adf302991ced13303e4140fdf9ab7/asm-3.2.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/asm/asm-tree/3.2/jar/cd792e29c79d170c5d0bdd05adf5807cf6875c90/asm-tree-3.2.jar" exported="true"/>
+	<classpathentry sourcepath="/Users/aclement/.gradle/caches/artifacts-26/filestore/junit/junit/4.11/source/28e0ad201304e4a4abf999ca0570b7cffc352c3c/junit-4.11-sources.jar" kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/junit/junit/4.11/jar/4e031bb61df09069aeb2bffb4019e7a5034a4ee0/junit-4.11.jar" exported="true"/>
+	<classpathentry sourcepath="/Users/aclement/.gradle/caches/artifacts-26/filestore/org.hamcrest/hamcrest-core/1.3/source/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar" kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/org.hamcrest/hamcrest-core/1.3/jar/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar" exported="true"/>
+</classpath>
diff --git a/org.springsource.loaded/.project b/springloaded-core/.project
similarity index 92%
rename from org.springsource.loaded/.project
rename to springloaded-core/.project
index 20c28e2..1b7340a 100644
--- a/org.springsource.loaded/.project
+++ b/springloaded-core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.springsource.loaded</name>
+	<name>springloaded-core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.springsource.loaded/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/springloaded-core/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
similarity index 100%
rename from org.springsource.loaded/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
rename to springloaded-core/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
diff --git a/org.springsource.loaded/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs b/springloaded-core/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs
similarity index 100%
rename from org.springsource.loaded/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs
rename to springloaded-core/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs
diff --git a/org.springsource.loaded/.settings/org.eclipse.jdt.core.prefs b/springloaded-core/.settings/org.eclipse.jdt.core.prefs
similarity index 95%
rename from org.springsource.loaded/.settings/org.eclipse.jdt.core.prefs
rename to springloaded-core/.settings/org.eclipse.jdt.core.prefs
index a1e1936..539ab73 100644
--- a/org.springsource.loaded/.settings/org.eclipse.jdt.core.prefs
+++ b/springloaded-core/.settings/org.eclipse.jdt.core.prefs
@@ -1,77 +1,78 @@
-#Tue Sep 07 13:08:01 PDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+#
+#Tue Jan 14 11:38:13 PST 2014
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
diff --git a/org.springsource.loaded.testdata.groovy/.settings/org.eclipse.jdt.groovy.core.prefs b/springloaded-core/.settings/org.eclipse.jdt.groovy.core.prefs
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/.settings/org.eclipse.jdt.groovy.core.prefs
rename to springloaded-core/.settings/org.eclipse.jdt.groovy.core.prefs
diff --git a/org.springsource.loaded/LICENSES/LICENSE b/springloaded-core/LICENSES/LICENSE
similarity index 100%
rename from org.springsource.loaded/LICENSES/LICENSE
rename to springloaded-core/LICENSES/LICENSE
diff --git a/org.springsource.loaded/LICENSES/notice.txt b/springloaded-core/LICENSES/notice.txt
similarity index 100%
rename from org.springsource.loaded/LICENSES/notice.txt
rename to springloaded-core/LICENSES/notice.txt
diff --git a/org.springsource.loaded/build.gradle b/springloaded-core/build.gradle
similarity index 84%
rename from org.springsource.loaded/build.gradle
rename to springloaded-core/build.gradle
index 899040c..701a87d 100644
--- a/org.springsource.loaded/build.gradle
+++ b/springloaded-core/build.gradle
@@ -24,12 +24,12 @@ dependencies {
 	
 	testCompile 'junit:junit:4.11'
 	
-	testCompileOnly files("../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar")
-	testCompileOnly project(':org.springsource.loaded.testdata')
-	testCompileOnly project(':org.springsource.loaded.testdata.groovy')
-	testCompileOnly project(':org.springsource.loaded.testdata.plugin')
-	testCompileOnly project(':org.springsource.loaded.testdata.subloader')
-	testCompileOnly project(':org.springsource.loaded.testdata.superloader')
+	testCompileOnly files("../testdata-groovy/groovy-1.8.2.jar")
+	testCompileOnly project(':testdata')
+	testCompileOnly project(':testdata-groovy')
+	testCompileOnly project(':testdata-plugin')
+	testCompileOnly project(':testdata-subloader')
+	testCompileOnly project(':testdata-superloader')
 }
 
 sourceSets {  
diff --git a/org.springsource.loaded/gradle/wrapper/gradle-wrapper.jar b/springloaded-core/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from org.springsource.loaded/gradle/wrapper/gradle-wrapper.jar
rename to springloaded-core/gradle/wrapper/gradle-wrapper.jar
diff --git a/org.springsource.loaded/gradle/wrapper/gradle-wrapper.properties b/springloaded-core/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from org.springsource.loaded/gradle/wrapper/gradle-wrapper.properties
rename to springloaded-core/gradle/wrapper/gradle-wrapper.properties
diff --git a/org.springsource.loaded/gradlew b/springloaded-core/gradlew
similarity index 100%
rename from org.springsource.loaded/gradlew
rename to springloaded-core/gradlew
diff --git a/org.springsource.loaded/gradlew.bat b/springloaded-core/gradlew.bat
similarity index 100%
rename from org.springsource.loaded/gradlew.bat
rename to springloaded-core/gradlew.bat
diff --git a/org.springsource.loaded/logging.properties b/springloaded-core/logging.properties
similarity index 100%
rename from org.springsource.loaded/logging.properties
rename to springloaded-core/logging.properties
diff --git a/org.springsource.loaded/src/main/java/META-INF/MANIFEST.MF b/springloaded-core/src/main/java/META-INF/MANIFEST.MF
similarity index 100%
rename from org.springsource.loaded/src/main/java/META-INF/MANIFEST.MF
rename to springloaded-core/src/main/java/META-INF/MANIFEST.MF
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/AbstractMember.java b/springloaded-core/src/main/java/org/springsource/loaded/AbstractMember.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/AbstractMember.java
rename to springloaded-core/src/main/java/org/springsource/loaded/AbstractMember.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/AnyTypePattern.java b/springloaded-core/src/main/java/org/springsource/loaded/AnyTypePattern.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/AnyTypePattern.java
rename to springloaded-core/src/main/java/org/springsource/loaded/AnyTypePattern.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/Asserts.java b/springloaded-core/src/main/java/org/springsource/loaded/Asserts.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/Asserts.java
rename to springloaded-core/src/main/java/org/springsource/loaded/Asserts.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/C.java b/springloaded-core/src/main/java/org/springsource/loaded/C.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/C.java
rename to springloaded-core/src/main/java/org/springsource/loaded/C.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ChildClassLoader.java b/springloaded-core/src/main/java/org/springsource/loaded/ChildClassLoader.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ChildClassLoader.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ChildClassLoader.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ClassRenamer.java b/springloaded-core/src/main/java/org/springsource/loaded/ClassRenamer.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ClassRenamer.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ClassRenamer.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ConstantPoolChecker.java b/springloaded-core/src/main/java/org/springsource/loaded/ConstantPoolChecker.java
similarity index 99%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ConstantPoolChecker.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ConstantPoolChecker.java
index b982542..332ec0a 100644
--- a/org.springsource.loaded/src/main/java/org/springsource/loaded/ConstantPoolChecker.java
+++ b/springloaded-core/src/main/java/org/springsource/loaded/ConstantPoolChecker.java
@@ -50,7 +50,7 @@ public class ConstantPoolChecker {
 	// Test entry point just goes through all the code in the bin folder
 	public static void main(String[] args) throws Exception {
 		//		File[] fs = new File("./bin").listFiles();
-		//		File[] fs = new File("../org.springsource.loaded.testdata.groovy/bin").listFiles();
+		//		File[] fs = new File("../testdata-groovy/bin").listFiles();
 		//		checkThemAll(fs);
 		//		System.out.println("total=" + total / 1000000d);
 	}
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ConstantPoolChecker2.java b/springloaded-core/src/main/java/org/springsource/loaded/ConstantPoolChecker2.java
similarity index 99%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ConstantPoolChecker2.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ConstantPoolChecker2.java
index aa03327..b0dfe26 100644
--- a/org.springsource.loaded/src/main/java/org/springsource/loaded/ConstantPoolChecker2.java
+++ b/springloaded-core/src/main/java/org/springsource/loaded/ConstantPoolChecker2.java
@@ -54,7 +54,7 @@ public class ConstantPoolChecker2 {
 	// Test entry point just goes through all the code in the bin folder
 	public static void main(String[] args) throws Exception {
 		File[] fs = new File("./bin").listFiles();
-		//		File[] fs = new File("../org.springsource.loaded.testdata.groovy/bin").listFiles();
+		//		File[] fs = new File("../testdata-groovy/bin").listFiles();
 		//		File[] fs = new File("/Users/aclement/grailsreload/foo/target/classes").listFiles();
 
 		checkThemAll(fs);
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/Constants.java b/springloaded-core/src/main/java/org/springsource/loaded/Constants.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/Constants.java
rename to springloaded-core/src/main/java/org/springsource/loaded/Constants.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ConstructorCopier.java b/springloaded-core/src/main/java/org/springsource/loaded/ConstructorCopier.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ConstructorCopier.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ConstructorCopier.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/CurrentLiveVersion.java b/springloaded-core/src/main/java/org/springsource/loaded/CurrentLiveVersion.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/CurrentLiveVersion.java
rename to springloaded-core/src/main/java/org/springsource/loaded/CurrentLiveVersion.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/DispatcherBuilder.java b/springloaded-core/src/main/java/org/springsource/loaded/DispatcherBuilder.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/DispatcherBuilder.java
rename to springloaded-core/src/main/java/org/springsource/loaded/DispatcherBuilder.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/EmptyClassVisitor.java b/springloaded-core/src/main/java/org/springsource/loaded/EmptyClassVisitor.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/EmptyClassVisitor.java
rename to springloaded-core/src/main/java/org/springsource/loaded/EmptyClassVisitor.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ExactTypePattern.java b/springloaded-core/src/main/java/org/springsource/loaded/ExactTypePattern.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ExactTypePattern.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ExactTypePattern.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ExecutorBuilder.java b/springloaded-core/src/main/java/org/springsource/loaded/ExecutorBuilder.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ExecutorBuilder.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ExecutorBuilder.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/FieldDelta.java b/springloaded-core/src/main/java/org/springsource/loaded/FieldDelta.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/FieldDelta.java
rename to springloaded-core/src/main/java/org/springsource/loaded/FieldDelta.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/FieldMember.java b/springloaded-core/src/main/java/org/springsource/loaded/FieldMember.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/FieldMember.java
rename to springloaded-core/src/main/java/org/springsource/loaded/FieldMember.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/FieldReaderWriter.java b/springloaded-core/src/main/java/org/springsource/loaded/FieldReaderWriter.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/FieldReaderWriter.java
rename to springloaded-core/src/main/java/org/springsource/loaded/FieldReaderWriter.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/FileChangeListener.java b/springloaded-core/src/main/java/org/springsource/loaded/FileChangeListener.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/FileChangeListener.java
rename to springloaded-core/src/main/java/org/springsource/loaded/FileChangeListener.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/GlobalConfiguration.java b/springloaded-core/src/main/java/org/springsource/loaded/GlobalConfiguration.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/GlobalConfiguration.java
rename to springloaded-core/src/main/java/org/springsource/loaded/GlobalConfiguration.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ISMgr.java b/springloaded-core/src/main/java/org/springsource/loaded/ISMgr.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ISMgr.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ISMgr.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/IncrementalTypeDescriptor.java b/springloaded-core/src/main/java/org/springsource/loaded/IncrementalTypeDescriptor.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/IncrementalTypeDescriptor.java
rename to springloaded-core/src/main/java/org/springsource/loaded/IncrementalTypeDescriptor.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/InterfaceExtractor.java b/springloaded-core/src/main/java/org/springsource/loaded/InterfaceExtractor.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/InterfaceExtractor.java
rename to springloaded-core/src/main/java/org/springsource/loaded/InterfaceExtractor.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/IsReloadableTypePlugin.java b/springloaded-core/src/main/java/org/springsource/loaded/IsReloadableTypePlugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/IsReloadableTypePlugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/IsReloadableTypePlugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/LoadtimeInstrumentationPlugin.java b/springloaded-core/src/main/java/org/springsource/loaded/LoadtimeInstrumentationPlugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/LoadtimeInstrumentationPlugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/LoadtimeInstrumentationPlugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/MethodCopier.java b/springloaded-core/src/main/java/org/springsource/loaded/MethodCopier.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/MethodCopier.java
rename to springloaded-core/src/main/java/org/springsource/loaded/MethodCopier.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/MethodDelta.java b/springloaded-core/src/main/java/org/springsource/loaded/MethodDelta.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/MethodDelta.java
rename to springloaded-core/src/main/java/org/springsource/loaded/MethodDelta.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/MethodInvokerRewriter.java b/springloaded-core/src/main/java/org/springsource/loaded/MethodInvokerRewriter.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/MethodInvokerRewriter.java
rename to springloaded-core/src/main/java/org/springsource/loaded/MethodInvokerRewriter.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/MethodMember.java b/springloaded-core/src/main/java/org/springsource/loaded/MethodMember.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/MethodMember.java
rename to springloaded-core/src/main/java/org/springsource/loaded/MethodMember.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/NameRegistry.java b/springloaded-core/src/main/java/org/springsource/loaded/NameRegistry.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/NameRegistry.java
rename to springloaded-core/src/main/java/org/springsource/loaded/NameRegistry.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/Plugin.java b/springloaded-core/src/main/java/org/springsource/loaded/Plugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/Plugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/Plugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/Plugins.java b/springloaded-core/src/main/java/org/springsource/loaded/Plugins.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/Plugins.java
rename to springloaded-core/src/main/java/org/springsource/loaded/Plugins.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/PrefixTypePattern.java b/springloaded-core/src/main/java/org/springsource/loaded/PrefixTypePattern.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/PrefixTypePattern.java
rename to springloaded-core/src/main/java/org/springsource/loaded/PrefixTypePattern.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/QuickVisitor.java b/springloaded-core/src/main/java/org/springsource/loaded/QuickVisitor.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/QuickVisitor.java
rename to springloaded-core/src/main/java/org/springsource/loaded/QuickVisitor.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/RTH.java b/springloaded-core/src/main/java/org/springsource/loaded/RTH.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/RTH.java
rename to springloaded-core/src/main/java/org/springsource/loaded/RTH.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ReflectionFieldReaderWriter.java b/springloaded-core/src/main/java/org/springsource/loaded/ReflectionFieldReaderWriter.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ReflectionFieldReaderWriter.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ReflectionFieldReaderWriter.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ReloadEventProcessorPlugin.java b/springloaded-core/src/main/java/org/springsource/loaded/ReloadEventProcessorPlugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ReloadEventProcessorPlugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ReloadEventProcessorPlugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ReloadException.java b/springloaded-core/src/main/java/org/springsource/loaded/ReloadException.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ReloadException.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ReloadException.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ReloadableType.java b/springloaded-core/src/main/java/org/springsource/loaded/ReloadableType.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ReloadableType.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ReloadableType.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/SSMgr.java b/springloaded-core/src/main/java/org/springsource/loaded/SSMgr.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/SSMgr.java
rename to springloaded-core/src/main/java/org/springsource/loaded/SSMgr.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/SpringLoaded.java b/springloaded-core/src/main/java/org/springsource/loaded/SpringLoaded.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/SpringLoaded.java
rename to springloaded-core/src/main/java/org/springsource/loaded/SpringLoaded.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/SystemClassReflectionInvestigator.java b/springloaded-core/src/main/java/org/springsource/loaded/SystemClassReflectionInvestigator.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/SystemClassReflectionInvestigator.java
rename to springloaded-core/src/main/java/org/springsource/loaded/SystemClassReflectionInvestigator.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/SystemClassReflectionRewriter.java b/springloaded-core/src/main/java/org/springsource/loaded/SystemClassReflectionRewriter.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/SystemClassReflectionRewriter.java
rename to springloaded-core/src/main/java/org/springsource/loaded/SystemClassReflectionRewriter.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/SystemPropertyConfiguredIsReloadableTypePlugin.java b/springloaded-core/src/main/java/org/springsource/loaded/SystemPropertyConfiguredIsReloadableTypePlugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/SystemPropertyConfiguredIsReloadableTypePlugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/SystemPropertyConfiguredIsReloadableTypePlugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeDelta.java b/springloaded-core/src/main/java/org/springsource/loaded/TypeDelta.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/TypeDelta.java
rename to springloaded-core/src/main/java/org/springsource/loaded/TypeDelta.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeDescriptor.java b/springloaded-core/src/main/java/org/springsource/loaded/TypeDescriptor.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/TypeDescriptor.java
rename to springloaded-core/src/main/java/org/springsource/loaded/TypeDescriptor.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeDescriptorExtractor.java b/springloaded-core/src/main/java/org/springsource/loaded/TypeDescriptorExtractor.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/TypeDescriptorExtractor.java
rename to springloaded-core/src/main/java/org/springsource/loaded/TypeDescriptorExtractor.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeDiffComputer.java b/springloaded-core/src/main/java/org/springsource/loaded/TypeDiffComputer.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/TypeDiffComputer.java
rename to springloaded-core/src/main/java/org/springsource/loaded/TypeDiffComputer.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypePattern.java b/springloaded-core/src/main/java/org/springsource/loaded/TypePattern.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/TypePattern.java
rename to springloaded-core/src/main/java/org/springsource/loaded/TypePattern.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRegistry.java b/springloaded-core/src/main/java/org/springsource/loaded/TypeRegistry.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRegistry.java
rename to springloaded-core/src/main/java/org/springsource/loaded/TypeRegistry.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRewriter.java b/springloaded-core/src/main/java/org/springsource/loaded/TypeRewriter.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRewriter.java
rename to springloaded-core/src/main/java/org/springsource/loaded/TypeRewriter.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/UnableToLoadClassException.java b/springloaded-core/src/main/java/org/springsource/loaded/UnableToLoadClassException.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/UnableToLoadClassException.java
rename to springloaded-core/src/main/java/org/springsource/loaded/UnableToLoadClassException.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/UnableToReloadEventProcessorPlugin.java b/springloaded-core/src/main/java/org/springsource/loaded/UnableToReloadEventProcessorPlugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/UnableToReloadEventProcessorPlugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/UnableToReloadEventProcessorPlugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/Utils.java b/springloaded-core/src/main/java/org/springsource/loaded/Utils.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/Utils.java
rename to springloaded-core/src/main/java/org/springsource/loaded/Utils.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/__DynamicallyDispatchable.java b/springloaded-core/src/main/java/org/springsource/loaded/__DynamicallyDispatchable.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/__DynamicallyDispatchable.java
rename to springloaded-core/src/main/java/org/springsource/loaded/__DynamicallyDispatchable.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/CglibPlugin.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/CglibPlugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/CglibPlugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/CglibPlugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/CglibPluginCapturing.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/CglibPluginCapturing.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/CglibPluginCapturing.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/CglibPluginCapturing.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/ClassPreProcessorAgentAdapter.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/ClassPreProcessorAgentAdapter.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/ClassPreProcessorAgentAdapter.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/ClassPreProcessorAgentAdapter.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/ClassVisitingConstructorAppender.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/ClassVisitingConstructorAppender.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/ClassVisitingConstructorAppender.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/ClassVisitingConstructorAppender.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/FalseReturner.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/FalseReturner.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/FalseReturner.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/FalseReturner.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcher.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/FileSystemWatcher.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcher.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/FileSystemWatcher.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/GrailsPlugin.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/GrailsPlugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/GrailsPlugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/GrailsPlugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/GroovyPlugin.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/GroovyPlugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/GroovyPlugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/GroovyPlugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/Impossible.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/Impossible.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/Impossible.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/Impossible.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/JVMPlugin.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/JVMPlugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/JVMPlugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/JVMPlugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/ModifyDefineInClassLoaderForClassArtifactsType.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/ModifyDefineInClassLoaderForClassArtifactsType.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/ModifyDefineInClassLoaderForClassArtifactsType.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/ModifyDefineInClassLoaderForClassArtifactsType.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/NonFinalizer.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/NonFinalizer.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/NonFinalizer.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/NonFinalizer.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/PluginUtils.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/PluginUtils.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/PluginUtils.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/PluginUtils.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/ReloadDecision.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/ReloadDecision.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/ReloadDecision.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/ReloadDecision.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/SpringLoadedAgent.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/SpringLoadedAgent.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/SpringLoadedAgent.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/SpringLoadedAgent.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/SpringPlugin.java b/springloaded-core/src/main/java/org/springsource/loaded/agent/SpringPlugin.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/agent/SpringPlugin.java
rename to springloaded-core/src/main/java/org/springsource/loaded/agent/SpringPlugin.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/infra/SLFormatter.java b/springloaded-core/src/main/java/org/springsource/loaded/infra/SLFormatter.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/infra/SLFormatter.java
rename to springloaded-core/src/main/java/org/springsource/loaded/infra/SLFormatter.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/infra/UsedByGeneratedCode.java b/springloaded-core/src/main/java/org/springsource/loaded/infra/UsedByGeneratedCode.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/infra/UsedByGeneratedCode.java
rename to springloaded-core/src/main/java/org/springsource/loaded/infra/UsedByGeneratedCode.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/jvm/JVM.java b/springloaded-core/src/main/java/org/springsource/loaded/jvm/JVM.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/jvm/JVM.java
rename to springloaded-core/src/main/java/org/springsource/loaded/jvm/JVM.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/pluginhelpers/EmptyCtor.java b/springloaded-core/src/main/java/org/springsource/loaded/pluginhelpers/EmptyCtor.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/pluginhelpers/EmptyCtor.java
rename to springloaded-core/src/main/java/org/springsource/loaded/pluginhelpers/EmptyCtor.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/DynamicLookup.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/DynamicLookup.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/DynamicLookup.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/DynamicLookup.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/Exceptions.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/Exceptions.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/Exceptions.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/Exceptions.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/FieldLookup.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/FieldLookup.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/FieldLookup.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/FieldLookup.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/GetDeclaredFieldLookup.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/GetDeclaredFieldLookup.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/GetDeclaredFieldLookup.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/GetDeclaredFieldLookup.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/GetDeclaredMethodLookup.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/GetDeclaredMethodLookup.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/GetDeclaredMethodLookup.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/GetDeclaredMethodLookup.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/GetFieldLookup.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/GetFieldLookup.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/GetFieldLookup.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/GetFieldLookup.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/GetMethodLookup.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/GetMethodLookup.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/GetMethodLookup.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/GetMethodLookup.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/GetMethodsLookup.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/GetMethodsLookup.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/GetMethodsLookup.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/GetMethodsLookup.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/Invoker.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/Invoker.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/Invoker.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/Invoker.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/JavaClassMethodProvider.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/JavaClassMethodProvider.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/JavaClassMethodProvider.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/JavaClassMethodProvider.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/JavaMethodCache.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/JavaMethodCache.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/JavaMethodCache.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/JavaMethodCache.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/JavaMethodInvoker.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/JavaMethodInvoker.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/JavaMethodInvoker.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/JavaMethodInvoker.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/MethodProvider.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/MethodProvider.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/MethodProvider.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/MethodProvider.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/OriginalClassInvoker.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/OriginalClassInvoker.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/OriginalClassInvoker.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/OriginalClassInvoker.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/ReflectiveInterceptor.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/ReflectiveInterceptor.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/ReflectiveInterceptor.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/ReflectiveInterceptor.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/ReloadableTypeMethodProvider.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/ReloadableTypeMethodProvider.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/ReloadableTypeMethodProvider.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/ReloadableTypeMethodProvider.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/ReloadedTypeInvoker.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/ReloadedTypeInvoker.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/ReloadedTypeInvoker.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/ReloadedTypeInvoker.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/StaticLookup.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/StaticLookup.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/StaticLookup.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/StaticLookup.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/ri/TypeDescriptorMethodProvider.java b/springloaded-core/src/main/java/org/springsource/loaded/ri/TypeDescriptorMethodProvider.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/ri/TypeDescriptorMethodProvider.java
rename to springloaded-core/src/main/java/org/springsource/loaded/ri/TypeDescriptorMethodProvider.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java b/springloaded-core/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java
rename to springloaded-core/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java b/springloaded-core/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java
similarity index 100%
rename from org.springsource.loaded/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java
rename to springloaded-core/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/perf/test/PerformanceTests.java b/springloaded-core/src/test/java/org/springsource/loaded/perf/test/PerformanceTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/perf/test/PerformanceTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/perf/test/PerformanceTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/perf/test/WeavingPerformanceTests.java b/springloaded-core/src/test/java/org/springsource/loaded/perf/test/WeavingPerformanceTests.java
similarity index 96%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/perf/test/WeavingPerformanceTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/perf/test/WeavingPerformanceTests.java
index bce541a..9984cd6 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/perf/test/WeavingPerformanceTests.java
+++ b/springloaded-core/src/test/java/org/springsource/loaded/perf/test/WeavingPerformanceTests.java
@@ -32,7 +32,7 @@ import org.springsource.loaded.test.infra.TestClassLoader;
  */
 public class WeavingPerformanceTests extends SpringLoadedTests {
 
-	protected String ExpressionsJar = "../org.springsource.loaded.testdata/lib/spring-expression-4.0.0.M3.jar";
+	protected String ExpressionsJar = "../testdata/lib/spring-expression-4.0.0.M3.jar";
 	
 	/**
 	 * Work in progress...
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/AbstractReflectionTests.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/AbstractReflectionTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/AbstractReflectionTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/AbstractReflectionTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/BridgeMethodTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/BridgeMethodTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/BridgeMethodTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/BridgeMethodTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetDeclaredMethodsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetDeclaredMethodsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetDeclaredMethodsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetDeclaredMethodsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetModifiersTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetModifiersTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassGetModifiersTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetModifiersTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassNewInstanceTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassNewInstanceTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassNewInstanceTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassNewInstanceTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassReflectionTests.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassReflectionTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ClassReflectionTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassReflectionTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ConstructorAdHocTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorAdHocTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ConstructorAdHocTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorAdHocTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ConstructorNewInstanceTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorNewInstanceTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/ConstructorNewInstanceTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorNewInstanceTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/FieldAdHocTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldAdHocTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/FieldAdHocTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldAdHocTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAndSetTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAndSetTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAndSetTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAndSetTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/FieldSetAccessTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldSetAccessTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/FieldSetAccessTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldSetAccessTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/MethodGenericsAndVarArgsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGenericsAndVarArgsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/MethodGenericsAndVarArgsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGenericsAndVarArgsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/MethodGetParamAnnotationsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetParamAnnotationsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/MethodGetParamAnnotationsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetParamAnnotationsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/MethodInvokeTest.java b/springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodInvokeTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/ri/test/MethodInvokeTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodInvokeTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/CatcherTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/CatcherTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/CatcherTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/CatcherTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/CglibProxyTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/CglibProxyTests.java
similarity index 98%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/CglibProxyTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/CglibProxyTests.java
index 382110a..1e06f15 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/CglibProxyTests.java
+++ b/springloaded-core/src/test/java/org/springsource/loaded/test/CglibProxyTests.java
@@ -47,7 +47,7 @@ public class CglibProxyTests extends SpringLoadedTests {
 		super.setup();
 		GlobalConfiguration.reloadMessages = true;
 		binLoader = new TestClassloaderWithRewriting(true, true, true);
-		//cglibLoader = new URLClassLoader(new URL[]{new File("../org.springsource.loaded.testdata/lib/cglib-nodep-2.2.jar").toURI().toURL()});
+		//cglibLoader = new URLClassLoader(new URL[]{new File("../testdata/lib/cglib-nodep-2.2.jar").toURI().toURL()});
 	}
 
 	@After
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ClassRenamerTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/ClassRenamerTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/ClassRenamerTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/ClassRenamerTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/CodeGenerationTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/CodeGenerationTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/CodeGenerationTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/CodeGenerationTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/CrossLoaderTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/CrossLoaderTests.java
similarity index 99%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/CrossLoaderTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/CrossLoaderTests.java
index 0766269..bebe4f9 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/CrossLoaderTests.java
+++ b/springloaded-core/src/test/java/org/springsource/loaded/test/CrossLoaderTests.java
@@ -383,7 +383,7 @@ public class CrossLoaderTests extends SpringLoadedTests {
 	@Test
 	public void cglibProxiesAcrossLoader1() throws Exception {
 
-		binLoader = new SubLoader(new String[] {}, new String[] { "../org.springsource.loaded.testdata/lib/cglib-nodep-2.2.jar" });
+		binLoader = new SubLoader(new String[] {}, new String[] { "../testdata/lib/cglib-nodep-2.2.jar" });
 		subLoader = (SubLoader) binLoader;
 
 		String t = "subpkg.ProxyTestcase";
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/DebuggingTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/DebuggingTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/DebuggingTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/DebuggingTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/DispatcherBuilderTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/DispatcherBuilderTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/DispatcherBuilderTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/DispatcherBuilderTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/EnumTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/EnumTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/EnumTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/EnumTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ExecutorBuilderTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/ExecutorBuilderTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/ExecutorBuilderTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/ExecutorBuilderTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/FieldReloadingTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/FieldReloadingTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/FieldReloadingTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/FieldReloadingTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/FileSystemWatcherTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/FileSystemWatcherTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/FileSystemWatcherTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/FileSystemWatcherTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/GroovyBenchmarkTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/GroovyBenchmarkTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/GroovyBenchmarkTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/GroovyBenchmarkTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/GroovyTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/GroovyTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/GroovyTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/GroovyTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/IncrementalTypeDescriptorTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/IncrementalTypeDescriptorTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/IncrementalTypeDescriptorTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/IncrementalTypeDescriptorTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/InnerClassesTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/InnerClassesTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/InnerClassesTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/InnerClassesTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/InterfaceExtractorTest.java b/springloaded-core/src/test/java/org/springsource/loaded/test/InterfaceExtractorTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/InterfaceExtractorTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/InterfaceExtractorTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/JavaMicroBenchmarkTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/JavaMicroBenchmarkTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/JavaMicroBenchmarkTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/JavaMicroBenchmarkTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/MethodInvokerRewriterTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/MethodInvokerRewriterTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/MethodInvokerRewriterTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/MethodInvokerRewriterTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/NameRegistryTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/NameRegistryTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/NameRegistryTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/NameRegistryTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/PluginTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/PluginTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/PluginTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/PluginTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ProxyTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/ProxyTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/ProxyTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/ProxyTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReflectiveReflectionTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/ReflectiveReflectionTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReflectiveReflectionTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/ReflectiveReflectionTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadableTypeTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/ReloadableTypeTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadableTypeTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/ReloadableTypeTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java b/springloaded-core/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
similarity index 98%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
index 58600e2..8edea25 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
+++ b/springloaded-core/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
@@ -33,7 +33,7 @@ public class ReloadingJVM {
 	private ReloadingJVM() {
 		try {
 			javaclasspath = System.getProperty("java.class.path");
-			javaclasspath = javaclasspath + File.pathSeparator + TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
+			javaclasspath = javaclasspath + File.pathSeparator + TestUtils.getPathToClasses("../testdata");
 			if (DEBUG_CLIENT_SIDE) {
 				System.out.println("(client) Classpath for JVM that is being launched: " + javaclasspath);
 			}
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadingJVMCommandProcess.java b/springloaded-core/src/test/java/org/springsource/loaded/test/ReloadingJVMCommandProcess.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadingJVMCommandProcess.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/ReloadingJVMCommandProcess.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ScenarioTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/ScenarioTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/ScenarioTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/ScenarioTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
similarity index 99%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
index c9fb0d6..16d6088 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
+++ b/springloaded-core/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
@@ -86,11 +86,11 @@ public abstract class SpringLoadedTests implements Constants {
 	 */
 	protected ClassLoader binLoader;
 
-	protected String TestDataPath = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
-	protected String GroovyTestDataPath = TestUtils.getPathToClasses("../org.springsource.loaded.testdata.groovy");
-	protected String AspectjrtJar = "../org.springsource.loaded.testdata/aspectjrt.jar";
-	protected String CodeJar = "../org.springsource.loaded.testdata/code.jar";
-	protected String GroovyrtJar = "../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar";
+	protected String TestDataPath = TestUtils.getPathToClasses("../testdata");
+	protected String GroovyTestDataPath = TestUtils.getPathToClasses("../testdata-groovy");
+	protected String AspectjrtJar = "../testdata/aspectjrt.jar";
+	protected String CodeJar = "../testdata/code.jar";
+	protected String GroovyrtJar = "../testdata-groovy/groovy-1.8.2.jar";
 	protected Result result;
 	protected TypeRegistry registry;
 
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/SpringLoadedTestsInSeparateJVM.java b/springloaded-core/src/test/java/org/springsource/loaded/test/SpringLoadedTestsInSeparateJVM.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/SpringLoadedTestsInSeparateJVM.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/SpringLoadedTestsInSeparateJVM.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/SystemClassReflectionRewriterTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/SystemClassReflectionRewriterTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/SystemClassReflectionRewriterTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/SystemClassReflectionRewriterTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/Target.java b/springloaded-core/src/test/java/org/springsource/loaded/test/Target.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/Target.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/Target.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TestController.java b/springloaded-core/src/test/java/org/springsource/loaded/test/TestController.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/TestController.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/TestController.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TestInfrastructureTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/TestInfrastructureTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/TestInfrastructureTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/TestInfrastructureTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TestUtils.java b/springloaded-core/src/test/java/org/springsource/loaded/test/TestUtils.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/TestUtils.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/TestUtils.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypeDeltaTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/TypeDeltaTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypeDeltaTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/TypeDeltaTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypeDescriptorExtractorTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/TypeDescriptorExtractorTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypeDescriptorExtractorTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/TypeDescriptorExtractorTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypeDescriptorTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/TypeDescriptorTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypeDescriptorTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/TypeDescriptorTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypePatternTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/TypePatternTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypePatternTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/TypePatternTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypeRegistryTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/TypeRegistryTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypeRegistryTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/TypeRegistryTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypeRewriterTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/TypeRewriterTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/TypeRewriterTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/TypeRewriterTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/UtilsTests.java b/springloaded-core/src/test/java/org/springsource/loaded/test/UtilsTests.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/UtilsTests.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/UtilsTests.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/FakeMethodVisitor.java b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/FakeMethodVisitor.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/FakeMethodVisitor.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/infra/FakeMethodVisitor.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/IResult.java b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/IResult.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/IResult.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/infra/IResult.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/Result.java b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/Result.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/Result.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/infra/Result.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/ResultException.java b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/ResultException.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/ResultException.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/infra/ResultException.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/RewriteReflectUtilsDefineClass.java b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/RewriteReflectUtilsDefineClass.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/RewriteReflectUtilsDefineClass.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/infra/RewriteReflectUtilsDefineClass.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SubLoader.java b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
similarity index 94%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
index df69422..8af4e76 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
+++ b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
@@ -42,10 +42,10 @@ public class SubLoader extends ClassLoader {
 
 	// @formatter:off
 	static String[] folders = new String[] { 
-		TestUtils.getPathToClasses("../org.springsource.loaded.testdata.subloader")
+		TestUtils.getPathToClasses("../testdata-subloader")
 		};
 	static String[] jars = new String[] { 
-		"../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar"
+		"../testdata-groovy/groovy-1.8.2.jar"
 		};
 	// @formatter:on
 
@@ -70,15 +70,15 @@ public class SubLoader extends ClassLoader {
 	public SubLoader(String metainfFolder) {
 		String[] newFolders = new String[2];
 		newFolders[0] = folders[0];
-		newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
+		newFolders[1] = "../testdata/" + metainfFolder;
 		folders = newFolders;
 	}
 
 	public SubLoader(String metainfFolder, boolean b) {
 		String[] newFolders = new String[3];
 		newFolders[0] = folders[0];
-		newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
-		newFolders[2] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
+		newFolders[1] = "../testdata/" + metainfFolder;
+		newFolders[2] = TestUtils.getPathToClasses("../testdata");
 		folders = newFolders;
 	}
 
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
similarity index 92%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
index 9acd4c5..e0a27d2 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
+++ b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
@@ -42,15 +42,15 @@ public class SuperLoader extends ClassLoader {
 
 	// @formatter:off
 	static String[] folders = new String[] { 
-		TestUtils.getPathToClasses("../org.springsource.loaded.testdata.superloader")
+		TestUtils.getPathToClasses("../testdata-superloader")
 		};
 	static String[] jars = new String[] { 
-		"../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar"
+		"../testdata-groovy/groovy-1.8.2.jar"
 		};
 	// @formatter:on
 
 	public SuperLoader() {
-		jars = new String[] { "../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar" };
+		jars = new String[] { "../testdata-groovy/groovy-1.8.2.jar" };
 	}
 
 	public SuperLoader(String... jars) {
@@ -60,15 +60,15 @@ public class SuperLoader extends ClassLoader {
 	public SuperLoader(String metainfFolder) {
 		String[] newFolders = new String[2];
 		newFolders[0] = folders[0];
-		newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
+		newFolders[1] = "../testdata/" + metainfFolder;
 		folders = newFolders;
 	}
 
 	public SuperLoader(String metainfFolder, boolean b) {
 		String[] newFolders = new String[3];
 		newFolders[0] = folders[0];
-		newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
-		newFolders[2] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
+		newFolders[1] = "../testdata/" + metainfFolder;
+		newFolders[2] = TestUtils.getPathToClasses("../testdata");
 		folders = newFolders;
 	}
 
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/TestClassLoader.java b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/TestClassLoader.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/TestClassLoader.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/infra/TestClassLoader.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
similarity index 86%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
rename to springloaded-core/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
index 3b165ce..6a6fb18 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
+++ b/springloaded-core/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
@@ -48,53 +48,53 @@ public class TestClassloaderWithRewriting extends ClassLoader {
 
 	// @formatter:off
 	static String[] folders = new String[] { 
-		TestUtils.getPathToClasses("../org.springsource.loaded.testdata.groovy") 
+		TestUtils.getPathToClasses("../testdata-groovy") 
 		};
 	static String[] jars = new String[] { 
-		"../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar"
+		"../testdata-groovy/groovy-1.8.2.jar"
 		};
 	// @formatter:on
 
 	public TestClassloaderWithRewriting() {
-		jars = new String[] { "../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar" };
+		jars = new String[] { "../testdata-groovy/groovy-1.8.2.jar" };
 	}
 
 	public TestClassloaderWithRewriting(String metainfFolder) {
 		String[] newFolders = new String[2];
 		newFolders[0] = folders[0];
-		newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
+		newFolders[1] = "../testdata/" + metainfFolder;
 		folders = newFolders;
-		jars = new String[] { "../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar" };
+		jars = new String[] { "../testdata-groovy/groovy-1.8.2.jar" };
 	}
 
 	public TestClassloaderWithRewriting(String metainfFolder, boolean b) {
 		String[] newFolders = new String[4];
 		newFolders[0] = folders[0];
-		newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
-		newFolders[2] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
-		newFolders[3] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata.plugin");
+		newFolders[1] = "../testdata/" + metainfFolder;
+		newFolders[2] = TestUtils.getPathToClasses("../testdata");
+		newFolders[3] = TestUtils.getPathToClasses("../testdata-plugin");
 		folders = newFolders;
-		jars = new String[] { "../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar" };
+		jars = new String[] { "../testdata-groovy/groovy-1.8.2.jar" };
 	}
 
 	public TestClassloaderWithRewriting(String metainfFolder, boolean b, boolean useRegistry, URLClassLoader classLoader) {
 		super(classLoader);
 		String[] newFolders = new String[3];
 		newFolders[0] = folders[0];
-		newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
-		newFolders[2] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
+		newFolders[1] = "../testdata/" + metainfFolder;
+		newFolders[2] = TestUtils.getPathToClasses("../testdata");
 		folders = newFolders;
 		this.useRegistry = useRegistry;
-		jars = new String[] { "../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar" };
+		jars = new String[] { "../testdata-groovy/groovy-1.8.2.jar" };
 	}
 
 	public TestClassloaderWithRewriting(boolean b, boolean useRegistry, boolean addCglib) {
 		String[] newFolders = new String[2];
 		newFolders[0] = folders[0];
-		newFolders[1] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
+		newFolders[1] = TestUtils.getPathToClasses("../testdata");
 		folders = newFolders;
 		this.useRegistry = useRegistry;
-		jars = new String[] { "../org.springsource.loaded.testdata/lib/cglib-nodep-2.2.jar" };
+		jars = new String[] { "../testdata/lib/cglib-nodep-2.2.jar" };
 	}
 
 	public Class<?> findClass(String name) throws ClassNotFoundException {
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/ChoiceGenerationTest.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/ChoiceGenerationTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/ChoiceGenerationTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/ChoiceGenerationTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/ExecutionContextsTest.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/ExecutionContextsTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/ExecutionContextsTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/ExecutionContextsTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/ExploreAllChoicesRunner.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/ExploreAllChoicesRunner.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/ExploreAllChoicesRunner.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/ExploreAllChoicesRunner.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/FieldGetMethod.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/FieldGetMethod.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/FieldGetMethod.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/FieldGetMethod.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/GeneratedTest.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/GeneratedTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/GeneratedTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/GeneratedTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/GenerativeSpringLoadedTest.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/GenerativeSpringLoadedTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/GenerativeSpringLoadedTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/GenerativeSpringLoadedTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/GenerativeTest.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/GenerativeTest.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/GenerativeTest.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/GenerativeTest.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/IChoiceGenerator.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/IChoiceGenerator.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/IChoiceGenerator.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/IChoiceGenerator.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/IClassProvider.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/IClassProvider.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/IClassProvider.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/IClassProvider.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/InvokerGenerator.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/InvokerGenerator.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/InvokerGenerator.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/InvokerGenerator.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/JustJavaClassProvider.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/JustJavaClassProvider.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/JustJavaClassProvider.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/JustJavaClassProvider.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/PredictResult.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/PredictResult.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/PredictResult.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/PredictResult.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/RejectedChoice.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/RejectedChoice.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/RejectedChoice.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/RejectedChoice.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/SignatureFinder.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/SignatureFinder.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/SignatureFinder.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/SignatureFinder.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/SpringLoadedClassProvider.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/SpringLoadedClassProvider.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/SpringLoadedClassProvider.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/SpringLoadedClassProvider.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/SystematicChoiceGenerator.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/SystematicChoiceGenerator.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/SystematicChoiceGenerator.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/SystematicChoiceGenerator.java
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/ToStringComparator.java b/springloaded-core/src/test/java/org/springsource/loaded/testgen/ToStringComparator.java
similarity index 100%
rename from org.springsource.loaded/src/test/java/org/springsource/loaded/testgen/ToStringComparator.java
rename to springloaded-core/src/test/java/org/springsource/loaded/testgen/ToStringComparator.java
diff --git a/testdata-groovy/.classpath b/testdata-groovy/.classpath
new file mode 100644
index 0000000..3bc0d96
--- /dev/null
+++ b/testdata-groovy/.classpath
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer" exported="true"/>
+	<classpathentry kind="con" path="GROOVY_DSL_SUPPORT" exported="true"/>
+	<classpathentry kind="con" path="GROOVY_SUPPORT" exported="true"/>
+	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" exported="true"/>
+	<classpathentry sourcepath="/Users/aclement/.gradle/caches/artifacts-26/filestore/org.codehaus.groovy/groovy/1.8.2/source/671b51fe81fbc6b75de225cf914fd4b6020cb78e/groovy-1.8.2-sources.jar" kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/org.codehaus.groovy/groovy/1.8.2/jar/b8867fd0e6d72fba6188efc9e6cf461894fd7d6b/groovy-1.8.2.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/antlr/antlr/2.7.7/jar/83cd2cd674a217ade95a4bb83a8a14f351f48bd0/antlr-2.7.7.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/asm/asm/3.2/jar/9bc1511dec6adf302991ced13303e4140fdf9ab7/asm-3.2.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/asm/asm-tree/3.2/jar/cd792e29c79d170c5d0bdd05adf5807cf6875c90/asm-tree-3.2.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/asm/asm-commons/3.2/jar/e7a19b8c60589499e35f5d2068d09013030b8891/asm-commons-3.2.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/asm/asm-util/3.2/jar/37ebfdad34d5f1f45109981465f311bbfbe82dcf/asm-util-3.2.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/asm/asm-analysis/3.2/jar/c624956db93975b7197699dcd7de6145ca7cf2c8/asm-analysis-3.2.jar" exported="true"/>
+</classpath>
diff --git a/org.springsource.loaded.testdata.groovy/.project b/testdata-groovy/.project
similarity index 75%
rename from org.springsource.loaded.testdata.groovy/.project
rename to testdata-groovy/.project
index 08e18ff..8a43b66 100644
--- a/org.springsource.loaded.testdata.groovy/.project
+++ b/testdata-groovy/.project
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.springsource.loaded.testdata.groovy</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
+	<name>testdata-groovy</name>
+	<comment/>
+	<projects/>
 	<natures>
 		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
 	</natures>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments/>
+		</buildCommand>
+	</buildSpec>
+	<linkedResources/>
 </projectDescription>
diff --git a/org.springsource.loaded.testdata.groovy/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/testdata-groovy/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
rename to testdata-groovy/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
diff --git a/org.springsource.loaded.testdata.plugin/.settings/org.eclipse.jdt.core.prefs b/testdata-groovy/.settings/org.eclipse.jdt.core.prefs
similarity index 94%
rename from org.springsource.loaded.testdata.plugin/.settings/org.eclipse.jdt.core.prefs
rename to testdata-groovy/.settings/org.eclipse.jdt.core.prefs
index 4a3cbc4..e606011 100644
--- a/org.springsource.loaded.testdata.plugin/.settings/org.eclipse.jdt.core.prefs
+++ b/testdata-groovy/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,13 @@
-#Mon Feb 08 11:33:02 PST 2010
+#
+#Tue Jan 14 11:38:13 PST 2014
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.springsource.loaded/.settings/org.eclipse.jdt.groovy.core.prefs b/testdata-groovy/.settings/org.eclipse.jdt.groovy.core.prefs
similarity index 100%
rename from org.springsource.loaded/.settings/org.eclipse.jdt.groovy.core.prefs
rename to testdata-groovy/.settings/org.eclipse.jdt.groovy.core.prefs
diff --git a/org.springsource.loaded.testdata.groovy/.settings/org.eclipse.jdt.ui.prefs b/testdata-groovy/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/.settings/org.eclipse.jdt.ui.prefs
rename to testdata-groovy/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.springsource.loaded.testdata.groovy/LICENSES/LICENSE b/testdata-groovy/LICENSES/LICENSE
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/LICENSES/LICENSE
rename to testdata-groovy/LICENSES/LICENSE
diff --git a/org.springsource.loaded.testdata.groovy/build.gradle b/testdata-groovy/build.gradle
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/build.gradle
rename to testdata-groovy/build.gradle
diff --git a/org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar b/testdata-groovy/groovy-1.8.2.jar
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar
rename to testdata-groovy/groovy-1.8.2.jar
diff --git a/org.springsource.loaded.testdata.groovy/src/clinitg/Four.groovy b/testdata-groovy/src/clinitg/Four.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/clinitg/Four.groovy
rename to testdata-groovy/src/clinitg/Four.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/clinitg/Four2.groovy b/testdata-groovy/src/clinitg/Four2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/clinitg/Four2.groovy
rename to testdata-groovy/src/clinitg/Four2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/clinitg/FourHelper.groovy b/testdata-groovy/src/clinitg/FourHelper.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/clinitg/FourHelper.groovy
rename to testdata-groovy/src/clinitg/FourHelper.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/clinitg/One.groovy b/testdata-groovy/src/clinitg/One.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/clinitg/One.groovy
rename to testdata-groovy/src/clinitg/One.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/clinitg/One2.groovy b/testdata-groovy/src/clinitg/One2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/clinitg/One2.groovy
rename to testdata-groovy/src/clinitg/One2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/clinitg/Three.groovy b/testdata-groovy/src/clinitg/Three.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/clinitg/Three.groovy
rename to testdata-groovy/src/clinitg/Three.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/clinitg/Three2.groovy b/testdata-groovy/src/clinitg/Three2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/clinitg/Three2.groovy
rename to testdata-groovy/src/clinitg/Three2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/clinitg/Three3.groovy b/testdata-groovy/src/clinitg/Three3.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/clinitg/Three3.groovy
rename to testdata-groovy/src/clinitg/Three3.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/clinitg/Two.groovy b/testdata-groovy/src/clinitg/Two.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/clinitg/Two.groovy
rename to testdata-groovy/src/clinitg/Two.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/clinitg/Two2.groovy b/testdata-groovy/src/clinitg/Two2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/clinitg/Two2.groovy
rename to testdata-groovy/src/clinitg/Two2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/controller/Controller.groovy b/testdata-groovy/src/controller/Controller.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/controller/Controller.groovy
rename to testdata-groovy/src/controller/Controller.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/controller/Controller2.groovy b/testdata-groovy/src/controller/Controller2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/controller/Controller2.groovy
rename to testdata-groovy/src/controller/Controller2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/controller/Controller3.groovy b/testdata-groovy/src/controller/Controller3.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/controller/Controller3.groovy
rename to testdata-groovy/src/controller/Controller3.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/enums/ExtensibleEnum.groovy b/testdata-groovy/src/enums/ExtensibleEnum.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/enums/ExtensibleEnum.groovy
rename to testdata-groovy/src/enums/ExtensibleEnum.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/enums/ExtensibleEnum3.groovy b/testdata-groovy/src/enums/ExtensibleEnum3.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/enums/ExtensibleEnum3.groovy
rename to testdata-groovy/src/enums/ExtensibleEnum3.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/enums/ExtensibleEnumB.groovy b/testdata-groovy/src/enums/ExtensibleEnumB.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/enums/ExtensibleEnumB.groovy
rename to testdata-groovy/src/enums/ExtensibleEnumB.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/enums/RunnerA.java b/testdata-groovy/src/enums/RunnerA.java
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/enums/RunnerA.java
rename to testdata-groovy/src/enums/RunnerA.java
diff --git a/org.springsource.loaded.testdata.groovy/src/enums/RunnerB.java b/testdata-groovy/src/enums/RunnerB.java
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/enums/RunnerB.java
rename to testdata-groovy/src/enums/RunnerB.java
diff --git a/org.springsource.loaded.testdata.groovy/src/enums/WhatAnEnum.groovy b/testdata-groovy/src/enums/WhatAnEnum.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/enums/WhatAnEnum.groovy
rename to testdata-groovy/src/enums/WhatAnEnum.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/enums/WhatAnEnum2.groovy b/testdata-groovy/src/enums/WhatAnEnum2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/enums/WhatAnEnum2.groovy
rename to testdata-groovy/src/enums/WhatAnEnum2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/enums/WhatAnEnum3.groovy b/testdata-groovy/src/enums/WhatAnEnum3.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/enums/WhatAnEnum3.groovy
rename to testdata-groovy/src/enums/WhatAnEnum3.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/enums/WhatAnEnumB.groovy b/testdata-groovy/src/enums/WhatAnEnumB.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/enums/WhatAnEnumB.groovy
rename to testdata-groovy/src/enums/WhatAnEnumB.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/enums/WhatAnEnumB2.groovy b/testdata-groovy/src/enums/WhatAnEnumB2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/enums/WhatAnEnumB2.groovy
rename to testdata-groovy/src/enums/WhatAnEnumB2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/Back.groovy b/testdata-groovy/src/simple/Back.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/Back.groovy
rename to testdata-groovy/src/simple/Back.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/Back2.groovy b/testdata-groovy/src/simple/Back2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/Back2.groovy
rename to testdata-groovy/src/simple/Back2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/Basic.groovy b/testdata-groovy/src/simple/Basic.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/Basic.groovy
rename to testdata-groovy/src/simple/Basic.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/Basic2.groovy b/testdata-groovy/src/simple/Basic2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/Basic2.groovy
rename to testdata-groovy/src/simple/Basic2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/Basic3.groovy b/testdata-groovy/src/simple/Basic3.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/Basic3.groovy
rename to testdata-groovy/src/simple/Basic3.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/Basic4.groovy b/testdata-groovy/src/simple/Basic4.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/Basic4.groovy
rename to testdata-groovy/src/simple/Basic4.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicB.groovy b/testdata-groovy/src/simple/BasicB.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicB.groovy
rename to testdata-groovy/src/simple/BasicB.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicB2.groovy b/testdata-groovy/src/simple/BasicB2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicB2.groovy
rename to testdata-groovy/src/simple/BasicB2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicC.groovy b/testdata-groovy/src/simple/BasicC.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicC.groovy
rename to testdata-groovy/src/simple/BasicC.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicC2.groovy b/testdata-groovy/src/simple/BasicC2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicC2.groovy
rename to testdata-groovy/src/simple/BasicC2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicD.groovy b/testdata-groovy/src/simple/BasicD.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicD.groovy
rename to testdata-groovy/src/simple/BasicD.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicD2.groovy b/testdata-groovy/src/simple/BasicD2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicD2.groovy
rename to testdata-groovy/src/simple/BasicD2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicDTarget.groovy b/testdata-groovy/src/simple/BasicDTarget.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicDTarget.groovy
rename to testdata-groovy/src/simple/BasicDTarget.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicDTarget2.groovy b/testdata-groovy/src/simple/BasicDTarget2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicDTarget2.groovy
rename to testdata-groovy/src/simple/BasicDTarget2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicE.groovy b/testdata-groovy/src/simple/BasicE.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicE.groovy
rename to testdata-groovy/src/simple/BasicE.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicE2.groovy b/testdata-groovy/src/simple/BasicE2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicE2.groovy
rename to testdata-groovy/src/simple/BasicE2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicETarget.groovy b/testdata-groovy/src/simple/BasicETarget.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicETarget.groovy
rename to testdata-groovy/src/simple/BasicETarget.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicETarget2.groovy b/testdata-groovy/src/simple/BasicETarget2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicETarget2.groovy
rename to testdata-groovy/src/simple/BasicETarget2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicF.groovy b/testdata-groovy/src/simple/BasicF.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicF.groovy
rename to testdata-groovy/src/simple/BasicF.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicFTarget.groovy b/testdata-groovy/src/simple/BasicFTarget.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicFTarget.groovy
rename to testdata-groovy/src/simple/BasicFTarget.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicFTarget2.groovy b/testdata-groovy/src/simple/BasicFTarget2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicFTarget2.groovy
rename to testdata-groovy/src/simple/BasicFTarget2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicFTarget4.groovy b/testdata-groovy/src/simple/BasicFTarget4.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicFTarget4.groovy
rename to testdata-groovy/src/simple/BasicFTarget4.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicG.groovy b/testdata-groovy/src/simple/BasicG.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicG.groovy
rename to testdata-groovy/src/simple/BasicG.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicGTarget.groovy b/testdata-groovy/src/simple/BasicGTarget.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicGTarget.groovy
rename to testdata-groovy/src/simple/BasicGTarget.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicGTarget2.groovy b/testdata-groovy/src/simple/BasicGTarget2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicGTarget2.groovy
rename to testdata-groovy/src/simple/BasicGTarget2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicH.groovy b/testdata-groovy/src/simple/BasicH.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicH.groovy
rename to testdata-groovy/src/simple/BasicH.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosure.groovy b/testdata-groovy/src/simple/BasicWithClosure.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosure.groovy
rename to testdata-groovy/src/simple/BasicWithClosure.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosure2.groovy b/testdata-groovy/src/simple/BasicWithClosure2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosure2.groovy
rename to testdata-groovy/src/simple/BasicWithClosure2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosure3.groovy b/testdata-groovy/src/simple/BasicWithClosure3.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosure3.groovy
rename to testdata-groovy/src/simple/BasicWithClosure3.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureB.groovy b/testdata-groovy/src/simple/BasicWithClosureB.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureB.groovy
rename to testdata-groovy/src/simple/BasicWithClosureB.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureB2.groovy b/testdata-groovy/src/simple/BasicWithClosureB2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureB2.groovy
rename to testdata-groovy/src/simple/BasicWithClosureB2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureB3.groovy b/testdata-groovy/src/simple/BasicWithClosureB3.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureB3.groovy
rename to testdata-groovy/src/simple/BasicWithClosureB3.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureC.groovy b/testdata-groovy/src/simple/BasicWithClosureC.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureC.groovy
rename to testdata-groovy/src/simple/BasicWithClosureC.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureC2.groovy b/testdata-groovy/src/simple/BasicWithClosureC2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureC2.groovy
rename to testdata-groovy/src/simple/BasicWithClosureC2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureD.groovy b/testdata-groovy/src/simple/BasicWithClosureD.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureD.groovy
rename to testdata-groovy/src/simple/BasicWithClosureD.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureD2.groovy b/testdata-groovy/src/simple/BasicWithClosureD2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureD2.groovy
rename to testdata-groovy/src/simple/BasicWithClosureD2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureE.groovy b/testdata-groovy/src/simple/BasicWithClosureE.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureE.groovy
rename to testdata-groovy/src/simple/BasicWithClosureE.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureE2.groovy b/testdata-groovy/src/simple/BasicWithClosureE2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureE2.groovy
rename to testdata-groovy/src/simple/BasicWithClosureE2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureE3.groovy b/testdata-groovy/src/simple/BasicWithClosureE3.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/BasicWithClosureE3.groovy
rename to testdata-groovy/src/simple/BasicWithClosureE3.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/CopyOfBasicD.groovy b/testdata-groovy/src/simple/CopyOfBasicD.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/CopyOfBasicD.groovy
rename to testdata-groovy/src/simple/CopyOfBasicD.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/Front.groovy b/testdata-groovy/src/simple/Front.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/Front.groovy
rename to testdata-groovy/src/simple/Front.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/LFront.groovy b/testdata-groovy/src/simple/LFront.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/LFront.groovy
rename to testdata-groovy/src/simple/LFront.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/LFront2.groovy b/testdata-groovy/src/simple/LFront2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/LFront2.groovy
rename to testdata-groovy/src/simple/LFront2.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/SelfReflector.groovy b/testdata-groovy/src/simple/SelfReflector.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/SelfReflector.groovy
rename to testdata-groovy/src/simple/SelfReflector.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/Values.groovy b/testdata-groovy/src/simple/Values.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/Values.groovy
rename to testdata-groovy/src/simple/Values.groovy
diff --git a/org.springsource.loaded.testdata.groovy/src/simple/Values2.groovy b/testdata-groovy/src/simple/Values2.groovy
similarity index 100%
rename from org.springsource.loaded.testdata.groovy/src/simple/Values2.groovy
rename to testdata-groovy/src/simple/Values2.groovy
diff --git a/org.springsource.loaded.testdata/.classpath b/testdata-plugin/.classpath
similarity index 71%
rename from org.springsource.loaded.testdata/.classpath
rename to testdata-plugin/.classpath
index 01992b9..023bcbd 100644
--- a/org.springsource.loaded.testdata/.classpath
+++ b/testdata-plugin/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="src" path="/springloaded-core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.springsource.loaded.testdata.plugin/.project b/testdata-plugin/.project
similarity index 71%
rename from org.springsource.loaded.testdata.plugin/.project
rename to testdata-plugin/.project
index fb85425..0fd2703 100644
--- a/org.springsource.loaded.testdata.plugin/.project
+++ b/testdata-plugin/.project
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.springsource.loaded.testdata.plugin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
+	<name>testdata-plugin</name>
+	<comment/>
+	<projects/>
 	<natures>
 		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments/>
+		</buildCommand>
+	</buildSpec>
+	<linkedResources/>
 </projectDescription>
diff --git a/org.springsource.loaded.testdata.plugin/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/testdata-plugin/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
similarity index 100%
rename from org.springsource.loaded.testdata.plugin/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
rename to testdata-plugin/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
diff --git a/org.springsource.loaded.testdata.subloader/.settings/org.eclipse.jdt.core.prefs b/testdata-plugin/.settings/org.eclipse.jdt.core.prefs
similarity index 94%
rename from org.springsource.loaded.testdata.subloader/.settings/org.eclipse.jdt.core.prefs
rename to testdata-plugin/.settings/org.eclipse.jdt.core.prefs
index 4a3cbc4..ec688d3 100644
--- a/org.springsource.loaded.testdata.subloader/.settings/org.eclipse.jdt.core.prefs
+++ b/testdata-plugin/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,13 @@
-#Mon Feb 08 11:33:02 PST 2010
+#
+#Tue Jan 14 11:38:14 PST 2014
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.springsource.loaded.testdata.plugin/LICENSES/LICENSE b/testdata-plugin/LICENSES/LICENSE
similarity index 100%
rename from org.springsource.loaded.testdata.plugin/LICENSES/LICENSE
rename to testdata-plugin/LICENSES/LICENSE
diff --git a/org.springsource.loaded.testdata.plugin/build.gradle b/testdata-plugin/build.gradle
similarity index 61%
rename from org.springsource.loaded.testdata.plugin/build.gradle
rename to testdata-plugin/build.gradle
index ee4cf7f..db9a0fa 100644
--- a/org.springsource.loaded.testdata.plugin/build.gradle
+++ b/testdata-plugin/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-	compile project(":org.springsource.loaded")
+	compile project(":springloaded-core")
 }
 
 sourceSets {
diff --git a/org.springsource.loaded.testdata.plugin/src/main/java/com/test/plugins/ReloadEventProcessorPlugin1.java b/testdata-plugin/src/main/java/com/test/plugins/ReloadEventProcessorPlugin1.java
similarity index 100%
rename from org.springsource.loaded.testdata.plugin/src/main/java/com/test/plugins/ReloadEventProcessorPlugin1.java
rename to testdata-plugin/src/main/java/com/test/plugins/ReloadEventProcessorPlugin1.java
diff --git a/org.springsource.loaded.testdata.subloader/.classpath b/testdata-subloader/.classpath
similarity index 71%
rename from org.springsource.loaded.testdata.subloader/.classpath
rename to testdata-subloader/.classpath
index 787b8ed..16ebfa5 100644
--- a/org.springsource.loaded.testdata.subloader/.classpath
+++ b/testdata-subloader/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry exported="true" kind="src" path="/org.springsource.loaded.testdata.superloader"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="src" path="/testdata-superloader"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.springsource.loaded.testdata.subloader/.project b/testdata-subloader/.project
similarity index 71%
rename from org.springsource.loaded.testdata.subloader/.project
rename to testdata-subloader/.project
index 125afd5..bc50579 100644
--- a/org.springsource.loaded.testdata.subloader/.project
+++ b/testdata-subloader/.project
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.springsource.loaded.testdata.subloader</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
+	<name>testdata-subloader</name>
+	<comment/>
+	<projects/>
 	<natures>
 		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments/>
+		</buildCommand>
+	</buildSpec>
+	<linkedResources/>
 </projectDescription>
diff --git a/org.springsource.loaded.testdata.subloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/testdata-subloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
rename to testdata-subloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
diff --git a/org.springsource.loaded.testdata.groovy/.settings/org.eclipse.jdt.core.prefs b/testdata-subloader/.settings/org.eclipse.jdt.core.prefs
similarity index 94%
rename from org.springsource.loaded.testdata.groovy/.settings/org.eclipse.jdt.core.prefs
rename to testdata-subloader/.settings/org.eclipse.jdt.core.prefs
index 5198654..ec688d3 100644
--- a/org.springsource.loaded.testdata.groovy/.settings/org.eclipse.jdt.core.prefs
+++ b/testdata-subloader/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,13 @@
-#Fri Dec 03 07:39:45 PST 2010
+#
+#Tue Jan 14 11:38:14 PST 2014
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.springsource.loaded.testdata.subloader/LICENSES/LICENSE b/testdata-subloader/LICENSES/LICENSE
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/LICENSES/LICENSE
rename to testdata-subloader/LICENSES/LICENSE
diff --git a/org.springsource.loaded.testdata.subloader/build.gradle b/testdata-subloader/build.gradle
similarity index 52%
rename from org.springsource.loaded.testdata.subloader/build.gradle
rename to testdata-subloader/build.gradle
index 79cc620..cb534a1 100644
--- a/org.springsource.loaded.testdata.subloader/build.gradle
+++ b/testdata-subloader/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-	compile project(":org.springsource.loaded.testdata.superloader")
+	compile project(":testdata-superloader")
 }
 
 sourceSets {
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom.java b/testdata-subloader/src/main/java/subpkg/Bottom.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom.java
rename to testdata-subloader/src/main/java/subpkg/Bottom.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom002.java b/testdata-subloader/src/main/java/subpkg/Bottom002.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom002.java
rename to testdata-subloader/src/main/java/subpkg/Bottom002.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom003.java b/testdata-subloader/src/main/java/subpkg/Bottom003.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom003.java
rename to testdata-subloader/src/main/java/subpkg/Bottom003.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/BottomB.java b/testdata-subloader/src/main/java/subpkg/BottomB.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/BottomB.java
rename to testdata-subloader/src/main/java/subpkg/BottomB.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/BottomB002.java b/testdata-subloader/src/main/java/subpkg/BottomB002.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/BottomB002.java
rename to testdata-subloader/src/main/java/subpkg/BottomB002.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Invoker.java b/testdata-subloader/src/main/java/subpkg/Invoker.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Invoker.java
rename to testdata-subloader/src/main/java/subpkg/Invoker.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Invoker002.java b/testdata-subloader/src/main/java/subpkg/Invoker002.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Invoker002.java
rename to testdata-subloader/src/main/java/subpkg/Invoker002.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerB.java b/testdata-subloader/src/main/java/subpkg/InvokerB.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerB.java
rename to testdata-subloader/src/main/java/subpkg/InvokerB.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerB002.java b/testdata-subloader/src/main/java/subpkg/InvokerB002.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerB002.java
rename to testdata-subloader/src/main/java/subpkg/InvokerB002.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC.java b/testdata-subloader/src/main/java/subpkg/InvokerC.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC.java
rename to testdata-subloader/src/main/java/subpkg/InvokerC.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC002.java b/testdata-subloader/src/main/java/subpkg/InvokerC002.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC002.java
rename to testdata-subloader/src/main/java/subpkg/InvokerC002.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC003.java b/testdata-subloader/src/main/java/subpkg/InvokerC003.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC003.java
rename to testdata-subloader/src/main/java/subpkg/InvokerC003.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerD.java b/testdata-subloader/src/main/java/subpkg/InvokerD.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerD.java
rename to testdata-subloader/src/main/java/subpkg/InvokerD.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/ProxyBuilder.java b/testdata-subloader/src/main/java/subpkg/ProxyBuilder.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/ProxyBuilder.java
rename to testdata-subloader/src/main/java/subpkg/ProxyBuilder.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/ProxyTestcase.java b/testdata-subloader/src/main/java/subpkg/ProxyTestcase.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/ProxyTestcase.java
rename to testdata-subloader/src/main/java/subpkg/ProxyTestcase.java
diff --git a/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Subby.java b/testdata-subloader/src/main/java/subpkg/Subby.java
similarity index 100%
rename from org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Subby.java
rename to testdata-subloader/src/main/java/subpkg/Subby.java
diff --git a/testdata-superloader/.classpath b/testdata-superloader/.classpath
new file mode 100644
index 0000000..2f90a25
--- /dev/null
+++ b/testdata-superloader/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer" exported="true"/>
+	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" exported="true"/>
+	<classpathentry sourcepath="/Users/aclement/.gradle/caches/artifacts-26/filestore/cglib/cglib/2.2.2/source/fc1558bebc50419cdb55fbffd81c290e21f058c1/cglib-2.2.2-sources.jar" kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/cglib/cglib/2.2.2/jar/a47a971686474124562bdd4a7ccbd8ac8c3e8b11/cglib-2.2.2.jar" exported="true"/>
+</classpath>
diff --git a/org.springsource.loaded.testdata.superloader/.project b/testdata-superloader/.project
similarity index 71%
rename from org.springsource.loaded.testdata.superloader/.project
rename to testdata-superloader/.project
index 37bb365..d7e098e 100644
--- a/org.springsource.loaded.testdata.superloader/.project
+++ b/testdata-superloader/.project
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.springsource.loaded.testdata.superloader</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
+	<name>testdata-superloader</name>
+	<comment/>
+	<projects/>
 	<natures>
 		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments/>
+		</buildCommand>
+	</buildSpec>
+	<linkedResources/>
 </projectDescription>
diff --git a/org.springsource.loaded.testdata.superloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/testdata-superloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
rename to testdata-superloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
diff --git a/org.springsource.loaded.testdata.superloader/.settings/org.eclipse.jdt.core.prefs b/testdata-superloader/.settings/org.eclipse.jdt.core.prefs
similarity index 94%
rename from org.springsource.loaded.testdata.superloader/.settings/org.eclipse.jdt.core.prefs
rename to testdata-superloader/.settings/org.eclipse.jdt.core.prefs
index 4a3cbc4..ec688d3 100644
--- a/org.springsource.loaded.testdata.superloader/.settings/org.eclipse.jdt.core.prefs
+++ b/testdata-superloader/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,13 @@
-#Mon Feb 08 11:33:02 PST 2010
+#
+#Tue Jan 14 11:38:14 PST 2014
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.springsource.loaded.testdata.superloader/LICENSES/LICENSE b/testdata-superloader/LICENSES/LICENSE
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/LICENSES/LICENSE
rename to testdata-superloader/LICENSES/LICENSE
diff --git a/org.springsource.loaded.testdata.superloader/build.gradle b/testdata-superloader/build.gradle
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/build.gradle
rename to testdata-superloader/build.gradle
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/MyMethodInterceptor.java b/testdata-superloader/src/main/java/superpkg/MyMethodInterceptor.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/MyMethodInterceptor.java
rename to testdata-superloader/src/main/java/superpkg/MyMethodInterceptor.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Simple.java b/testdata-superloader/src/main/java/superpkg/Simple.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Simple.java
rename to testdata-superloader/src/main/java/superpkg/Simple.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Target.java b/testdata-superloader/src/main/java/superpkg/Target.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Target.java
rename to testdata-superloader/src/main/java/superpkg/Target.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Target002.java b/testdata-superloader/src/main/java/superpkg/Target002.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Target002.java
rename to testdata-superloader/src/main/java/superpkg/Target002.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetB.java b/testdata-superloader/src/main/java/superpkg/TargetB.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetB.java
rename to testdata-superloader/src/main/java/superpkg/TargetB.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetB002.java b/testdata-superloader/src/main/java/superpkg/TargetB002.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetB002.java
rename to testdata-superloader/src/main/java/superpkg/TargetB002.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetC.java b/testdata-superloader/src/main/java/superpkg/TargetC.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetC.java
rename to testdata-superloader/src/main/java/superpkg/TargetC.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetC002.java b/testdata-superloader/src/main/java/superpkg/TargetC002.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetC002.java
rename to testdata-superloader/src/main/java/superpkg/TargetC002.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetD.java b/testdata-superloader/src/main/java/superpkg/TargetD.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetD.java
rename to testdata-superloader/src/main/java/superpkg/TargetD.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetD002.java b/testdata-superloader/src/main/java/superpkg/TargetD002.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetD002.java
rename to testdata-superloader/src/main/java/superpkg/TargetD002.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetImplC.java b/testdata-superloader/src/main/java/superpkg/TargetImplC.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetImplC.java
rename to testdata-superloader/src/main/java/superpkg/TargetImplC.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetImplC002.java b/testdata-superloader/src/main/java/superpkg/TargetImplC002.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetImplC002.java
rename to testdata-superloader/src/main/java/superpkg/TargetImplC002.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top.java b/testdata-superloader/src/main/java/superpkg/Top.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top.java
rename to testdata-superloader/src/main/java/superpkg/Top.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top002.java b/testdata-superloader/src/main/java/superpkg/Top002.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top002.java
rename to testdata-superloader/src/main/java/superpkg/Top002.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top003.java b/testdata-superloader/src/main/java/superpkg/Top003.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top003.java
rename to testdata-superloader/src/main/java/superpkg/Top003.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TopB.java b/testdata-superloader/src/main/java/superpkg/TopB.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TopB.java
rename to testdata-superloader/src/main/java/superpkg/TopB.java
diff --git a/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TopB002.java b/testdata-superloader/src/main/java/superpkg/TopB002.java
similarity index 100%
rename from org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TopB002.java
rename to testdata-superloader/src/main/java/superpkg/TopB002.java
diff --git a/testdata/.classpath b/testdata/.classpath
new file mode 100644
index 0000000..8017d2e
--- /dev/null
+++ b/testdata/.classpath
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer" exported="true"/>
+	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" exported="true"/>
+	<classpathentry sourcepath="/Users/aclement/.gradle/caches/artifacts-26/filestore/org.aspectj/aspectjrt/1.7.1/source/86aa0e2952b2a370e04db7fc1a76b483909a38f/aspectjrt-1.7.1-sources.jar" kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/org.aspectj/aspectjrt/1.7.1/jar/e9ed47b6e3326c4a6666027978315028275ba8aa/aspectjrt-1.7.1.jar" exported="true"/>
+	<classpathentry sourcepath="/Users/aclement/.gradle/caches/artifacts-26/filestore/cglib/cglib/2.2.2/source/fc1558bebc50419cdb55fbffd81c290e21f058c1/cglib-2.2.2-sources.jar" kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/cglib/cglib/2.2.2/jar/a47a971686474124562bdd4a7ccbd8ac8c3e8b11/cglib-2.2.2.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/asm/asm/3.2/jar/9bc1511dec6adf302991ced13303e4140fdf9ab7/asm-3.2.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/.gradle/caches/artifacts-26/filestore/asm/asm-tree/3.2/jar/cd792e29c79d170c5d0bdd05adf5807cf6875c90/asm-tree-3.2.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/aclement/gits/spring-loaded/testdata/code.jar" exported="true"/>
+</classpath>
diff --git a/testdata/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch b/testdata/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch
new file mode 100644
index 0000000..7fe64af
--- /dev/null
+++ b/testdata/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.jdt.core.javabuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/org.springsource.loaded.testdata/.project b/testdata/.project
similarity index 55%
rename from org.springsource.loaded.testdata/.project
rename to testdata/.project
index deb47bc..402914e 100644
--- a/org.springsource.loaded.testdata/.project
+++ b/testdata/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.springsource.loaded.testdata</name>
+	<name>testdata</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -10,6 +10,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
diff --git a/org.springsource.loaded.testdata/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/testdata/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
similarity index 100%
rename from org.springsource.loaded.testdata/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
rename to testdata/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
diff --git a/testdata/.settings/org.eclipse.jdt.core.prefs b/testdata/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..e606011
--- /dev/null
+++ b/testdata/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,13 @@
+#
+#Tue Jan 14 11:38:13 PST 2014
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
diff --git a/org.springsource.loaded.testdata/LICENSES/LICENSE b/testdata/LICENSES/LICENSE
similarity index 100%
rename from org.springsource.loaded.testdata/LICENSES/LICENSE
rename to testdata/LICENSES/LICENSE
diff --git a/org.springsource.loaded.testdata/build.gradle b/testdata/build.gradle
similarity index 100%
rename from org.springsource.loaded.testdata/build.gradle
rename to testdata/build.gradle
diff --git a/org.springsource.loaded.testdata/code.jar b/testdata/code.jar
similarity index 100%
rename from org.springsource.loaded.testdata/code.jar
rename to testdata/code.jar
diff --git a/org.springsource.loaded.testdata/codejar/A.java b/testdata/codejar/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/codejar/A.java
rename to testdata/codejar/A.java
diff --git a/org.springsource.loaded.testdata/codejar/readme.txt b/testdata/codejar/readme.txt
similarity index 100%
rename from org.springsource.loaded.testdata/codejar/readme.txt
rename to testdata/codejar/readme.txt
diff --git a/org.springsource.loaded.testdata/lib/cglib-nodep-2.2.jar b/testdata/lib/cglib-nodep-2.2.jar
similarity index 100%
rename from org.springsource.loaded.testdata/lib/cglib-nodep-2.2.jar
rename to testdata/lib/cglib-nodep-2.2.jar
diff --git a/org.springsource.loaded.testdata/lib/spring-expression-4.0.0.M3.jar b/testdata/lib/spring-expression-4.0.0.M3.jar
similarity index 100%
rename from org.springsource.loaded.testdata/lib/spring-expression-4.0.0.M3.jar
rename to testdata/lib/spring-expression-4.0.0.M3.jar
diff --git a/org.springsource.loaded.testdata/meta1/META-INF/services/org.springsource.reloading.agent.Plugins b/testdata/meta1/META-INF/services/org.springsource.reloading.agent.Plugins
similarity index 100%
rename from org.springsource.loaded.testdata/meta1/META-INF/services/org.springsource.reloading.agent.Plugins
rename to testdata/meta1/META-INF/services/org.springsource.reloading.agent.Plugins
diff --git a/org.springsource.loaded.testdata/meta2/META-INF/services/org.springsource.reloading.agent.Plugins b/testdata/meta2/META-INF/services/org.springsource.reloading.agent.Plugins
similarity index 100%
rename from org.springsource.loaded.testdata/meta2/META-INF/services/org.springsource.reloading.agent.Plugins
rename to testdata/meta2/META-INF/services/org.springsource.reloading.agent.Plugins
diff --git a/org.springsource.loaded.testdata/meta3/META-INF/services/org.springsource.reloading.agent.Plugins b/testdata/meta3/META-INF/services/org.springsource.reloading.agent.Plugins
similarity index 100%
rename from org.springsource.loaded.testdata/meta3/META-INF/services/org.springsource.reloading.agent.Plugins
rename to testdata/meta3/META-INF/services/org.springsource.reloading.agent.Plugins
diff --git a/org.springsource.loaded.testdata/src/main/java/abs/AbsImpl.java b/testdata/src/main/java/abs/AbsImpl.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/abs/AbsImpl.java
rename to testdata/src/main/java/abs/AbsImpl.java
diff --git a/org.springsource.loaded.testdata/src/main/java/abs/AbsImpl2.java b/testdata/src/main/java/abs/AbsImpl2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/abs/AbsImpl2.java
rename to testdata/src/main/java/abs/AbsImpl2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/abs/Impl.java b/testdata/src/main/java/abs/Impl.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/abs/Impl.java
rename to testdata/src/main/java/abs/Impl.java
diff --git a/org.springsource.loaded.testdata/src/main/java/abs/Impl2.java b/testdata/src/main/java/abs/Impl2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/abs/Impl2.java
rename to testdata/src/main/java/abs/Impl2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/abs/Intface.java b/testdata/src/main/java/abs/Intface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/abs/Intface.java
rename to testdata/src/main/java/abs/Intface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/accessors/DefaultFields.java b/testdata/src/main/java/accessors/DefaultFields.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/accessors/DefaultFields.java
rename to testdata/src/main/java/accessors/DefaultFields.java
diff --git a/org.springsource.loaded.testdata/src/main/java/accessors/DefaultFieldsSub.java b/testdata/src/main/java/accessors/DefaultFieldsSub.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/accessors/DefaultFieldsSub.java
rename to testdata/src/main/java/accessors/DefaultFieldsSub.java
diff --git a/org.springsource.loaded.testdata/src/main/java/accessors/PrivateFields.java b/testdata/src/main/java/accessors/PrivateFields.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/accessors/PrivateFields.java
rename to testdata/src/main/java/accessors/PrivateFields.java
diff --git a/org.springsource.loaded.testdata/src/main/java/accessors/ProtectedFields.java b/testdata/src/main/java/accessors/ProtectedFields.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/accessors/ProtectedFields.java
rename to testdata/src/main/java/accessors/ProtectedFields.java
diff --git a/org.springsource.loaded.testdata/src/main/java/annos/AnnotatedType.java b/testdata/src/main/java/annos/AnnotatedType.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/annos/AnnotatedType.java
rename to testdata/src/main/java/annos/AnnotatedType.java
diff --git a/org.springsource.loaded.testdata/src/main/java/annos/AnnotatedType2.java b/testdata/src/main/java/annos/AnnotatedType2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/annos/AnnotatedType2.java
rename to testdata/src/main/java/annos/AnnotatedType2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/annos/Foo2.java b/testdata/src/main/java/annos/Foo2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/annos/Foo2.java
rename to testdata/src/main/java/annos/Foo2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/annos/Play.java b/testdata/src/main/java/annos/Play.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/annos/Play.java
rename to testdata/src/main/java/annos/Play.java
diff --git a/org.springsource.loaded.testdata/src/main/java/annos/Play2.java b/testdata/src/main/java/annos/Play2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/annos/Play2.java
rename to testdata/src/main/java/annos/Play2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/annos/SimpleAnnotation.java b/testdata/src/main/java/annos/SimpleAnnotation.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/annos/SimpleAnnotation.java
rename to testdata/src/main/java/annos/SimpleAnnotation.java
diff --git a/org.springsource.loaded.testdata/src/main/java/annos/SimpleAnnotation2.java b/testdata/src/main/java/annos/SimpleAnnotation2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/annos/SimpleAnnotation2.java
rename to testdata/src/main/java/annos/SimpleAnnotation2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/baddata/One.java b/testdata/src/main/java/baddata/One.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/baddata/One.java
rename to testdata/src/main/java/baddata/One.java
diff --git a/org.springsource.loaded.testdata/src/main/java/baddata/OneA.java b/testdata/src/main/java/baddata/OneA.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/baddata/OneA.java
rename to testdata/src/main/java/baddata/OneA.java
diff --git a/org.springsource.loaded.testdata/src/main/java/baddata/OneB.java b/testdata/src/main/java/baddata/OneB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/baddata/OneB.java
rename to testdata/src/main/java/baddata/OneB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/basic/Basic.java b/testdata/src/main/java/basic/Basic.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/basic/Basic.java
rename to testdata/src/main/java/basic/Basic.java
diff --git a/org.springsource.loaded.testdata/src/main/java/basic/Basic002.java b/testdata/src/main/java/basic/Basic002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/basic/Basic002.java
rename to testdata/src/main/java/basic/Basic002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/basic/Basic003.java b/testdata/src/main/java/basic/Basic003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/basic/Basic003.java
rename to testdata/src/main/java/basic/Basic003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/basic/Basic004.java b/testdata/src/main/java/basic/Basic004.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/basic/Basic004.java
rename to testdata/src/main/java/basic/Basic004.java
diff --git a/org.springsource.loaded.testdata/src/main/java/basic/BasicB.java b/testdata/src/main/java/basic/BasicB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/basic/BasicB.java
rename to testdata/src/main/java/basic/BasicB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/basic/BasicC.java b/testdata/src/main/java/basic/BasicC.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/basic/BasicC.java
rename to testdata/src/main/java/basic/BasicC.java
diff --git a/org.springsource.loaded.testdata/src/main/java/basic/Bottom.java b/testdata/src/main/java/basic/Bottom.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/basic/Bottom.java
rename to testdata/src/main/java/basic/Bottom.java
diff --git a/org.springsource.loaded.testdata/src/main/java/basic/Bottom2.java b/testdata/src/main/java/basic/Bottom2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/basic/Bottom2.java
rename to testdata/src/main/java/basic/Bottom2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/basic/Top.java b/testdata/src/main/java/basic/Top.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/basic/Top.java
rename to testdata/src/main/java/basic/Top.java
diff --git a/org.springsource.loaded.testdata/src/main/java/basic/Top2.java b/testdata/src/main/java/basic/Top2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/basic/Top2.java
rename to testdata/src/main/java/basic/Top2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/benchmarks/MethodInvoking.java b/testdata/src/main/java/benchmarks/MethodInvoking.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/benchmarks/MethodInvoking.java
rename to testdata/src/main/java/benchmarks/MethodInvoking.java
diff --git a/org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne.java b/testdata/src/main/java/builder/DispatcherTestOne.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne.java
rename to testdata/src/main/java/builder/DispatcherTestOne.java
diff --git a/org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne002.java b/testdata/src/main/java/builder/DispatcherTestOne002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne002.java
rename to testdata/src/main/java/builder/DispatcherTestOne002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne003.java b/testdata/src/main/java/builder/DispatcherTestOne003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne003.java
rename to testdata/src/main/java/builder/DispatcherTestOne003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/A.java b/testdata/src/main/java/catchers/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/A.java
rename to testdata/src/main/java/catchers/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/B.java b/testdata/src/main/java/catchers/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/B.java
rename to testdata/src/main/java/catchers/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/B2.java b/testdata/src/main/java/catchers/B2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/B2.java
rename to testdata/src/main/java/catchers/B2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/Bottom.java b/testdata/src/main/java/catchers/Bottom.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/Bottom.java
rename to testdata/src/main/java/catchers/Bottom.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/Finality.java b/testdata/src/main/java/catchers/Finality.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/Finality.java
rename to testdata/src/main/java/catchers/Finality.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/Middle.java b/testdata/src/main/java/catchers/Middle.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/Middle.java
rename to testdata/src/main/java/catchers/Middle.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/Runner.java b/testdata/src/main/java/catchers/Runner.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/Runner.java
rename to testdata/src/main/java/catchers/Runner.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/Runner2.java b/testdata/src/main/java/catchers/Runner2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/Runner2.java
rename to testdata/src/main/java/catchers/Runner2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/SimpleCatcher.java b/testdata/src/main/java/catchers/SimpleCatcher.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/SimpleCatcher.java
rename to testdata/src/main/java/catchers/SimpleCatcher.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/Top.java b/testdata/src/main/java/catchers/Top.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/Top.java
rename to testdata/src/main/java/catchers/Top.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/X.java b/testdata/src/main/java/catchers/X.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/X.java
rename to testdata/src/main/java/catchers/X.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/Y.java b/testdata/src/main/java/catchers/Y.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/Y.java
rename to testdata/src/main/java/catchers/Y.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/Y2.java b/testdata/src/main/java/catchers/Y2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/Y2.java
rename to testdata/src/main/java/catchers/Y2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/Z.java b/testdata/src/main/java/catchers/Z.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/Z.java
rename to testdata/src/main/java/catchers/Z.java
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/play.class b/testdata/src/main/java/catchers/play.class
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/play.class
rename to testdata/src/main/java/catchers/play.class
diff --git a/org.springsource.loaded.testdata/src/main/java/catchers/play.java b/testdata/src/main/java/catchers/play.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/catchers/play.java
rename to testdata/src/main/java/catchers/play.java
diff --git a/org.springsource.loaded.testdata/src/main/java/clinit/One.java b/testdata/src/main/java/clinit/One.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/clinit/One.java
rename to testdata/src/main/java/clinit/One.java
diff --git a/org.springsource.loaded.testdata/src/main/java/clinit/One2.java b/testdata/src/main/java/clinit/One2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/clinit/One2.java
rename to testdata/src/main/java/clinit/One2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/clinit/Three.java b/testdata/src/main/java/clinit/Three.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/clinit/Three.java
rename to testdata/src/main/java/clinit/Three.java
diff --git a/org.springsource.loaded.testdata/src/main/java/clinit/Three2.java b/testdata/src/main/java/clinit/Three2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/clinit/Three2.java
rename to testdata/src/main/java/clinit/Three2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/clinit/Three3.java b/testdata/src/main/java/clinit/Three3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/clinit/Three3.java
rename to testdata/src/main/java/clinit/Three3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/clinit/Two.java b/testdata/src/main/java/clinit/Two.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/clinit/Two.java
rename to testdata/src/main/java/clinit/Two.java
diff --git a/org.springsource.loaded.testdata/src/main/java/clinit/Two2.java b/testdata/src/main/java/clinit/Two2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/clinit/Two2.java
rename to testdata/src/main/java/clinit/Two2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/codegen/Simple.java b/testdata/src/main/java/codegen/Simple.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/codegen/Simple.java
rename to testdata/src/main/java/codegen/Simple.java
diff --git a/org.springsource.loaded.testdata/src/main/java/com/demo/Bar.java b/testdata/src/main/java/com/demo/Bar.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/com/demo/Bar.java
rename to testdata/src/main/java/com/demo/Bar.java
diff --git a/org.springsource.loaded.testdata/src/main/java/com/demo/Foo.java b/testdata/src/main/java/com/demo/Foo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/com/demo/Foo.java
rename to testdata/src/main/java/com/demo/Foo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/common/Anno.java b/testdata/src/main/java/common/Anno.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/common/Anno.java
rename to testdata/src/main/java/common/Anno.java
diff --git a/org.springsource.loaded.testdata/src/main/java/common/Marker.java b/testdata/src/main/java/common/Marker.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/common/Marker.java
rename to testdata/src/main/java/common/Marker.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/A.java b/testdata/src/main/java/ctors/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/A.java
rename to testdata/src/main/java/ctors/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/B.java b/testdata/src/main/java/ctors/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/B.java
rename to testdata/src/main/java/ctors/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/B2.java b/testdata/src/main/java/ctors/B2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/B2.java
rename to testdata/src/main/java/ctors/B2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Callee.java b/testdata/src/main/java/ctors/Callee.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Callee.java
rename to testdata/src/main/java/ctors/Callee.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Callee2.java b/testdata/src/main/java/ctors/Callee2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Callee2.java
rename to testdata/src/main/java/ctors/Callee2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/CalleeB.java b/testdata/src/main/java/ctors/CalleeB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/CalleeB.java
rename to testdata/src/main/java/ctors/CalleeB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/CalleeB2.java b/testdata/src/main/java/ctors/CalleeB2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/CalleeB2.java
rename to testdata/src/main/java/ctors/CalleeB2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/CalleeSuperB.java b/testdata/src/main/java/ctors/CalleeSuperB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/CalleeSuperB.java
rename to testdata/src/main/java/ctors/CalleeSuperB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/CalleeSuperB2.java b/testdata/src/main/java/ctors/CalleeSuperB2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/CalleeSuperB2.java
rename to testdata/src/main/java/ctors/CalleeSuperB2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Caller.java b/testdata/src/main/java/ctors/Caller.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Caller.java
rename to testdata/src/main/java/ctors/Caller.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Caller2.java b/testdata/src/main/java/ctors/Caller2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Caller2.java
rename to testdata/src/main/java/ctors/Caller2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/CallerB.java b/testdata/src/main/java/ctors/CallerB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/CallerB.java
rename to testdata/src/main/java/ctors/CallerB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/CallerB2.java b/testdata/src/main/java/ctors/CallerB2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/CallerB2.java
rename to testdata/src/main/java/ctors/CallerB2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Default.java b/testdata/src/main/java/ctors/Default.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Default.java
rename to testdata/src/main/java/ctors/Default.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Finals.java b/testdata/src/main/java/ctors/Finals.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Finals.java
rename to testdata/src/main/java/ctors/Finals.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Finals2.java b/testdata/src/main/java/ctors/Finals2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Finals2.java
rename to testdata/src/main/java/ctors/Finals2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/JR.java b/testdata/src/main/java/ctors/JR.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/JR.java
rename to testdata/src/main/java/ctors/JR.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/JR2.java b/testdata/src/main/java/ctors/JR2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/JR2.java
rename to testdata/src/main/java/ctors/JR2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/One.java b/testdata/src/main/java/ctors/One.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/One.java
rename to testdata/src/main/java/ctors/One.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/One2.java b/testdata/src/main/java/ctors/One2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/One2.java
rename to testdata/src/main/java/ctors/One2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Setter.java b/testdata/src/main/java/ctors/Setter.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Setter.java
rename to testdata/src/main/java/ctors/Setter.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Setter2.java b/testdata/src/main/java/ctors/Setter2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Setter2.java
rename to testdata/src/main/java/ctors/Setter2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Setter3.java b/testdata/src/main/java/ctors/Setter3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Setter3.java
rename to testdata/src/main/java/ctors/Setter3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/SuperThree.java b/testdata/src/main/java/ctors/SuperThree.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/SuperThree.java
rename to testdata/src/main/java/ctors/SuperThree.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/SuperThree2.java b/testdata/src/main/java/ctors/SuperThree2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/SuperThree2.java
rename to testdata/src/main/java/ctors/SuperThree2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Three.java b/testdata/src/main/java/ctors/Three.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Three.java
rename to testdata/src/main/java/ctors/Three.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Three2.java b/testdata/src/main/java/ctors/Three2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Three2.java
rename to testdata/src/main/java/ctors/Three2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Two.class b/testdata/src/main/java/ctors/Two.class
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Two.class
rename to testdata/src/main/java/ctors/Two.class
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Two.java b/testdata/src/main/java/ctors/Two.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Two.java
rename to testdata/src/main/java/ctors/Two.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Two2.java b/testdata/src/main/java/ctors/Two2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Two2.java
rename to testdata/src/main/java/ctors/Two2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/Utils.java b/testdata/src/main/java/ctors/Utils.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/Utils.java
rename to testdata/src/main/java/ctors/Utils.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/V.java b/testdata/src/main/java/ctors/V.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/V.java
rename to testdata/src/main/java/ctors/V.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/V2.java b/testdata/src/main/java/ctors/V2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/V2.java
rename to testdata/src/main/java/ctors/V2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/V3.java b/testdata/src/main/java/ctors/V3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/V3.java
rename to testdata/src/main/java/ctors/V3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/XX.java b/testdata/src/main/java/ctors/XX.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/XX.java
rename to testdata/src/main/java/ctors/XX.java
diff --git a/org.springsource.loaded.testdata/src/main/java/ctors/XX2.java b/testdata/src/main/java/ctors/XX2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/ctors/XX2.java
rename to testdata/src/main/java/ctors/XX2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/AnAspect.java b/testdata/src/main/java/data/AnAspect.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/AnAspect.java
rename to testdata/src/main/java/data/AnAspect.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Anno.java b/testdata/src/main/java/data/Anno.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Anno.java
rename to testdata/src/main/java/data/Anno.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/AnnotatedClazz.java b/testdata/src/main/java/data/AnnotatedClazz.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/AnnotatedClazz.java
rename to testdata/src/main/java/data/AnnotatedClazz.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Apple.java b/testdata/src/main/java/data/Apple.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Apple.java
rename to testdata/src/main/java/data/Apple.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Apple002.java b/testdata/src/main/java/data/Apple002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Apple002.java
rename to testdata/src/main/java/data/Apple002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Apple003.java b/testdata/src/main/java/data/Apple003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Apple003.java
rename to testdata/src/main/java/data/Apple003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/AspectReceiver.java b/testdata/src/main/java/data/AspectReceiver.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/AspectReceiver.java
rename to testdata/src/main/java/data/AspectReceiver.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Banana.java b/testdata/src/main/java/data/Banana.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Banana.java
rename to testdata/src/main/java/data/Banana.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/BottomType.java b/testdata/src/main/java/data/BottomType.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/BottomType.java
rename to testdata/src/main/java/data/BottomType.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/ComplexClass.java b/testdata/src/main/java/data/ComplexClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/ComplexClass.java
rename to testdata/src/main/java/data/ComplexClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/DemoMethods.java b/testdata/src/main/java/data/DemoMethods.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/DemoMethods.java
rename to testdata/src/main/java/data/DemoMethods.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/DemoMethods2.java b/testdata/src/main/java/data/DemoMethods2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/DemoMethods2.java
rename to testdata/src/main/java/data/DemoMethods2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/FieldsB.java b/testdata/src/main/java/data/FieldsB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/FieldsB.java
rename to testdata/src/main/java/data/FieldsB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Foo.java b/testdata/src/main/java/data/Foo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Foo.java
rename to testdata/src/main/java/data/Foo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Fruity.java b/testdata/src/main/java/data/Fruity.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Fruity.java
rename to testdata/src/main/java/data/Fruity.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Fruity002.java b/testdata/src/main/java/data/Fruity002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Fruity002.java
rename to testdata/src/main/java/data/Fruity002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Fruity003.java b/testdata/src/main/java/data/Fruity003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Fruity003.java
rename to testdata/src/main/java/data/Fruity003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/HelloWorld.java b/testdata/src/main/java/data/HelloWorld.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/HelloWorld.java
rename to testdata/src/main/java/data/HelloWorld.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/HelloWorld002.java b/testdata/src/main/java/data/HelloWorld002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/HelloWorld002.java
rename to testdata/src/main/java/data/HelloWorld002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/HelloWorldClinit.java b/testdata/src/main/java/data/HelloWorldClinit.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/HelloWorldClinit.java
rename to testdata/src/main/java/data/HelloWorldClinit.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/HelloWorldClinit002.java b/testdata/src/main/java/data/HelloWorldClinit002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/HelloWorldClinit002.java
rename to testdata/src/main/java/data/HelloWorldClinit002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/HelloWorldFields.java b/testdata/src/main/java/data/HelloWorldFields.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/HelloWorldFields.java
rename to testdata/src/main/java/data/HelloWorldFields.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/HelloWorldFields002.java b/testdata/src/main/java/data/HelloWorldFields002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/HelloWorldFields002.java
rename to testdata/src/main/java/data/HelloWorldFields002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/HelloWorldPrimitive.java b/testdata/src/main/java/data/HelloWorldPrimitive.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/HelloWorldPrimitive.java
rename to testdata/src/main/java/data/HelloWorldPrimitive.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/HelloWorldPrimitive002.java b/testdata/src/main/java/data/HelloWorldPrimitive002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/HelloWorldPrimitive002.java
rename to testdata/src/main/java/data/HelloWorldPrimitive002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/HelloWorldStaticFields.java b/testdata/src/main/java/data/HelloWorldStaticFields.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/HelloWorldStaticFields.java
rename to testdata/src/main/java/data/HelloWorldStaticFields.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/HelloWorldStaticFields002.java b/testdata/src/main/java/data/HelloWorldStaticFields002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/HelloWorldStaticFields002.java
rename to testdata/src/main/java/data/HelloWorldStaticFields002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Kiwi.java b/testdata/src/main/java/data/Kiwi.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Kiwi.java
rename to testdata/src/main/java/data/Kiwi.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/MiddleType.java b/testdata/src/main/java/data/MiddleType.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/MiddleType.java
rename to testdata/src/main/java/data/MiddleType.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Orange.java b/testdata/src/main/java/data/Orange.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Orange.java
rename to testdata/src/main/java/data/Orange.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Orange002.java b/testdata/src/main/java/data/Orange002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Orange002.java
rename to testdata/src/main/java/data/Orange002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Pear.java b/testdata/src/main/java/data/Pear.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Pear.java
rename to testdata/src/main/java/data/Pear.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Plum.java b/testdata/src/main/java/data/Plum.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Plum.java
rename to testdata/src/main/java/data/Plum.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Plum002.java b/testdata/src/main/java/data/Plum002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Plum002.java
rename to testdata/src/main/java/data/Plum002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Reflector.java b/testdata/src/main/java/data/Reflector.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Reflector.java
rename to testdata/src/main/java/data/Reflector.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Runner.java b/testdata/src/main/java/data/Runner.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Runner.java
rename to testdata/src/main/java/data/Runner.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/ScenarioA.java b/testdata/src/main/java/data/ScenarioA.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/ScenarioA.java
rename to testdata/src/main/java/data/ScenarioA.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/ScenarioA002.java b/testdata/src/main/java/data/ScenarioA002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/ScenarioA002.java
rename to testdata/src/main/java/data/ScenarioA002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/ScenarioA003.java b/testdata/src/main/java/data/ScenarioA003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/ScenarioA003.java
rename to testdata/src/main/java/data/ScenarioA003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/ScenarioA004.java b/testdata/src/main/java/data/ScenarioA004.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/ScenarioA004.java
rename to testdata/src/main/java/data/ScenarioA004.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/ScenarioB.java b/testdata/src/main/java/data/ScenarioB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/ScenarioB.java
rename to testdata/src/main/java/data/ScenarioB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/ScenarioB002.java b/testdata/src/main/java/data/ScenarioB002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/ScenarioB002.java
rename to testdata/src/main/java/data/ScenarioB002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/ScenarioB003.java b/testdata/src/main/java/data/ScenarioB003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/ScenarioB003.java
rename to testdata/src/main/java/data/ScenarioB003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Simple.java b/testdata/src/main/java/data/Simple.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Simple.java
rename to testdata/src/main/java/data/Simple.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SimpleClass.java b/testdata/src/main/java/data/SimpleClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SimpleClass.java
rename to testdata/src/main/java/data/SimpleClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SimpleClass002.java b/testdata/src/main/java/data/SimpleClass002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SimpleClass002.java
rename to testdata/src/main/java/data/SimpleClass002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SimpleClassCaller.java b/testdata/src/main/java/data/SimpleClassCaller.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SimpleClassCaller.java
rename to testdata/src/main/java/data/SimpleClassCaller.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SimpleClassFour.java b/testdata/src/main/java/data/SimpleClassFour.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SimpleClassFour.java
rename to testdata/src/main/java/data/SimpleClassFour.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SimpleClassFour002.java b/testdata/src/main/java/data/SimpleClassFour002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SimpleClassFour002.java
rename to testdata/src/main/java/data/SimpleClassFour002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SimpleClassThree.java b/testdata/src/main/java/data/SimpleClassThree.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SimpleClassThree.java
rename to testdata/src/main/java/data/SimpleClassThree.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SimpleClassTwo.java b/testdata/src/main/java/data/SimpleClassTwo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SimpleClassTwo.java
rename to testdata/src/main/java/data/SimpleClassTwo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SomeConstructors.java b/testdata/src/main/java/data/SomeConstructors.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SomeConstructors.java
rename to testdata/src/main/java/data/SomeConstructors.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SomeConstructors002.java b/testdata/src/main/java/data/SomeConstructors002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SomeConstructors002.java
rename to testdata/src/main/java/data/SomeConstructors002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SomeConstructors2.java b/testdata/src/main/java/data/SomeConstructors2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SomeConstructors2.java
rename to testdata/src/main/java/data/SomeConstructors2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/SomeFields.java b/testdata/src/main/java/data/SomeFields.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/SomeFields.java
rename to testdata/src/main/java/data/SomeFields.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/StaticFieldsB.java b/testdata/src/main/java/data/StaticFieldsB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/StaticFieldsB.java
rename to testdata/src/main/java/data/StaticFieldsB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/TopType.java b/testdata/src/main/java/data/TopType.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/TopType.java
rename to testdata/src/main/java/data/TopType.java
diff --git a/org.springsource.loaded.testdata/src/main/java/data/Wiggle.java b/testdata/src/main/java/data/Wiggle.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/data/Wiggle.java
rename to testdata/src/main/java/data/Wiggle.java
diff --git a/org.springsource.loaded.testdata/src/main/java/dd/Middle.java b/testdata/src/main/java/dd/Middle.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/dd/Middle.java
rename to testdata/src/main/java/dd/Middle.java
diff --git a/org.springsource.loaded.testdata/src/main/java/dd/Top.java b/testdata/src/main/java/dd/Top.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/dd/Top.java
rename to testdata/src/main/java/dd/Top.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/Annot.java b/testdata/src/main/java/differs/Annot.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/Annot.java
rename to testdata/src/main/java/differs/Annot.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/Annot2.java b/testdata/src/main/java/differs/Annot2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/Annot2.java
rename to testdata/src/main/java/differs/Annot2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/AnnotFields.java b/testdata/src/main/java/differs/AnnotFields.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/AnnotFields.java
rename to testdata/src/main/java/differs/AnnotFields.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/AnnotFields2.java b/testdata/src/main/java/differs/AnnotFields2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/AnnotFields2.java
rename to testdata/src/main/java/differs/AnnotFields2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/AnnotFieldsTwo.java b/testdata/src/main/java/differs/AnnotFieldsTwo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/AnnotFieldsTwo.java
rename to testdata/src/main/java/differs/AnnotFieldsTwo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/AnnotFieldsTwo2.java b/testdata/src/main/java/differs/AnnotFieldsTwo2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/AnnotFieldsTwo2.java
rename to testdata/src/main/java/differs/AnnotFieldsTwo2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffOne.java b/testdata/src/main/java/differs/DiffOne.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffOne.java
rename to testdata/src/main/java/differs/DiffOne.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffOneX.java b/testdata/src/main/java/differs/DiffOneX.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffOneX.java
rename to testdata/src/main/java/differs/DiffOneX.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffOneY.java b/testdata/src/main/java/differs/DiffOneY.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffOneY.java
rename to testdata/src/main/java/differs/DiffOneY.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffOneZ.java b/testdata/src/main/java/differs/DiffOneZ.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffOneZ.java
rename to testdata/src/main/java/differs/DiffOneZ.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffThree.java b/testdata/src/main/java/differs/DiffThree.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffThree.java
rename to testdata/src/main/java/differs/DiffThree.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffThreeX.java b/testdata/src/main/java/differs/DiffThreeX.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffThreeX.java
rename to testdata/src/main/java/differs/DiffThreeX.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffThreeY.java b/testdata/src/main/java/differs/DiffThreeY.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffThreeY.java
rename to testdata/src/main/java/differs/DiffThreeY.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffTwo.java b/testdata/src/main/java/differs/DiffTwo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffTwo.java
rename to testdata/src/main/java/differs/DiffTwo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffTwoX.java b/testdata/src/main/java/differs/DiffTwoX.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffTwoX.java
rename to testdata/src/main/java/differs/DiffTwoX.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffTwoY.java b/testdata/src/main/java/differs/DiffTwoY.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffTwoY.java
rename to testdata/src/main/java/differs/DiffTwoY.java
diff --git a/org.springsource.loaded.testdata/src/main/java/differs/DiffTwoZ.java b/testdata/src/main/java/differs/DiffTwoZ.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/differs/DiffTwoZ.java
rename to testdata/src/main/java/differs/DiffTwoZ.java
diff --git a/org.springsource.loaded.testdata/src/main/java/dispatcher/C.java b/testdata/src/main/java/dispatcher/C.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/dispatcher/C.java
rename to testdata/src/main/java/dispatcher/C.java
diff --git a/org.springsource.loaded.testdata/src/main/java/dispatcher/CallC.java b/testdata/src/main/java/dispatcher/CallC.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/dispatcher/CallC.java
rename to testdata/src/main/java/dispatcher/CallC.java
diff --git a/org.springsource.loaded.testdata/src/main/java/dispatcher/Staticmethod.java b/testdata/src/main/java/dispatcher/Staticmethod.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/dispatcher/Staticmethod.java
rename to testdata/src/main/java/dispatcher/Staticmethod.java
diff --git a/org.springsource.loaded.testdata/src/main/java/dispatcher/StaticmethodCaller.java b/testdata/src/main/java/dispatcher/StaticmethodCaller.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/dispatcher/StaticmethodCaller.java
rename to testdata/src/main/java/dispatcher/StaticmethodCaller.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/Colours.java b/testdata/src/main/java/enumtests/Colours.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/Colours.java
rename to testdata/src/main/java/enumtests/Colours.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/Colours2.java b/testdata/src/main/java/enumtests/Colours2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/Colours2.java
rename to testdata/src/main/java/enumtests/Colours2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB.java b/testdata/src/main/java/enumtests/ColoursB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB.java
rename to testdata/src/main/java/enumtests/ColoursB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB2.java b/testdata/src/main/java/enumtests/ColoursB2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB2.java
rename to testdata/src/main/java/enumtests/ColoursB2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB3.java b/testdata/src/main/java/enumtests/ColoursB3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB3.java
rename to testdata/src/main/java/enumtests/ColoursB3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursC.java b/testdata/src/main/java/enumtests/ColoursC.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/ColoursC.java
rename to testdata/src/main/java/enumtests/ColoursC.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursC2.java b/testdata/src/main/java/enumtests/ColoursC2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/ColoursC2.java
rename to testdata/src/main/java/enumtests/ColoursC2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursD.java b/testdata/src/main/java/enumtests/ColoursD.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/ColoursD.java
rename to testdata/src/main/java/enumtests/ColoursD.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursD2.java b/testdata/src/main/java/enumtests/ColoursD2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/ColoursD2.java
rename to testdata/src/main/java/enumtests/ColoursD2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursE.java b/testdata/src/main/java/enumtests/ColoursE.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/ColoursE.java
rename to testdata/src/main/java/enumtests/ColoursE.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursE2.java b/testdata/src/main/java/enumtests/ColoursE2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/ColoursE2.java
rename to testdata/src/main/java/enumtests/ColoursE2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/Intface.java b/testdata/src/main/java/enumtests/Intface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/Intface.java
rename to testdata/src/main/java/enumtests/Intface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/Intface3.java b/testdata/src/main/java/enumtests/Intface3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/Intface3.java
rename to testdata/src/main/java/enumtests/Intface3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerA.java b/testdata/src/main/java/enumtests/RunnerA.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/RunnerA.java
rename to testdata/src/main/java/enumtests/RunnerA.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerB.java b/testdata/src/main/java/enumtests/RunnerB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/RunnerB.java
rename to testdata/src/main/java/enumtests/RunnerB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerB3.java b/testdata/src/main/java/enumtests/RunnerB3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/RunnerB3.java
rename to testdata/src/main/java/enumtests/RunnerB3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerC.java b/testdata/src/main/java/enumtests/RunnerC.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/RunnerC.java
rename to testdata/src/main/java/enumtests/RunnerC.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerD.java b/testdata/src/main/java/enumtests/RunnerD.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/RunnerD.java
rename to testdata/src/main/java/enumtests/RunnerD.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerD2.java b/testdata/src/main/java/enumtests/RunnerD2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/RunnerD2.java
rename to testdata/src/main/java/enumtests/RunnerD2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerE.java b/testdata/src/main/java/enumtests/RunnerE.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/RunnerE.java
rename to testdata/src/main/java/enumtests/RunnerE.java
diff --git a/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerE2.java b/testdata/src/main/java/enumtests/RunnerE2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/enumtests/RunnerE2.java
rename to testdata/src/main/java/enumtests/RunnerE2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/example/MyMethodInterceptor.java b/testdata/src/main/java/example/MyMethodInterceptor.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/example/MyMethodInterceptor.java
rename to testdata/src/main/java/example/MyMethodInterceptor.java
diff --git a/org.springsource.loaded.testdata/src/main/java/example/ProxyBuilder.java b/testdata/src/main/java/example/ProxyBuilder.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/example/ProxyBuilder.java
rename to testdata/src/main/java/example/ProxyBuilder.java
diff --git a/org.springsource.loaded.testdata/src/main/java/example/ProxyTestcase.java b/testdata/src/main/java/example/ProxyTestcase.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/example/ProxyTestcase.java
rename to testdata/src/main/java/example/ProxyTestcase.java
diff --git a/org.springsource.loaded.testdata/src/main/java/example/ProxyTestcase2.java b/testdata/src/main/java/example/ProxyTestcase2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/example/ProxyTestcase2.java
rename to testdata/src/main/java/example/ProxyTestcase2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/example/Simple.java b/testdata/src/main/java/example/Simple.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/example/Simple.java
rename to testdata/src/main/java/example/Simple.java
diff --git a/org.springsource.loaded.testdata/src/main/java/example/Simple2.java b/testdata/src/main/java/example/Simple2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/example/Simple2.java
rename to testdata/src/main/java/example/Simple2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/executor/A.java b/testdata/src/main/java/executor/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/executor/A.java
rename to testdata/src/main/java/executor/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/executor/A2.java b/testdata/src/main/java/executor/A2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/executor/A2.java
rename to testdata/src/main/java/executor/A2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/executor/B.java b/testdata/src/main/java/executor/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/executor/B.java
rename to testdata/src/main/java/executor/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/executor/B2.java b/testdata/src/main/java/executor/B2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/executor/B2.java
rename to testdata/src/main/java/executor/B2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/executor/C.java b/testdata/src/main/java/executor/C.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/executor/C.java
rename to testdata/src/main/java/executor/C.java
diff --git a/org.springsource.loaded.testdata/src/main/java/executor/I.java b/testdata/src/main/java/executor/I.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/executor/I.java
rename to testdata/src/main/java/executor/I.java
diff --git a/org.springsource.loaded.testdata/src/main/java/executor/I2.java b/testdata/src/main/java/executor/I2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/executor/I2.java
rename to testdata/src/main/java/executor/I2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/executor/TestOne.java b/testdata/src/main/java/executor/TestOne.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/executor/TestOne.java
rename to testdata/src/main/java/executor/TestOne.java
diff --git a/org.springsource.loaded.testdata/src/main/java/executor/TestOne2.java b/testdata/src/main/java/executor/TestOne2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/executor/TestOne2.java
rename to testdata/src/main/java/executor/TestOne2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/A.java b/testdata/src/main/java/fields/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/A.java
rename to testdata/src/main/java/fields/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Aa.java b/testdata/src/main/java/fields/Aa.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Aa.java
rename to testdata/src/main/java/fields/Aa.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Add.java b/testdata/src/main/java/fields/Add.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Add.java
rename to testdata/src/main/java/fields/Add.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Add002.java b/testdata/src/main/java/fields/Add002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Add002.java
rename to testdata/src/main/java/fields/Add002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/AddB.java b/testdata/src/main/java/fields/AddB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/AddB.java
rename to testdata/src/main/java/fields/AddB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/AddB002.java b/testdata/src/main/java/fields/AddB002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/AddB002.java
rename to testdata/src/main/java/fields/AddB002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/B.java b/testdata/src/main/java/fields/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/B.java
rename to testdata/src/main/java/fields/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/B2.java b/testdata/src/main/java/fields/B2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/B2.java
rename to testdata/src/main/java/fields/B2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ba.java b/testdata/src/main/java/fields/Ba.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ba.java
rename to testdata/src/main/java/fields/Ba.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ba2.java b/testdata/src/main/java/fields/Ba2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ba2.java
rename to testdata/src/main/java/fields/Ba2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/C.java b/testdata/src/main/java/fields/C.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/C.java
rename to testdata/src/main/java/fields/C.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ca.java b/testdata/src/main/java/fields/Ca.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ca.java
rename to testdata/src/main/java/fields/Ca.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/E.java b/testdata/src/main/java/fields/E.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/E.java
rename to testdata/src/main/java/fields/E.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/E2.java b/testdata/src/main/java/fields/E2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/E2.java
rename to testdata/src/main/java/fields/E2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ia.java b/testdata/src/main/java/fields/Ia.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ia.java
rename to testdata/src/main/java/fields/Ia.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ic.java b/testdata/src/main/java/fields/Ic.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ic.java
rename to testdata/src/main/java/fields/Ic.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ja.java b/testdata/src/main/java/fields/Ja.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ja.java
rename to testdata/src/main/java/fields/Ja.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ka.java b/testdata/src/main/java/fields/Ka.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ka.java
rename to testdata/src/main/java/fields/Ka.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ka002.java b/testdata/src/main/java/fields/Ka002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ka002.java
rename to testdata/src/main/java/fields/Ka002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/NotReloadable.java b/testdata/src/main/java/fields/NotReloadable.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/NotReloadable.java
rename to testdata/src/main/java/fields/NotReloadable.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/One.java b/testdata/src/main/java/fields/One.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/One.java
rename to testdata/src/main/java/fields/One.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/P.java b/testdata/src/main/java/fields/P.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/P.java
rename to testdata/src/main/java/fields/P.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Pa.java b/testdata/src/main/java/fields/Pa.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Pa.java
rename to testdata/src/main/java/fields/Pa.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Q.java b/testdata/src/main/java/fields/Q.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Q.java
rename to testdata/src/main/java/fields/Q.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Q2.java b/testdata/src/main/java/fields/Q2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Q2.java
rename to testdata/src/main/java/fields/Q2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Qa.java b/testdata/src/main/java/fields/Qa.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Qa.java
rename to testdata/src/main/java/fields/Qa.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Qa2.java b/testdata/src/main/java/fields/Qa2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Qa2.java
rename to testdata/src/main/java/fields/Qa2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Qc.java b/testdata/src/main/java/fields/Qc.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Qc.java
rename to testdata/src/main/java/fields/Qc.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Qc2.java b/testdata/src/main/java/fields/Qc2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Qc2.java
rename to testdata/src/main/java/fields/Qc2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/R.java b/testdata/src/main/java/fields/R.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/R.java
rename to testdata/src/main/java/fields/R.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ra.java b/testdata/src/main/java/fields/Ra.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ra.java
rename to testdata/src/main/java/fields/Ra.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Rc.java b/testdata/src/main/java/fields/Rc.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Rc.java
rename to testdata/src/main/java/fields/Rc.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/ReloadableBottom.java b/testdata/src/main/java/fields/ReloadableBottom.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/ReloadableBottom.java
rename to testdata/src/main/java/fields/ReloadableBottom.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/ReloadableTop.java b/testdata/src/main/java/fields/ReloadableTop.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/ReloadableTop.java
rename to testdata/src/main/java/fields/ReloadableTop.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/ReloadableTop002.java b/testdata/src/main/java/fields/ReloadableTop002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/ReloadableTop002.java
rename to testdata/src/main/java/fields/ReloadableTop002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Removed.java b/testdata/src/main/java/fields/Removed.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Removed.java
rename to testdata/src/main/java/fields/Removed.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Removed002.java b/testdata/src/main/java/fields/Removed002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Removed002.java
rename to testdata/src/main/java/fields/Removed002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/S.java b/testdata/src/main/java/fields/S.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/S.java
rename to testdata/src/main/java/fields/S.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/S2.java b/testdata/src/main/java/fields/S2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/S2.java
rename to testdata/src/main/java/fields/S2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/T.java b/testdata/src/main/java/fields/T.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/T.java
rename to testdata/src/main/java/fields/T.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/T2.java b/testdata/src/main/java/fields/T2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/T2.java
rename to testdata/src/main/java/fields/T2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Two.java b/testdata/src/main/java/fields/Two.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Two.java
rename to testdata/src/main/java/fields/Two.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/TwoSlot.java b/testdata/src/main/java/fields/TwoSlot.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/TwoSlot.java
rename to testdata/src/main/java/fields/TwoSlot.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/TwoSlot2.java b/testdata/src/main/java/fields/TwoSlot2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/TwoSlot2.java
rename to testdata/src/main/java/fields/TwoSlot2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/TypeChanging.java b/testdata/src/main/java/fields/TypeChanging.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/TypeChanging.java
rename to testdata/src/main/java/fields/TypeChanging.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/TypeChanging2.java b/testdata/src/main/java/fields/TypeChanging2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/TypeChanging2.java
rename to testdata/src/main/java/fields/TypeChanging2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/X.java b/testdata/src/main/java/fields/X.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/X.java
rename to testdata/src/main/java/fields/X.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/X002.java b/testdata/src/main/java/fields/X002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/X002.java
rename to testdata/src/main/java/fields/X002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Y.java b/testdata/src/main/java/fields/Y.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Y.java
rename to testdata/src/main/java/fields/Y.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Y002.java b/testdata/src/main/java/fields/Y002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Y002.java
rename to testdata/src/main/java/fields/Y002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ya.java b/testdata/src/main/java/fields/Ya.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ya.java
rename to testdata/src/main/java/fields/Ya.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Ya002.java b/testdata/src/main/java/fields/Ya002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Ya002.java
rename to testdata/src/main/java/fields/Ya002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Yb.java b/testdata/src/main/java/fields/Yb.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Yb.java
rename to testdata/src/main/java/fields/Yb.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Yb002.java b/testdata/src/main/java/fields/Yb002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Yb002.java
rename to testdata/src/main/java/fields/Yb002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Z.java b/testdata/src/main/java/fields/Z.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Z.java
rename to testdata/src/main/java/fields/Z.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Za.java b/testdata/src/main/java/fields/Za.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Za.java
rename to testdata/src/main/java/fields/Za.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Za002.java b/testdata/src/main/java/fields/Za002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Za002.java
rename to testdata/src/main/java/fields/Za002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/fields/Zb.java b/testdata/src/main/java/fields/Zb.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/fields/Zb.java
rename to testdata/src/main/java/fields/Zb.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inheritance/A.java b/testdata/src/main/java/inheritance/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inheritance/A.java
rename to testdata/src/main/java/inheritance/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inheritance/A002.java b/testdata/src/main/java/inheritance/A002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inheritance/A002.java
rename to testdata/src/main/java/inheritance/A002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inheritance/B.java b/testdata/src/main/java/inheritance/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inheritance/B.java
rename to testdata/src/main/java/inheritance/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inheritance/C.java b/testdata/src/main/java/inheritance/C.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inheritance/C.java
rename to testdata/src/main/java/inheritance/C.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/Four.java b/testdata/src/main/java/inners/Four.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/Four.java
rename to testdata/src/main/java/inners/Four.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/Four2.java b/testdata/src/main/java/inners/Four2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/Four2.java
rename to testdata/src/main/java/inners/Four2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/One.java b/testdata/src/main/java/inners/One.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/One.java
rename to testdata/src/main/java/inners/One.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/One2.java b/testdata/src/main/java/inners/One2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/One2.java
rename to testdata/src/main/java/inners/One2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/Outer.java b/testdata/src/main/java/inners/Outer.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/Outer.java
rename to testdata/src/main/java/inners/Outer.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/Outer2.java b/testdata/src/main/java/inners/Outer2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/Outer2.java
rename to testdata/src/main/java/inners/Outer2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/Three.java b/testdata/src/main/java/inners/Three.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/Three.java
rename to testdata/src/main/java/inners/Three.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/Three2.java b/testdata/src/main/java/inners/Three2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/Three2.java
rename to testdata/src/main/java/inners/Three2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/Two.java b/testdata/src/main/java/inners/Two.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/Two.java
rename to testdata/src/main/java/inners/Two.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/Two2.java b/testdata/src/main/java/inners/Two2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/Two2.java
rename to testdata/src/main/java/inners/Two2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/inners/TwoDefault.java b/testdata/src/main/java/inners/TwoDefault.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/inners/TwoDefault.java
rename to testdata/src/main/java/inners/TwoDefault.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheImpl.java b/testdata/src/main/java/interfacerewriting/TheImpl.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheImpl.java
rename to testdata/src/main/java/interfacerewriting/TheImpl.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheImpl002.java b/testdata/src/main/java/interfacerewriting/TheImpl002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheImpl002.java
rename to testdata/src/main/java/interfacerewriting/TheImpl002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheInterface.java b/testdata/src/main/java/interfacerewriting/TheInterface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheInterface.java
rename to testdata/src/main/java/interfacerewriting/TheInterface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheInterface002.java b/testdata/src/main/java/interfacerewriting/TheInterface002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheInterface002.java
rename to testdata/src/main/java/interfacerewriting/TheInterface002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheRunner.java b/testdata/src/main/java/interfacerewriting/TheRunner.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheRunner.java
rename to testdata/src/main/java/interfacerewriting/TheRunner.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheRunner002.java b/testdata/src/main/java/interfacerewriting/TheRunner002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheRunner002.java
rename to testdata/src/main/java/interfacerewriting/TheRunner002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfaces/Runner.java b/testdata/src/main/java/interfaces/Runner.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfaces/Runner.java
rename to testdata/src/main/java/interfaces/Runner.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation.java b/testdata/src/main/java/interfaces/TheImplementation.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation.java
rename to testdata/src/main/java/interfaces/TheImplementation.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation002.java b/testdata/src/main/java/interfaces/TheImplementation002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation002.java
rename to testdata/src/main/java/interfaces/TheImplementation002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation003.java b/testdata/src/main/java/interfaces/TheImplementation003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation003.java
rename to testdata/src/main/java/interfaces/TheImplementation003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation004.java b/testdata/src/main/java/interfaces/TheImplementation004.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation004.java
rename to testdata/src/main/java/interfaces/TheImplementation004.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfaces/TheInterface.java b/testdata/src/main/java/interfaces/TheInterface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfaces/TheInterface.java
rename to testdata/src/main/java/interfaces/TheInterface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/interfaces/TheInterface004.java b/testdata/src/main/java/interfaces/TheInterface004.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/interfaces/TheInterface004.java
rename to testdata/src/main/java/interfaces/TheInterface004.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/A.java b/testdata/src/main/java/invokespecial/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/A.java
rename to testdata/src/main/java/invokespecial/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/A002.java b/testdata/src/main/java/invokespecial/A002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/A002.java
rename to testdata/src/main/java/invokespecial/A002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Able.java b/testdata/src/main/java/invokespecial/Able.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Able.java
rename to testdata/src/main/java/invokespecial/Able.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Able2.java b/testdata/src/main/java/invokespecial/Able2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Able2.java
rename to testdata/src/main/java/invokespecial/Able2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Able2002.java b/testdata/src/main/java/invokespecial/Able2002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Able2002.java
rename to testdata/src/main/java/invokespecial/Able2002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/B.java b/testdata/src/main/java/invokespecial/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/B.java
rename to testdata/src/main/java/invokespecial/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/B002.java b/testdata/src/main/java/invokespecial/B002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/B002.java
rename to testdata/src/main/java/invokespecial/B002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/C.java b/testdata/src/main/java/invokespecial/C.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/C.java
rename to testdata/src/main/java/invokespecial/C.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls.java b/testdata/src/main/java/invokespecial/ContainsPrivateCalls.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls.java
rename to testdata/src/main/java/invokespecial/ContainsPrivateCalls.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls002.java b/testdata/src/main/java/invokespecial/ContainsPrivateCalls002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls002.java
rename to testdata/src/main/java/invokespecial/ContainsPrivateCalls002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls003.java b/testdata/src/main/java/invokespecial/ContainsPrivateCalls003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls003.java
rename to testdata/src/main/java/invokespecial/ContainsPrivateCalls003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCallsB.java b/testdata/src/main/java/invokespecial/ContainsPrivateCallsB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCallsB.java
rename to testdata/src/main/java/invokespecial/ContainsPrivateCallsB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCallsB002.java b/testdata/src/main/java/invokespecial/ContainsPrivateCallsB002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCallsB002.java
rename to testdata/src/main/java/invokespecial/ContainsPrivateCallsB002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/P.java b/testdata/src/main/java/invokespecial/P.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/P.java
rename to testdata/src/main/java/invokespecial/P.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/P002.java b/testdata/src/main/java/invokespecial/P002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/P002.java
rename to testdata/src/main/java/invokespecial/P002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Q.java b/testdata/src/main/java/invokespecial/Q.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Q.java
rename to testdata/src/main/java/invokespecial/Q.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/R.java b/testdata/src/main/java/invokespecial/R.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/R.java
rename to testdata/src/main/java/invokespecial/R.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Simple.java b/testdata/src/main/java/invokespecial/Simple.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Simple.java
rename to testdata/src/main/java/invokespecial/Simple.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Simple2.java b/testdata/src/main/java/invokespecial/Simple2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Simple2.java
rename to testdata/src/main/java/invokespecial/Simple2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/X.java b/testdata/src/main/java/invokespecial/X.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/X.java
rename to testdata/src/main/java/invokespecial/X.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/X002.java b/testdata/src/main/java/invokespecial/X002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/X002.java
rename to testdata/src/main/java/invokespecial/X002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/XX.java b/testdata/src/main/java/invokespecial/XX.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/XX.java
rename to testdata/src/main/java/invokespecial/XX.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Y.java b/testdata/src/main/java/invokespecial/Y.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Y.java
rename to testdata/src/main/java/invokespecial/Y.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Y002.java b/testdata/src/main/java/invokespecial/Y002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Y002.java
rename to testdata/src/main/java/invokespecial/Y002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Y003.java b/testdata/src/main/java/invokespecial/Y003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Y003.java
rename to testdata/src/main/java/invokespecial/Y003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/YY.java b/testdata/src/main/java/invokespecial/YY.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/YY.java
rename to testdata/src/main/java/invokespecial/YY.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/YY002.java b/testdata/src/main/java/invokespecial/YY002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/YY002.java
rename to testdata/src/main/java/invokespecial/YY002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Z.java b/testdata/src/main/java/invokespecial/Z.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Z.java
rename to testdata/src/main/java/invokespecial/Z.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokespecial/Z002.java b/testdata/src/main/java/invokespecial/Z002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokespecial/Z002.java
rename to testdata/src/main/java/invokespecial/Z002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/A.java b/testdata/src/main/java/invokestatic/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/A.java
rename to testdata/src/main/java/invokestatic/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/A2.java b/testdata/src/main/java/invokestatic/A2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/A2.java
rename to testdata/src/main/java/invokestatic/A2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/B.java b/testdata/src/main/java/invokestatic/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/B.java
rename to testdata/src/main/java/invokestatic/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/B2.java b/testdata/src/main/java/invokestatic/B2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/B2.java
rename to testdata/src/main/java/invokestatic/B2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/A.java b/testdata/src/main/java/invokestatic/issue4/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/A.java
rename to testdata/src/main/java/invokestatic/issue4/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AA.java b/testdata/src/main/java/invokestatic/issue4/AA.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AA.java
rename to testdata/src/main/java/invokestatic/issue4/AA.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AAA.java b/testdata/src/main/java/invokestatic/issue4/AAA.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AAA.java
rename to testdata/src/main/java/invokestatic/issue4/AAA.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AB.java b/testdata/src/main/java/invokestatic/issue4/AB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AB.java
rename to testdata/src/main/java/invokestatic/issue4/AB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/B.java b/testdata/src/main/java/invokestatic/issue4/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/B.java
rename to testdata/src/main/java/invokestatic/issue4/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BB.java b/testdata/src/main/java/invokestatic/issue4/BB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BB.java
rename to testdata/src/main/java/invokestatic/issue4/BB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBB.java b/testdata/src/main/java/invokestatic/issue4/BBB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBB.java
rename to testdata/src/main/java/invokestatic/issue4/BBB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBBB.java b/testdata/src/main/java/invokestatic/issue4/BBBB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBBB.java
rename to testdata/src/main/java/invokestatic/issue4/BBBB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBBBB.java b/testdata/src/main/java/invokestatic/issue4/BBBBB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBBBB.java
rename to testdata/src/main/java/invokestatic/issue4/BBBBB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/A.java b/testdata/src/main/java/invokevirtual/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/A.java
rename to testdata/src/main/java/invokevirtual/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/A2.java b/testdata/src/main/java/invokevirtual/A2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/A2.java
rename to testdata/src/main/java/invokevirtual/A2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/AA.java b/testdata/src/main/java/invokevirtual/AA.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/AA.java
rename to testdata/src/main/java/invokevirtual/AA.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/AA2.java b/testdata/src/main/java/invokevirtual/AA2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/AA2.java
rename to testdata/src/main/java/invokevirtual/AA2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/B.java b/testdata/src/main/java/invokevirtual/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/B.java
rename to testdata/src/main/java/invokevirtual/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/B2.java b/testdata/src/main/java/invokevirtual/B2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/B2.java
rename to testdata/src/main/java/invokevirtual/B2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/BB.java b/testdata/src/main/java/invokevirtual/BB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/BB.java
rename to testdata/src/main/java/invokevirtual/BB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/BB2.java b/testdata/src/main/java/invokevirtual/BB2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/BB2.java
rename to testdata/src/main/java/invokevirtual/BB2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/BB3.java b/testdata/src/main/java/invokevirtual/BB3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/BB3.java
rename to testdata/src/main/java/invokevirtual/BB3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/CC.java b/testdata/src/main/java/invokevirtual/CC.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/CC.java
rename to testdata/src/main/java/invokevirtual/CC.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/X.java b/testdata/src/main/java/invokevirtual/X.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/X.java
rename to testdata/src/main/java/invokevirtual/X.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/XX.java b/testdata/src/main/java/invokevirtual/XX.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/XX.java
rename to testdata/src/main/java/invokevirtual/XX.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/Y.java b/testdata/src/main/java/invokevirtual/Y.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/Y.java
rename to testdata/src/main/java/invokevirtual/Y.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/Y002.java b/testdata/src/main/java/invokevirtual/Y002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/Y002.java
rename to testdata/src/main/java/invokevirtual/Y002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/YY.java b/testdata/src/main/java/invokevirtual/YY.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/YY.java
rename to testdata/src/main/java/invokevirtual/YY.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/YY002.java b/testdata/src/main/java/invokevirtual/YY002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/YY002.java
rename to testdata/src/main/java/invokevirtual/YY002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/invokevirtual/ZZ.java b/testdata/src/main/java/invokevirtual/ZZ.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/invokevirtual/ZZ.java
rename to testdata/src/main/java/invokevirtual/ZZ.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/Ctor.java b/testdata/src/main/java/iri/Ctor.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/Ctor.java
rename to testdata/src/main/java/iri/Ctor.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/FormattingHelper.java b/testdata/src/main/java/iri/FormattingHelper.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/FormattingHelper.java
rename to testdata/src/main/java/iri/FormattingHelper.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotation.java b/testdata/src/main/java/iri/JLCGetAnnotation.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotation.java
rename to testdata/src/main/java/iri/JLCGetAnnotation.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotation2.java b/testdata/src/main/java/iri/JLCGetAnnotation2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotation2.java
rename to testdata/src/main/java/iri/JLCGetAnnotation2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotations.java b/testdata/src/main/java/iri/JLCGetAnnotations.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotations.java
rename to testdata/src/main/java/iri/JLCGetAnnotations.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotations2.java b/testdata/src/main/java/iri/JLCGetAnnotations2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotations2.java
rename to testdata/src/main/java/iri/JLCGetAnnotations2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructor.java b/testdata/src/main/java/iri/JLCGetConstructor.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructor.java
rename to testdata/src/main/java/iri/JLCGetConstructor.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructor2.java b/testdata/src/main/java/iri/JLCGetConstructor2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructor2.java
rename to testdata/src/main/java/iri/JLCGetConstructor2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructorB.java b/testdata/src/main/java/iri/JLCGetConstructorB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructorB.java
rename to testdata/src/main/java/iri/JLCGetConstructorB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructorB2.java b/testdata/src/main/java/iri/JLCGetConstructorB2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructorB2.java
rename to testdata/src/main/java/iri/JLCGetConstructorB2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructors.java b/testdata/src/main/java/iri/JLCGetConstructors.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructors.java
rename to testdata/src/main/java/iri/JLCGetConstructors.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructors2.java b/testdata/src/main/java/iri/JLCGetConstructors2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructors2.java
rename to testdata/src/main/java/iri/JLCGetConstructors2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecAnnotations.java b/testdata/src/main/java/iri/JLCGetDecAnnotations.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecAnnotations.java
rename to testdata/src/main/java/iri/JLCGetDecAnnotations.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecAnnotations2.java b/testdata/src/main/java/iri/JLCGetDecAnnotations2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecAnnotations2.java
rename to testdata/src/main/java/iri/JLCGetDecAnnotations2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructor.java b/testdata/src/main/java/iri/JLCGetDecConstructor.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructor.java
rename to testdata/src/main/java/iri/JLCGetDecConstructor.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructor2.java b/testdata/src/main/java/iri/JLCGetDecConstructor2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructor2.java
rename to testdata/src/main/java/iri/JLCGetDecConstructor2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructors.java b/testdata/src/main/java/iri/JLCGetDecConstructors.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructors.java
rename to testdata/src/main/java/iri/JLCGetDecConstructors.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructors2.java b/testdata/src/main/java/iri/JLCGetDecConstructors2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructors2.java
rename to testdata/src/main/java/iri/JLCGetDecConstructors2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecField.java b/testdata/src/main/java/iri/JLCGetDecField.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecField.java
rename to testdata/src/main/java/iri/JLCGetDecField.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecField2.java b/testdata/src/main/java/iri/JLCGetDecField2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecField2.java
rename to testdata/src/main/java/iri/JLCGetDecField2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecFields.java b/testdata/src/main/java/iri/JLCGetDecFields.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecFields.java
rename to testdata/src/main/java/iri/JLCGetDecFields.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecFields2.java b/testdata/src/main/java/iri/JLCGetDecFields2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecFields2.java
rename to testdata/src/main/java/iri/JLCGetDecFields2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod.java b/testdata/src/main/java/iri/JLCGetDecMethod.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod.java
rename to testdata/src/main/java/iri/JLCGetDecMethod.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod2.java b/testdata/src/main/java/iri/JLCGetDecMethod2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod2.java
rename to testdata/src/main/java/iri/JLCGetDecMethod2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod3.java b/testdata/src/main/java/iri/JLCGetDecMethod3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod3.java
rename to testdata/src/main/java/iri/JLCGetDecMethod3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethods.java b/testdata/src/main/java/iri/JLCGetDecMethods.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethods.java
rename to testdata/src/main/java/iri/JLCGetDecMethods.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethods2.java b/testdata/src/main/java/iri/JLCGetDecMethods2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethods2.java
rename to testdata/src/main/java/iri/JLCGetDecMethods2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetField.java b/testdata/src/main/java/iri/JLCGetField.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetField.java
rename to testdata/src/main/java/iri/JLCGetField.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetField2.java b/testdata/src/main/java/iri/JLCGetField2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetField2.java
rename to testdata/src/main/java/iri/JLCGetField2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetFields.java b/testdata/src/main/java/iri/JLCGetFields.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetFields.java
rename to testdata/src/main/java/iri/JLCGetFields.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetFields2.java b/testdata/src/main/java/iri/JLCGetFields2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetFields2.java
rename to testdata/src/main/java/iri/JLCGetFields2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod.java b/testdata/src/main/java/iri/JLCGetMethod.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod.java
rename to testdata/src/main/java/iri/JLCGetMethod.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod2.java b/testdata/src/main/java/iri/JLCGetMethod2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod2.java
rename to testdata/src/main/java/iri/JLCGetMethod2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod3.java b/testdata/src/main/java/iri/JLCGetMethod3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod3.java
rename to testdata/src/main/java/iri/JLCGetMethod3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethods.java b/testdata/src/main/java/iri/JLCGetMethods.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethods.java
rename to testdata/src/main/java/iri/JLCGetMethods.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethods2.java b/testdata/src/main/java/iri/JLCGetMethods2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethods2.java
rename to testdata/src/main/java/iri/JLCGetMethods2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCGetModifiers.java b/testdata/src/main/java/iri/JLCGetModifiers.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCGetModifiers.java
rename to testdata/src/main/java/iri/JLCGetModifiers.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCIsAnnotationPresent.java b/testdata/src/main/java/iri/JLCIsAnnotationPresent.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCIsAnnotationPresent.java
rename to testdata/src/main/java/iri/JLCIsAnnotationPresent.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCIsAnnotationPresent2.java b/testdata/src/main/java/iri/JLCIsAnnotationPresent2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCIsAnnotationPresent2.java
rename to testdata/src/main/java/iri/JLCIsAnnotationPresent2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLCNewInstance.java b/testdata/src/main/java/iri/JLCNewInstance.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLCNewInstance.java
rename to testdata/src/main/java/iri/JLCNewInstance.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotation.java b/testdata/src/main/java/iri/JLRCGetAnnotation.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotation.java
rename to testdata/src/main/java/iri/JLRCGetAnnotation.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotation2.java b/testdata/src/main/java/iri/JLRCGetAnnotation2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotation2.java
rename to testdata/src/main/java/iri/JLRCGetAnnotation2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotations.java b/testdata/src/main/java/iri/JLRCGetAnnotations.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotations.java
rename to testdata/src/main/java/iri/JLRCGetAnnotations.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotations2.java b/testdata/src/main/java/iri/JLRCGetAnnotations2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotations2.java
rename to testdata/src/main/java/iri/JLRCGetAnnotations2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetDecAnnotations.java b/testdata/src/main/java/iri/JLRCGetDecAnnotations.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCGetDecAnnotations.java
rename to testdata/src/main/java/iri/JLRCGetDecAnnotations.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetDecAnnotations2.java b/testdata/src/main/java/iri/JLRCGetDecAnnotations2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCGetDecAnnotations2.java
rename to testdata/src/main/java/iri/JLRCGetDecAnnotations2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetParameterAnnotations.java b/testdata/src/main/java/iri/JLRCGetParameterAnnotations.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCGetParameterAnnotations.java
rename to testdata/src/main/java/iri/JLRCGetParameterAnnotations.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetParameterAnnotations2.java b/testdata/src/main/java/iri/JLRCGetParameterAnnotations2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCGetParameterAnnotations2.java
rename to testdata/src/main/java/iri/JLRCGetParameterAnnotations2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCIsAnnotationPresent.java b/testdata/src/main/java/iri/JLRCIsAnnotationPresent.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCIsAnnotationPresent.java
rename to testdata/src/main/java/iri/JLRCIsAnnotationPresent.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCIsAnnotationPresent2.java b/testdata/src/main/java/iri/JLRCIsAnnotationPresent2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCIsAnnotationPresent2.java
rename to testdata/src/main/java/iri/JLRCIsAnnotationPresent2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCNewInstance.java b/testdata/src/main/java/iri/JLRCNewInstance.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCNewInstance.java
rename to testdata/src/main/java/iri/JLRCNewInstance.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRCNewInstance2.java b/testdata/src/main/java/iri/JLRCNewInstance2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRCNewInstance2.java
rename to testdata/src/main/java/iri/JLRCNewInstance2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFGet.java b/testdata/src/main/java/iri/JLRFGet.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFGet.java
rename to testdata/src/main/java/iri/JLRFGet.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFGet2.java b/testdata/src/main/java/iri/JLRFGet2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFGet2.java
rename to testdata/src/main/java/iri/JLRFGet2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotation.java b/testdata/src/main/java/iri/JLRFGetAnnotation.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotation.java
rename to testdata/src/main/java/iri/JLRFGetAnnotation.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotation2.java b/testdata/src/main/java/iri/JLRFGetAnnotation2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotation2.java
rename to testdata/src/main/java/iri/JLRFGetAnnotation2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotations.java b/testdata/src/main/java/iri/JLRFGetAnnotations.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotations.java
rename to testdata/src/main/java/iri/JLRFGetAnnotations.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotations2.java b/testdata/src/main/java/iri/JLRFGetAnnotations2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotations2.java
rename to testdata/src/main/java/iri/JLRFGetAnnotations2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetDecAnnotations.java b/testdata/src/main/java/iri/JLRFGetDecAnnotations.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFGetDecAnnotations.java
rename to testdata/src/main/java/iri/JLRFGetDecAnnotations.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetDecAnnotations2.java b/testdata/src/main/java/iri/JLRFGetDecAnnotations2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFGetDecAnnotations2.java
rename to testdata/src/main/java/iri/JLRFGetDecAnnotations2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetTheRest.java b/testdata/src/main/java/iri/JLRFGetTheRest.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFGetTheRest.java
rename to testdata/src/main/java/iri/JLRFGetTheRest.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetTheRest2.java b/testdata/src/main/java/iri/JLRFGetTheRest2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFGetTheRest2.java
rename to testdata/src/main/java/iri/JLRFGetTheRest2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFIsAnnotationPresent.java b/testdata/src/main/java/iri/JLRFIsAnnotationPresent.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFIsAnnotationPresent.java
rename to testdata/src/main/java/iri/JLRFIsAnnotationPresent.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFIsAnnotationPresent2.java b/testdata/src/main/java/iri/JLRFIsAnnotationPresent2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFIsAnnotationPresent2.java
rename to testdata/src/main/java/iri/JLRFIsAnnotationPresent2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFSet.java b/testdata/src/main/java/iri/JLRFSet.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFSet.java
rename to testdata/src/main/java/iri/JLRFSet.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFSet2.java b/testdata/src/main/java/iri/JLRFSet2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFSet2.java
rename to testdata/src/main/java/iri/JLRFSet2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRest.java b/testdata/src/main/java/iri/JLRFSetTheRest.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRest.java
rename to testdata/src/main/java/iri/JLRFSetTheRest.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRest2.java b/testdata/src/main/java/iri/JLRFSetTheRest2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRest2.java
rename to testdata/src/main/java/iri/JLRFSetTheRest2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRestVariant.java b/testdata/src/main/java/iri/JLRFSetTheRestVariant.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRestVariant.java
rename to testdata/src/main/java/iri/JLRFSetTheRestVariant.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotation.java b/testdata/src/main/java/iri/JLRMGetAnnotation.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotation.java
rename to testdata/src/main/java/iri/JLRMGetAnnotation.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotation2.java b/testdata/src/main/java/iri/JLRMGetAnnotation2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotation2.java
rename to testdata/src/main/java/iri/JLRMGetAnnotation2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject.java b/testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject.java
rename to testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject2.java b/testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject2.java
rename to testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement.java b/testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement.java
rename to testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement2.java b/testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement2.java
rename to testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotations.java b/testdata/src/main/java/iri/JLRMGetAnnotations.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotations.java
rename to testdata/src/main/java/iri/JLRMGetAnnotations.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotations2.java b/testdata/src/main/java/iri/JLRMGetAnnotations2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotations2.java
rename to testdata/src/main/java/iri/JLRMGetAnnotations2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetDecAnnotations.java b/testdata/src/main/java/iri/JLRMGetDecAnnotations.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetDecAnnotations.java
rename to testdata/src/main/java/iri/JLRMGetDecAnnotations.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetDecAnnotations2.java b/testdata/src/main/java/iri/JLRMGetDecAnnotations2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetDecAnnotations2.java
rename to testdata/src/main/java/iri/JLRMGetDecAnnotations2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetParameterAnnotations.java b/testdata/src/main/java/iri/JLRMGetParameterAnnotations.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetParameterAnnotations.java
rename to testdata/src/main/java/iri/JLRMGetParameterAnnotations.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetParameterAnnotations2.java b/testdata/src/main/java/iri/JLRMGetParameterAnnotations2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMGetParameterAnnotations2.java
rename to testdata/src/main/java/iri/JLRMGetParameterAnnotations2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke.java b/testdata/src/main/java/iri/JLRMInvoke.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke.java
rename to testdata/src/main/java/iri/JLRMInvoke.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke2.java b/testdata/src/main/java/iri/JLRMInvoke2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke2.java
rename to testdata/src/main/java/iri/JLRMInvoke2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke3.java b/testdata/src/main/java/iri/JLRMInvoke3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke3.java
rename to testdata/src/main/java/iri/JLRMInvoke3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMIsAnnotationPresent.java b/testdata/src/main/java/iri/JLRMIsAnnotationPresent.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMIsAnnotationPresent.java
rename to testdata/src/main/java/iri/JLRMIsAnnotationPresent.java
diff --git a/org.springsource.loaded.testdata/src/main/java/iri/JLRMIsAnnotationPresent2.java b/testdata/src/main/java/iri/JLRMIsAnnotationPresent2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/iri/JLRMIsAnnotationPresent2.java
rename to testdata/src/main/java/iri/JLRMIsAnnotationPresent2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/jvmtwo/Runner.java b/testdata/src/main/java/jvmtwo/Runner.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/jvmtwo/Runner.java
rename to testdata/src/main/java/jvmtwo/Runner.java
diff --git a/org.springsource.loaded.testdata/src/main/java/methoddeletion/TypeA.java b/testdata/src/main/java/methoddeletion/TypeA.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/methoddeletion/TypeA.java
rename to testdata/src/main/java/methoddeletion/TypeA.java
diff --git a/org.springsource.loaded.testdata/src/main/java/methoddeletion/TypeA2.java b/testdata/src/main/java/methoddeletion/TypeA2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/methoddeletion/TypeA2.java
rename to testdata/src/main/java/methoddeletion/TypeA2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/perf/one/Caller.java b/testdata/src/main/java/perf/one/Caller.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/perf/one/Caller.java
rename to testdata/src/main/java/perf/one/Caller.java
diff --git a/org.springsource.loaded.testdata/src/main/java/perf/one/CallerB.java b/testdata/src/main/java/perf/one/CallerB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/perf/one/CallerB.java
rename to testdata/src/main/java/perf/one/CallerB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/perf/one/Target.java b/testdata/src/main/java/perf/one/Target.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/perf/one/Target.java
rename to testdata/src/main/java/perf/one/Target.java
diff --git a/org.springsource.loaded.testdata/src/main/java/perf/one/TargetB.java b/testdata/src/main/java/perf/one/TargetB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/perf/one/TargetB.java
rename to testdata/src/main/java/perf/one/TargetB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/plugins/One.java b/testdata/src/main/java/plugins/One.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/plugins/One.java
rename to testdata/src/main/java/plugins/One.java
diff --git a/org.springsource.loaded.testdata/src/main/java/plugins/PluginTesting.java b/testdata/src/main/java/plugins/PluginTesting.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/plugins/PluginTesting.java
rename to testdata/src/main/java/plugins/PluginTesting.java
diff --git a/org.springsource.loaded.testdata/src/main/java/prot/One.java b/testdata/src/main/java/prot/One.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/prot/One.java
rename to testdata/src/main/java/prot/One.java
diff --git a/org.springsource.loaded.testdata/src/main/java/prot/PeerThree.java b/testdata/src/main/java/prot/PeerThree.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/prot/PeerThree.java
rename to testdata/src/main/java/prot/PeerThree.java
diff --git a/org.springsource.loaded.testdata/src/main/java/prot/SubOne.java b/testdata/src/main/java/prot/SubOne.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/prot/SubOne.java
rename to testdata/src/main/java/prot/SubOne.java
diff --git a/org.springsource.loaded.testdata/src/main/java/prot/SubThree.java b/testdata/src/main/java/prot/SubThree.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/prot/SubThree.java
rename to testdata/src/main/java/prot/SubThree.java
diff --git a/org.springsource.loaded.testdata/src/main/java/prot/SubTwo.java b/testdata/src/main/java/prot/SubTwo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/prot/SubTwo.java
rename to testdata/src/main/java/prot/SubTwo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/prot/Three.java b/testdata/src/main/java/prot/Three.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/prot/Three.java
rename to testdata/src/main/java/prot/Three.java
diff --git a/org.springsource.loaded.testdata/src/main/java/prot/Two.java b/testdata/src/main/java/prot/Two.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/prot/Two.java
rename to testdata/src/main/java/prot/Two.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/TestA1.java b/testdata/src/main/java/proxy/TestA1.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/TestA1.java
rename to testdata/src/main/java/proxy/TestA1.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/TestA2.java b/testdata/src/main/java/proxy/TestA2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/TestA2.java
rename to testdata/src/main/java/proxy/TestA2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/TestIntfaceA1.java b/testdata/src/main/java/proxy/TestIntfaceA1.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/TestIntfaceA1.java
rename to testdata/src/main/java/proxy/TestIntfaceA1.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/TestIntfaceA2.java b/testdata/src/main/java/proxy/TestIntfaceA2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/TestIntfaceA2.java
rename to testdata/src/main/java/proxy/TestIntfaceA2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/TestInvocationHandlerA1.java b/testdata/src/main/java/proxy/TestInvocationHandlerA1.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/TestInvocationHandlerA1.java
rename to testdata/src/main/java/proxy/TestInvocationHandlerA1.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/three/TestA1.java b/testdata/src/main/java/proxy/three/TestA1.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/three/TestA1.java
rename to testdata/src/main/java/proxy/three/TestA1.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/three/TestA2.java b/testdata/src/main/java/proxy/three/TestA2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/three/TestA2.java
rename to testdata/src/main/java/proxy/three/TestA2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceA1.java b/testdata/src/main/java/proxy/three/TestIntfaceA1.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceA1.java
rename to testdata/src/main/java/proxy/three/TestIntfaceA1.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceA2.java b/testdata/src/main/java/proxy/three/TestIntfaceA2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceA2.java
rename to testdata/src/main/java/proxy/three/TestIntfaceA2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceB1.java b/testdata/src/main/java/proxy/three/TestIntfaceB1.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceB1.java
rename to testdata/src/main/java/proxy/three/TestIntfaceB1.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceB2.java b/testdata/src/main/java/proxy/three/TestIntfaceB2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceB2.java
rename to testdata/src/main/java/proxy/three/TestIntfaceB2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/three/TestInvocationHandlerA1.java b/testdata/src/main/java/proxy/three/TestInvocationHandlerA1.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/three/TestInvocationHandlerA1.java
rename to testdata/src/main/java/proxy/three/TestInvocationHandlerA1.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/two/TestA1.java b/testdata/src/main/java/proxy/two/TestA1.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/two/TestA1.java
rename to testdata/src/main/java/proxy/two/TestA1.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/two/TestA2.java b/testdata/src/main/java/proxy/two/TestA2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/two/TestA2.java
rename to testdata/src/main/java/proxy/two/TestA2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/two/TestIntfaceA1.java b/testdata/src/main/java/proxy/two/TestIntfaceA1.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/two/TestIntfaceA1.java
rename to testdata/src/main/java/proxy/two/TestIntfaceA1.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/two/TestIntfaceA2.java b/testdata/src/main/java/proxy/two/TestIntfaceA2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/two/TestIntfaceA2.java
rename to testdata/src/main/java/proxy/two/TestIntfaceA2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/proxy/two/TestInvocationHandlerA1.java b/testdata/src/main/java/proxy/two/TestInvocationHandlerA1.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/proxy/two/TestInvocationHandlerA1.java
rename to testdata/src/main/java/proxy/two/TestInvocationHandlerA1.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflect/FieldAccessing.java b/testdata/src/main/java/reflect/FieldAccessing.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflect/FieldAccessing.java
rename to testdata/src/main/java/reflect/FieldAccessing.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflect/FieldAccessing2.java b/testdata/src/main/java/reflect/FieldAccessing2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflect/FieldAccessing2.java
rename to testdata/src/main/java/reflect/FieldAccessing2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflect/FieldWriting.java b/testdata/src/main/java/reflect/FieldWriting.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflect/FieldWriting.java
rename to testdata/src/main/java/reflect/FieldWriting.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflect/FieldWriting2.java b/testdata/src/main/java/reflect/FieldWriting2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflect/FieldWriting2.java
rename to testdata/src/main/java/reflect/FieldWriting2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/AdHocClassInvoker.java b/testdata/src/main/java/reflection/AdHocClassInvoker.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/AdHocClassInvoker.java
rename to testdata/src/main/java/reflection/AdHocClassInvoker.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/AnnoT.java b/testdata/src/main/java/reflection/AnnoT.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/AnnoT.java
rename to testdata/src/main/java/reflection/AnnoT.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/AnnoT2.java b/testdata/src/main/java/reflection/AnnoT2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/AnnoT2.java
rename to testdata/src/main/java/reflection/AnnoT2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/AnnoT3.java b/testdata/src/main/java/reflection/AnnoT3.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/AnnoT3.java
rename to testdata/src/main/java/reflection/AnnoT3.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/AnnoTInherit.java b/testdata/src/main/java/reflection/AnnoTInherit.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/AnnoTInherit.java
rename to testdata/src/main/java/reflection/AnnoTInherit.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/AnnotationsInvoker.java b/testdata/src/main/java/reflection/AnnotationsInvoker.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/AnnotationsInvoker.java
rename to testdata/src/main/java/reflection/AnnotationsInvoker.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/CTAnnoT.java b/testdata/src/main/java/reflection/CTAnnoT.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/CTAnnoT.java
rename to testdata/src/main/java/reflection/CTAnnoT.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/ClassInvoker.java b/testdata/src/main/java/reflection/ClassInvoker.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/ClassInvoker.java
rename to testdata/src/main/java/reflection/ClassInvoker.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/ConstructorInvoker.java b/testdata/src/main/java/reflection/ConstructorInvoker.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/ConstructorInvoker.java
rename to testdata/src/main/java/reflection/ConstructorInvoker.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/FieldInvoker.java b/testdata/src/main/java/reflection/FieldInvoker.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/FieldInvoker.java
rename to testdata/src/main/java/reflection/FieldInvoker.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/Invoker.class b/testdata/src/main/java/reflection/Invoker.class
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/Invoker.class
rename to testdata/src/main/java/reflection/Invoker.class
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/Invoker.java b/testdata/src/main/java/reflection/Invoker.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/Invoker.java
rename to testdata/src/main/java/reflection/Invoker.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/Invoker2.java b/testdata/src/main/java/reflection/Invoker2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/Invoker2.java
rename to testdata/src/main/java/reflection/Invoker2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/MethodInvoker.java b/testdata/src/main/java/reflection/MethodInvoker.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/MethodInvoker.java
rename to testdata/src/main/java/reflection/MethodInvoker.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/MethodTarget.java b/testdata/src/main/java/reflection/MethodTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/MethodTarget.java
rename to testdata/src/main/java/reflection/MethodTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/MethodTarget002.java b/testdata/src/main/java/reflection/MethodTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/MethodTarget002.java
rename to testdata/src/main/java/reflection/MethodTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/NonReloadableSuperClass.java b/testdata/src/main/java/reflection/NonReloadableSuperClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/NonReloadableSuperClass.java
rename to testdata/src/main/java/reflection/NonReloadableSuperClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/SubTestVal.java b/testdata/src/main/java/reflection/SubTestVal.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/SubTestVal.java
rename to testdata/src/main/java/reflection/SubTestVal.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/Target.class b/testdata/src/main/java/reflection/Target.class
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/Target.class
rename to testdata/src/main/java/reflection/Target.class
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/Target.java b/testdata/src/main/java/reflection/Target.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/Target.java
rename to testdata/src/main/java/reflection/Target.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/Target002.java b/testdata/src/main/java/reflection/Target002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/Target002.java
rename to testdata/src/main/java/reflection/Target002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/Target2.java b/testdata/src/main/java/reflection/Target2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/Target2.java
rename to testdata/src/main/java/reflection/Target2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/TestVal.java b/testdata/src/main/java/reflection/TestVal.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/TestVal.java
rename to testdata/src/main/java/reflection/TestVal.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod.java b/testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod.java
rename to testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod002.java b/testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod002.java
rename to testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget.java b/testdata/src/main/java/reflection/classannotations/ClassTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget.java
rename to testdata/src/main/java/reflection/classannotations/ClassTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget002.java b/testdata/src/main/java/reflection/classannotations/ClassTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget002.java
rename to testdata/src/main/java/reflection/classannotations/ClassTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget003.java b/testdata/src/main/java/reflection/classannotations/ClassTarget003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget003.java
rename to testdata/src/main/java/reflection/classannotations/ClassTarget003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget.java b/testdata/src/main/java/reflection/classannotations/InterfaceTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget.java
rename to testdata/src/main/java/reflection/classannotations/InterfaceTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget002.java b/testdata/src/main/java/reflection/classannotations/InterfaceTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget002.java
rename to testdata/src/main/java/reflection/classannotations/InterfaceTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget003.java b/testdata/src/main/java/reflection/classannotations/InterfaceTarget003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget003.java
rename to testdata/src/main/java/reflection/classannotations/InterfaceTarget003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget.java b/testdata/src/main/java/reflection/classannotations/SubClassTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget.java
rename to testdata/src/main/java/reflection/classannotations/SubClassTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget002.java b/testdata/src/main/java/reflection/classannotations/SubClassTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget002.java
rename to testdata/src/main/java/reflection/classannotations/SubClassTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget003.java b/testdata/src/main/java/reflection/classannotations/SubClassTarget003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget003.java
rename to testdata/src/main/java/reflection/classannotations/SubClassTarget003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubInterfaceTarget.java b/testdata/src/main/java/reflection/classannotations/SubInterfaceTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubInterfaceTarget.java
rename to testdata/src/main/java/reflection/classannotations/SubInterfaceTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubInterfaceTarget002.java b/testdata/src/main/java/reflection/classannotations/SubInterfaceTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubInterfaceTarget002.java
rename to testdata/src/main/java/reflection/classannotations/SubInterfaceTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget.java b/testdata/src/main/java/reflection/classmodifiers/ClassTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget.java
rename to testdata/src/main/java/reflection/classmodifiers/ClassTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget002.java b/testdata/src/main/java/reflection/classmodifiers/ClassTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget002.java
rename to testdata/src/main/java/reflection/classmodifiers/ClassTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget003.java b/testdata/src/main/java/reflection/classmodifiers/ClassTarget003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget003.java
rename to testdata/src/main/java/reflection/classmodifiers/ClassTarget003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance.java b/testdata/src/main/java/reflection/constructors/ClassForNewInstance.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance.java
rename to testdata/src/main/java/reflection/constructors/ClassForNewInstance.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance002.java b/testdata/src/main/java/reflection/constructors/ClassForNewInstance002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance002.java
rename to testdata/src/main/java/reflection/constructors/ClassForNewInstance002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance003.java b/testdata/src/main/java/reflection/constructors/ClassForNewInstance003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance003.java
rename to testdata/src/main/java/reflection/constructors/ClassForNewInstance003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance004.java b/testdata/src/main/java/reflection/constructors/ClassForNewInstance004.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance004.java
rename to testdata/src/main/java/reflection/constructors/ClassForNewInstance004.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors.java b/testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors.java
rename to testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors002.java b/testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors002.java
rename to testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithConstructors.java b/testdata/src/main/java/reflection/constructors/ClassWithConstructors.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithConstructors.java
rename to testdata/src/main/java/reflection/constructors/ClassWithConstructors.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithConstructors002.java b/testdata/src/main/java/reflection/constructors/ClassWithConstructors002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithConstructors002.java
rename to testdata/src/main/java/reflection/constructors/ClassWithConstructors002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget.java b/testdata/src/main/java/reflection/fieldannotations/ClassTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget.java
rename to testdata/src/main/java/reflection/fieldannotations/ClassTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget002.java b/testdata/src/main/java/reflection/fieldannotations/ClassTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget002.java
rename to testdata/src/main/java/reflection/fieldannotations/ClassTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget003.java b/testdata/src/main/java/reflection/fieldannotations/ClassTarget003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget003.java
rename to testdata/src/main/java/reflection/fieldannotations/ClassTarget003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget.java b/testdata/src/main/java/reflection/fieldannotations/InterfaceTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget.java
rename to testdata/src/main/java/reflection/fieldannotations/InterfaceTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget002.java b/testdata/src/main/java/reflection/fieldannotations/InterfaceTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget002.java
rename to testdata/src/main/java/reflection/fieldannotations/InterfaceTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget003.java b/testdata/src/main/java/reflection/fieldannotations/InterfaceTarget003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget003.java
rename to testdata/src/main/java/reflection/fieldannotations/InterfaceTarget003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/ClassTarget.java b/testdata/src/main/java/reflection/fields/ClassTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/ClassTarget.java
rename to testdata/src/main/java/reflection/fields/ClassTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/ClassTarget002.java b/testdata/src/main/java/reflection/fields/ClassTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/ClassTarget002.java
rename to testdata/src/main/java/reflection/fields/ClassTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/FieldSetAccessTarget.java b/testdata/src/main/java/reflection/fields/FieldSetAccessTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/FieldSetAccessTarget.java
rename to testdata/src/main/java/reflection/fields/FieldSetAccessTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/FieldSetAccessTarget002.java b/testdata/src/main/java/reflection/fields/FieldSetAccessTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/FieldSetAccessTarget002.java
rename to testdata/src/main/java/reflection/fields/FieldSetAccessTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/InterfaceTarget.java b/testdata/src/main/java/reflection/fields/InterfaceTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/InterfaceTarget.java
rename to testdata/src/main/java/reflection/fields/InterfaceTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/InterfaceTarget002.java b/testdata/src/main/java/reflection/fields/InterfaceTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/InterfaceTarget002.java
rename to testdata/src/main/java/reflection/fields/InterfaceTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/S1InterfaceTarget.java b/testdata/src/main/java/reflection/fields/S1InterfaceTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/S1InterfaceTarget.java
rename to testdata/src/main/java/reflection/fields/S1InterfaceTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/S1InterfaceTarget002.java b/testdata/src/main/java/reflection/fields/S1InterfaceTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/S1InterfaceTarget002.java
rename to testdata/src/main/java/reflection/fields/S1InterfaceTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/S2InterfaceTarget.java b/testdata/src/main/java/reflection/fields/S2InterfaceTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/S2InterfaceTarget.java
rename to testdata/src/main/java/reflection/fields/S2InterfaceTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/S2InterfaceTarget002.java b/testdata/src/main/java/reflection/fields/S2InterfaceTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/S2InterfaceTarget002.java
rename to testdata/src/main/java/reflection/fields/S2InterfaceTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/SubClassTarget.java b/testdata/src/main/java/reflection/fields/SubClassTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/SubClassTarget.java
rename to testdata/src/main/java/reflection/fields/SubClassTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/fields/SubClassTarget002.java b/testdata/src/main/java/reflection/fields/SubClassTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/fields/SubClassTarget002.java
rename to testdata/src/main/java/reflection/fields/SubClassTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericClass.java b/testdata/src/main/java/reflection/generics/GenericClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericClass.java
rename to testdata/src/main/java/reflection/generics/GenericClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericClass002.java b/testdata/src/main/java/reflection/generics/GenericClass002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericClass002.java
rename to testdata/src/main/java/reflection/generics/GenericClass002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericInterface.java b/testdata/src/main/java/reflection/generics/GenericInterface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericInterface.java
rename to testdata/src/main/java/reflection/generics/GenericInterface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericInterface002.java b/testdata/src/main/java/reflection/generics/GenericInterface002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericInterface002.java
rename to testdata/src/main/java/reflection/generics/GenericInterface002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/invocation/A.java b/testdata/src/main/java/reflection/invocation/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/invocation/A.java
rename to testdata/src/main/java/reflection/invocation/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/invocation/A002.java b/testdata/src/main/java/reflection/invocation/A002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/invocation/A002.java
rename to testdata/src/main/java/reflection/invocation/A002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/invocation/B.java b/testdata/src/main/java/reflection/invocation/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/invocation/B.java
rename to testdata/src/main/java/reflection/invocation/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/invocation/B002.java b/testdata/src/main/java/reflection/invocation/B002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/invocation/B002.java
rename to testdata/src/main/java/reflection/invocation/B002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/invocation/C.java b/testdata/src/main/java/reflection/invocation/C.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/invocation/C.java
rename to testdata/src/main/java/reflection/invocation/C.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/invocation/C002.java b/testdata/src/main/java/reflection/invocation/C002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/invocation/C002.java
rename to testdata/src/main/java/reflection/invocation/C002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget.java b/testdata/src/main/java/reflection/methodannotations/ClassTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget.java
rename to testdata/src/main/java/reflection/methodannotations/ClassTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget002.java b/testdata/src/main/java/reflection/methodannotations/ClassTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget002.java
rename to testdata/src/main/java/reflection/methodannotations/ClassTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget003.java b/testdata/src/main/java/reflection/methodannotations/ClassTarget003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget003.java
rename to testdata/src/main/java/reflection/methodannotations/ClassTarget003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget.java b/testdata/src/main/java/reflection/methodannotations/InterfaceTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget.java
rename to testdata/src/main/java/reflection/methodannotations/InterfaceTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget002.java b/testdata/src/main/java/reflection/methodannotations/InterfaceTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget002.java
rename to testdata/src/main/java/reflection/methodannotations/InterfaceTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget003.java b/testdata/src/main/java/reflection/methodannotations/InterfaceTarget003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget003.java
rename to testdata/src/main/java/reflection/methodannotations/InterfaceTarget003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotClass.java b/testdata/src/main/java/reflection/methodannotations/ParamAnnotClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotClass.java
rename to testdata/src/main/java/reflection/methodannotations/ParamAnnotClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotClass002.java b/testdata/src/main/java/reflection/methodannotations/ParamAnnotClass002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotClass002.java
rename to testdata/src/main/java/reflection/methodannotations/ParamAnnotClass002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface.java b/testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface.java
rename to testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface002.java b/testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface002.java
rename to testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/nonrelfields/NonReloadableClassWithFields.java b/testdata/src/main/java/reflection/nonrelfields/NonReloadableClassWithFields.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/nonrelfields/NonReloadableClassWithFields.java
rename to testdata/src/main/java/reflection/nonrelfields/NonReloadableClassWithFields.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/reflection/Invoker.class b/testdata/src/main/java/reflection/reflection/Invoker.class
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/reflection/Invoker.class
rename to testdata/src/main/java/reflection/reflection/Invoker.class
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/reflection/Target.class b/testdata/src/main/java/reflection/reflection/Target.class
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/reflection/Target.class
rename to testdata/src/main/java/reflection/reflection/Target.class
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/ChangeModClass.java b/testdata/src/main/java/reflection/targets/ChangeModClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/ChangeModClass.java
rename to testdata/src/main/java/reflection/targets/ChangeModClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/ChangeModClass002.java b/testdata/src/main/java/reflection/targets/ChangeModClass002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/ChangeModClass002.java
rename to testdata/src/main/java/reflection/targets/ChangeModClass002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget.java b/testdata/src/main/java/reflection/targets/ClassTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget.java
rename to testdata/src/main/java/reflection/targets/ClassTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget002.java b/testdata/src/main/java/reflection/targets/ClassTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget002.java
rename to testdata/src/main/java/reflection/targets/ClassTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget003.java b/testdata/src/main/java/reflection/targets/ClassTarget003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget003.java
rename to testdata/src/main/java/reflection/targets/ClassTarget003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/DefaultClass.java b/testdata/src/main/java/reflection/targets/DefaultClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/DefaultClass.java
rename to testdata/src/main/java/reflection/targets/DefaultClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/DefaultClass002.java b/testdata/src/main/java/reflection/targets/DefaultClass002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/DefaultClass002.java
rename to testdata/src/main/java/reflection/targets/DefaultClass002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodClass.java b/testdata/src/main/java/reflection/targets/GetMethodClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodClass.java
rename to testdata/src/main/java/reflection/targets/GetMethodClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodClass002.java b/testdata/src/main/java/reflection/targets/GetMethodClass002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodClass002.java
rename to testdata/src/main/java/reflection/targets/GetMethodClass002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodInterface.java b/testdata/src/main/java/reflection/targets/GetMethodInterface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodInterface.java
rename to testdata/src/main/java/reflection/targets/GetMethodInterface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodInterface002.java b/testdata/src/main/java/reflection/targets/GetMethodInterface002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodInterface002.java
rename to testdata/src/main/java/reflection/targets/GetMethodInterface002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubClass.java b/testdata/src/main/java/reflection/targets/GetMethodSubClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubClass.java
rename to testdata/src/main/java/reflection/targets/GetMethodSubClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubClass002.java b/testdata/src/main/java/reflection/targets/GetMethodSubClass002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubClass002.java
rename to testdata/src/main/java/reflection/targets/GetMethodSubClass002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubInterface.java b/testdata/src/main/java/reflection/targets/GetMethodSubInterface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubInterface.java
rename to testdata/src/main/java/reflection/targets/GetMethodSubInterface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubInterface002.java b/testdata/src/main/java/reflection/targets/GetMethodSubInterface002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubInterface002.java
rename to testdata/src/main/java/reflection/targets/GetMethodSubInterface002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/InterfaceTarget.java b/testdata/src/main/java/reflection/targets/InterfaceTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/InterfaceTarget.java
rename to testdata/src/main/java/reflection/targets/InterfaceTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/InterfaceTarget002.java b/testdata/src/main/java/reflection/targets/InterfaceTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/InterfaceTarget002.java
rename to testdata/src/main/java/reflection/targets/InterfaceTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/MyFrame.java b/testdata/src/main/java/reflection/targets/MyFrame.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/MyFrame.java
rename to testdata/src/main/java/reflection/targets/MyFrame.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/MyFrame002.java b/testdata/src/main/java/reflection/targets/MyFrame002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/MyFrame002.java
rename to testdata/src/main/java/reflection/targets/MyFrame002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/SimpleClass.java b/testdata/src/main/java/reflection/targets/SimpleClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/SimpleClass.java
rename to testdata/src/main/java/reflection/targets/SimpleClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/SimpleClass002.java b/testdata/src/main/java/reflection/targets/SimpleClass002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/SimpleClass002.java
rename to testdata/src/main/java/reflection/targets/SimpleClass002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassImplementsInterface.java b/testdata/src/main/java/reflection/targets/SubClassImplementsInterface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassImplementsInterface.java
rename to testdata/src/main/java/reflection/targets/SubClassImplementsInterface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassImplementsInterface002.java b/testdata/src/main/java/reflection/targets/SubClassImplementsInterface002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassImplementsInterface002.java
rename to testdata/src/main/java/reflection/targets/SubClassImplementsInterface002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget.java b/testdata/src/main/java/reflection/targets/SubClassTarget.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget.java
rename to testdata/src/main/java/reflection/targets/SubClassTarget.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget002.java b/testdata/src/main/java/reflection/targets/SubClassTarget002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget002.java
rename to testdata/src/main/java/reflection/targets/SubClassTarget002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget003.java b/testdata/src/main/java/reflection/targets/SubClassTarget003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget003.java
rename to testdata/src/main/java/reflection/targets/SubClassTarget003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/remote/One.java b/testdata/src/main/java/remote/One.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/remote/One.java
rename to testdata/src/main/java/remote/One.java
diff --git a/org.springsource.loaded.testdata/src/main/java/remote/One2.java b/testdata/src/main/java/remote/One2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/remote/One2.java
rename to testdata/src/main/java/remote/One2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/A.java b/testdata/src/main/java/sfields/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/A.java
rename to testdata/src/main/java/sfields/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/B.java b/testdata/src/main/java/sfields/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/B.java
rename to testdata/src/main/java/sfields/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/C.java b/testdata/src/main/java/sfields/C.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/C.java
rename to testdata/src/main/java/sfields/C.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/D.java b/testdata/src/main/java/sfields/D.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/D.java
rename to testdata/src/main/java/sfields/D.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/D2.java b/testdata/src/main/java/sfields/D2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/D2.java
rename to testdata/src/main/java/sfields/D2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/E.java b/testdata/src/main/java/sfields/E.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/E.java
rename to testdata/src/main/java/sfields/E.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/I.java b/testdata/src/main/java/sfields/I.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/I.java
rename to testdata/src/main/java/sfields/I.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/I2.java b/testdata/src/main/java/sfields/I2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/I2.java
rename to testdata/src/main/java/sfields/I2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/X.java b/testdata/src/main/java/sfields/X.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/X.java
rename to testdata/src/main/java/sfields/X.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/X2.java b/testdata/src/main/java/sfields/X2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/X2.java
rename to testdata/src/main/java/sfields/X2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/Y.java b/testdata/src/main/java/sfields/Y.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/Y.java
rename to testdata/src/main/java/sfields/Y.java
diff --git a/org.springsource.loaded.testdata/src/main/java/sfields/Y2.java b/testdata/src/main/java/sfields/Y2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/sfields/Y2.java
rename to testdata/src/main/java/sfields/Y2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/springloaded.properties b/testdata/src/main/java/springloaded.properties
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/springloaded.properties
rename to testdata/src/main/java/springloaded.properties
diff --git a/org.springsource.loaded.testdata/src/main/java/supercalls/OverloadExample.java b/testdata/src/main/java/supercalls/OverloadExample.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/supercalls/OverloadExample.java
rename to testdata/src/main/java/supercalls/OverloadExample.java
diff --git a/org.springsource.loaded.testdata/src/main/java/supercalls/Runner.java b/testdata/src/main/java/supercalls/Runner.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/supercalls/Runner.java
rename to testdata/src/main/java/supercalls/Runner.java
diff --git a/org.springsource.loaded.testdata/src/main/java/supercalls/Sub.java b/testdata/src/main/java/supercalls/Sub.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/supercalls/Sub.java
rename to testdata/src/main/java/supercalls/Sub.java
diff --git a/org.springsource.loaded.testdata/src/main/java/supercalls/Sub002.java b/testdata/src/main/java/supercalls/Sub002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/supercalls/Sub002.java
rename to testdata/src/main/java/supercalls/Sub002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/supercalls/Super.java b/testdata/src/main/java/supercalls/Super.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/supercalls/Super.java
rename to testdata/src/main/java/supercalls/Super.java
diff --git a/org.springsource.loaded.testdata/src/main/java/system/Eight.java b/testdata/src/main/java/system/Eight.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/system/Eight.java
rename to testdata/src/main/java/system/Eight.java
diff --git a/org.springsource.loaded.testdata/src/main/java/system/Five.java b/testdata/src/main/java/system/Five.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/system/Five.java
rename to testdata/src/main/java/system/Five.java
diff --git a/org.springsource.loaded.testdata/src/main/java/system/Four.java b/testdata/src/main/java/system/Four.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/system/Four.java
rename to testdata/src/main/java/system/Four.java
diff --git a/org.springsource.loaded.testdata/src/main/java/system/Nine.java b/testdata/src/main/java/system/Nine.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/system/Nine.java
rename to testdata/src/main/java/system/Nine.java
diff --git a/org.springsource.loaded.testdata/src/main/java/system/One.java b/testdata/src/main/java/system/One.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/system/One.java
rename to testdata/src/main/java/system/One.java
diff --git a/org.springsource.loaded.testdata/src/main/java/system/Seven.java b/testdata/src/main/java/system/Seven.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/system/Seven.java
rename to testdata/src/main/java/system/Seven.java
diff --git a/org.springsource.loaded.testdata/src/main/java/system/Six.java b/testdata/src/main/java/system/Six.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/system/Six.java
rename to testdata/src/main/java/system/Six.java
diff --git a/org.springsource.loaded.testdata/src/main/java/system/Three.java b/testdata/src/main/java/system/Three.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/system/Three.java
rename to testdata/src/main/java/system/Three.java
diff --git a/org.springsource.loaded.testdata/src/main/java/system/Two.java b/testdata/src/main/java/system/Two.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/system/Two.java
rename to testdata/src/main/java/system/Two.java
diff --git a/org.springsource.loaded.testdata/src/main/java/test/Initializers.java b/testdata/src/main/java/test/Initializers.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/test/Initializers.java
rename to testdata/src/main/java/test/Initializers.java
diff --git a/org.springsource.loaded.testdata/src/main/java/test/Interface.java b/testdata/src/main/java/test/Interface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/test/Interface.java
rename to testdata/src/main/java/test/Interface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/test/SubInitializers.java b/testdata/src/main/java/test/SubInitializers.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/test/SubInitializers.java
rename to testdata/src/main/java/test/SubInitializers.java
diff --git a/org.springsource.loaded.testdata/src/main/java/test/SubInterface.java b/testdata/src/main/java/test/SubInterface.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/test/SubInterface.java
rename to testdata/src/main/java/test/SubInterface.java
diff --git a/org.springsource.loaded.testdata/src/main/java/testapp/Demo.java b/testdata/src/main/java/testapp/Demo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/testapp/Demo.java
rename to testdata/src/main/java/testapp/Demo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass.java b/testdata/src/main/java/tgt/SimpleClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass.java
rename to testdata/src/main/java/tgt/SimpleClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass002.java b/testdata/src/main/java/tgt/SimpleClass002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass002.java
rename to testdata/src/main/java/tgt/SimpleClass002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass003.java b/testdata/src/main/java/tgt/SimpleClass003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass003.java
rename to testdata/src/main/java/tgt/SimpleClass003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass004.java b/testdata/src/main/java/tgt/SimpleClass004.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass004.java
rename to testdata/src/main/java/tgt/SimpleClass004.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass005.java b/testdata/src/main/java/tgt/SimpleClass005.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass005.java
rename to testdata/src/main/java/tgt/SimpleClass005.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass006.java b/testdata/src/main/java/tgt/SimpleClass006.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass006.java
rename to testdata/src/main/java/tgt/SimpleClass006.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass007.java b/testdata/src/main/java/tgt/SimpleClass007.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleClass007.java
rename to testdata/src/main/java/tgt/SimpleClass007.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleI.java b/testdata/src/main/java/tgt/SimpleI.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleI.java
rename to testdata/src/main/java/tgt/SimpleI.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleI002.java b/testdata/src/main/java/tgt/SimpleI002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleI002.java
rename to testdata/src/main/java/tgt/SimpleI002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleI003.java b/testdata/src/main/java/tgt/SimpleI003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleI003.java
rename to testdata/src/main/java/tgt/SimpleI003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleI004.java b/testdata/src/main/java/tgt/SimpleI004.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleI004.java
rename to testdata/src/main/java/tgt/SimpleI004.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleI005.java b/testdata/src/main/java/tgt/SimpleI005.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleI005.java
rename to testdata/src/main/java/tgt/SimpleI005.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleIClass.java b/testdata/src/main/java/tgt/SimpleIClass.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleIClass.java
rename to testdata/src/main/java/tgt/SimpleIClass.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleIClass003.java b/testdata/src/main/java/tgt/SimpleIClass003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleIClass003.java
rename to testdata/src/main/java/tgt/SimpleIClass003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleIClass005.java b/testdata/src/main/java/tgt/SimpleIClass005.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleIClass005.java
rename to testdata/src/main/java/tgt/SimpleIClass005.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleIClassTwo.java b/testdata/src/main/java/tgt/SimpleIClassTwo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleIClassTwo.java
rename to testdata/src/main/java/tgt/SimpleIClassTwo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleITwo.java b/testdata/src/main/java/tgt/SimpleITwo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleITwo.java
rename to testdata/src/main/java/tgt/SimpleITwo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/SimpleITwo002.java b/testdata/src/main/java/tgt/SimpleITwo002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/SimpleITwo002.java
rename to testdata/src/main/java/tgt/SimpleITwo002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/StaticCaller.java b/testdata/src/main/java/tgt/StaticCaller.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/StaticCaller.java
rename to testdata/src/main/java/tgt/StaticCaller.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/StaticCaller002.java b/testdata/src/main/java/tgt/StaticCaller002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/StaticCaller002.java
rename to testdata/src/main/java/tgt/StaticCaller002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/StaticCaller003.java b/testdata/src/main/java/tgt/StaticCaller003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/StaticCaller003.java
rename to testdata/src/main/java/tgt/StaticCaller003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/StaticICaller.java b/testdata/src/main/java/tgt/StaticICaller.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/StaticICaller.java
rename to testdata/src/main/java/tgt/StaticICaller.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/StaticICaller002.java b/testdata/src/main/java/tgt/StaticICaller002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/StaticICaller002.java
rename to testdata/src/main/java/tgt/StaticICaller002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/StaticICaller003.java b/testdata/src/main/java/tgt/StaticICaller003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/StaticICaller003.java
rename to testdata/src/main/java/tgt/StaticICaller003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/StaticICaller005.java b/testdata/src/main/java/tgt/StaticICaller005.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/StaticICaller005.java
rename to testdata/src/main/java/tgt/StaticICaller005.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/StaticICallerTwo.java b/testdata/src/main/java/tgt/StaticICallerTwo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/StaticICallerTwo.java
rename to testdata/src/main/java/tgt/StaticICallerTwo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/tgt/StaticICallerTwo002.java b/testdata/src/main/java/tgt/StaticICallerTwo002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/tgt/StaticICallerTwo002.java
rename to testdata/src/main/java/tgt/StaticICallerTwo002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/typedescriptor/A.java b/testdata/src/main/java/typedescriptor/A.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/typedescriptor/A.java
rename to testdata/src/main/java/typedescriptor/A.java
diff --git a/org.springsource.loaded.testdata/src/main/java/typedescriptor/A2.java b/testdata/src/main/java/typedescriptor/A2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/typedescriptor/A2.java
rename to testdata/src/main/java/typedescriptor/A2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/typedescriptor/B.java b/testdata/src/main/java/typedescriptor/B.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/typedescriptor/B.java
rename to testdata/src/main/java/typedescriptor/B.java
diff --git a/org.springsource.loaded.testdata/src/main/java/typedescriptor/B2.java b/testdata/src/main/java/typedescriptor/B2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/typedescriptor/B2.java
rename to testdata/src/main/java/typedescriptor/B2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/typedescriptor/C.java b/testdata/src/main/java/typedescriptor/C.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/typedescriptor/C.java
rename to testdata/src/main/java/typedescriptor/C.java
diff --git a/org.springsource.loaded.testdata/src/main/java/typedescriptor/C2.java b/testdata/src/main/java/typedescriptor/C2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/typedescriptor/C2.java
rename to testdata/src/main/java/typedescriptor/C2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne.java b/testdata/src/main/java/virtual/CalleeOne.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne.java
rename to testdata/src/main/java/virtual/CalleeOne.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne002.java b/testdata/src/main/java/virtual/CalleeOne002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne002.java
rename to testdata/src/main/java/virtual/CalleeOne002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne003.java b/testdata/src/main/java/virtual/CalleeOne003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne003.java
rename to testdata/src/main/java/virtual/CalleeOne003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeBottom.java b/testdata/src/main/java/virtual/CalleeThreeBottom.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeBottom.java
rename to testdata/src/main/java/virtual/CalleeThreeBottom.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeMiddle.java b/testdata/src/main/java/virtual/CalleeThreeMiddle.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeMiddle.java
rename to testdata/src/main/java/virtual/CalleeThreeMiddle.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop.java b/testdata/src/main/java/virtual/CalleeThreeTop.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop.java
rename to testdata/src/main/java/virtual/CalleeThreeTop.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop002.java b/testdata/src/main/java/virtual/CalleeThreeTop002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop002.java
rename to testdata/src/main/java/virtual/CalleeThreeTop002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop003.java b/testdata/src/main/java/virtual/CalleeThreeTop003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop003.java
rename to testdata/src/main/java/virtual/CalleeThreeTop003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoBottom.java b/testdata/src/main/java/virtual/CalleeTwoBottom.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoBottom.java
rename to testdata/src/main/java/virtual/CalleeTwoBottom.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop.java b/testdata/src/main/java/virtual/CalleeTwoTop.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop.java
rename to testdata/src/main/java/virtual/CalleeTwoTop.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop002.java b/testdata/src/main/java/virtual/CalleeTwoTop002.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop002.java
rename to testdata/src/main/java/virtual/CalleeTwoTop002.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop003.java b/testdata/src/main/java/virtual/CalleeTwoTop003.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop003.java
rename to testdata/src/main/java/virtual/CalleeTwoTop003.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CallerOne.java b/testdata/src/main/java/virtual/CallerOne.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CallerOne.java
rename to testdata/src/main/java/virtual/CallerOne.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CallerThree.java b/testdata/src/main/java/virtual/CallerThree.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CallerThree.java
rename to testdata/src/main/java/virtual/CallerThree.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/CallerTwo.java b/testdata/src/main/java/virtual/CallerTwo.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/CallerTwo.java
rename to testdata/src/main/java/virtual/CallerTwo.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourBot.java b/testdata/src/main/java/virtual/FourBot.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourBot.java
rename to testdata/src/main/java/virtual/FourBot.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourBot2.java b/testdata/src/main/java/virtual/FourBot2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourBot2.java
rename to testdata/src/main/java/virtual/FourBot2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourBotB.java b/testdata/src/main/java/virtual/FourBotB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourBotB.java
rename to testdata/src/main/java/virtual/FourBotB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourBotB2.java b/testdata/src/main/java/virtual/FourBotB2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourBotB2.java
rename to testdata/src/main/java/virtual/FourBotB2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourBotC.java b/testdata/src/main/java/virtual/FourBotC.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourBotC.java
rename to testdata/src/main/java/virtual/FourBotC.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourBotC2.java b/testdata/src/main/java/virtual/FourBotC2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourBotC2.java
rename to testdata/src/main/java/virtual/FourBotC2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourMidB.java b/testdata/src/main/java/virtual/FourMidB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourMidB.java
rename to testdata/src/main/java/virtual/FourMidB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourMidB2.java b/testdata/src/main/java/virtual/FourMidB2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourMidB2.java
rename to testdata/src/main/java/virtual/FourMidB2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourMidC.java b/testdata/src/main/java/virtual/FourMidC.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourMidC.java
rename to testdata/src/main/java/virtual/FourMidC.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourMidC2.java b/testdata/src/main/java/virtual/FourMidC2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourMidC2.java
rename to testdata/src/main/java/virtual/FourMidC2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourTop.java b/testdata/src/main/java/virtual/FourTop.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourTop.java
rename to testdata/src/main/java/virtual/FourTop.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourTop2.java b/testdata/src/main/java/virtual/FourTop2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourTop2.java
rename to testdata/src/main/java/virtual/FourTop2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourTopB.java b/testdata/src/main/java/virtual/FourTopB.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourTopB.java
rename to testdata/src/main/java/virtual/FourTopB.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourTopB2.java b/testdata/src/main/java/virtual/FourTopB2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourTopB2.java
rename to testdata/src/main/java/virtual/FourTopB2.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourTopC.java b/testdata/src/main/java/virtual/FourTopC.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourTopC.java
rename to testdata/src/main/java/virtual/FourTopC.java
diff --git a/org.springsource.loaded.testdata/src/main/java/virtual/FourTopC2.java b/testdata/src/main/java/virtual/FourTopC2.java
similarity index 100%
rename from org.springsource.loaded.testdata/src/main/java/virtual/FourTopC2.java
rename to testdata/src/main/java/virtual/FourTopC2.java