diff --git a/build.gradle b/build.gradle
index ba171fd..62bda46 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,6 @@ subprojects {
 	targetCompatibility = 1.6
 }
 
-configure(subprojects.findAll { it.name=='springloaded-core' }) {
-    apply plugin: 'maven'
-}
+configure(subprojects.findAll { it.name.startsWith('testdata')}) {
+	tasks.findByPath("artifactoryPublish")?.enabled = false
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 012ce5a..34851ef 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include "springloaded-core"
+include "springloaded"
 include "testdata"
 include "testdata-groovy"
 include "testdata-plugin"
diff --git a/springloaded-core/.classpath b/springloaded/.classpath
similarity index 100%
rename from springloaded-core/.classpath
rename to springloaded/.classpath
diff --git a/springloaded-core/.project b/springloaded/.project
similarity index 100%
rename from springloaded-core/.project
rename to springloaded/.project
diff --git a/springloaded-core/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/springloaded/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
similarity index 100%
rename from springloaded-core/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
rename to springloaded/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
diff --git a/springloaded-core/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs b/springloaded/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs
similarity index 100%
rename from springloaded-core/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs
rename to springloaded/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs
diff --git a/springloaded-core/.settings/org.eclipse.jdt.core.prefs b/springloaded/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from springloaded-core/.settings/org.eclipse.jdt.core.prefs
rename to springloaded/.settings/org.eclipse.jdt.core.prefs
diff --git a/springloaded-core/.settings/org.eclipse.jdt.groovy.core.prefs b/springloaded/.settings/org.eclipse.jdt.groovy.core.prefs
similarity index 100%
rename from springloaded-core/.settings/org.eclipse.jdt.groovy.core.prefs
rename to springloaded/.settings/org.eclipse.jdt.groovy.core.prefs
diff --git a/springloaded-core/LICENSES/LICENSE b/springloaded/LICENSES/LICENSE
similarity index 100%
rename from springloaded-core/LICENSES/LICENSE
rename to springloaded/LICENSES/LICENSE
diff --git a/springloaded-core/LICENSES/notice.txt b/springloaded/LICENSES/notice.txt
similarity index 100%
rename from springloaded-core/LICENSES/notice.txt
rename to springloaded/LICENSES/notice.txt
diff --git a/springloaded-core/build.gradle b/springloaded/build.gradle
similarity index 99%
rename from springloaded-core/build.gradle
rename to springloaded/build.gradle
index 03d52ed..888dc94 100644
--- a/springloaded-core/build.gradle
+++ b/springloaded/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'maven'
+
 group = "org.springsource.loaded"
 version = '1.1.5.BUILD-SNAPSHOT'
 jar.baseName = 'springloaded'
diff --git a/springloaded-core/gradle/wrapper/gradle-wrapper.jar b/springloaded/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from springloaded-core/gradle/wrapper/gradle-wrapper.jar
rename to springloaded/gradle/wrapper/gradle-wrapper.jar
diff --git a/springloaded-core/gradle/wrapper/gradle-wrapper.properties b/springloaded/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from springloaded-core/gradle/wrapper/gradle-wrapper.properties
rename to springloaded/gradle/wrapper/gradle-wrapper.properties
diff --git a/springloaded-core/gradlew b/springloaded/gradlew
similarity index 100%
rename from springloaded-core/gradlew
rename to springloaded/gradlew
diff --git a/springloaded-core/gradlew.bat b/springloaded/gradlew.bat
similarity index 100%
rename from springloaded-core/gradlew.bat
rename to springloaded/gradlew.bat
diff --git a/springloaded-core/logging.properties b/springloaded/logging.properties
similarity index 100%
rename from springloaded-core/logging.properties
rename to springloaded/logging.properties
diff --git a/springloaded-core/src/main/java/META-INF/MANIFEST.MF b/springloaded/src/main/java/META-INF/MANIFEST.MF
similarity index 100%
rename from springloaded-core/src/main/java/META-INF/MANIFEST.MF
rename to springloaded/src/main/java/META-INF/MANIFEST.MF
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/AbstractMember.java b/springloaded/src/main/java/org/springsource/loaded/AbstractMember.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/AbstractMember.java
rename to springloaded/src/main/java/org/springsource/loaded/AbstractMember.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/AnyTypePattern.java b/springloaded/src/main/java/org/springsource/loaded/AnyTypePattern.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/AnyTypePattern.java
rename to springloaded/src/main/java/org/springsource/loaded/AnyTypePattern.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/Asserts.java b/springloaded/src/main/java/org/springsource/loaded/Asserts.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/Asserts.java
rename to springloaded/src/main/java/org/springsource/loaded/Asserts.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/C.java b/springloaded/src/main/java/org/springsource/loaded/C.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/C.java
rename to springloaded/src/main/java/org/springsource/loaded/C.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ChildClassLoader.java b/springloaded/src/main/java/org/springsource/loaded/ChildClassLoader.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ChildClassLoader.java
rename to springloaded/src/main/java/org/springsource/loaded/ChildClassLoader.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ClassRenamer.java b/springloaded/src/main/java/org/springsource/loaded/ClassRenamer.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ClassRenamer.java
rename to springloaded/src/main/java/org/springsource/loaded/ClassRenamer.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ConstantPoolChecker.java b/springloaded/src/main/java/org/springsource/loaded/ConstantPoolChecker.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ConstantPoolChecker.java
rename to springloaded/src/main/java/org/springsource/loaded/ConstantPoolChecker.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ConstantPoolChecker2.java b/springloaded/src/main/java/org/springsource/loaded/ConstantPoolChecker2.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ConstantPoolChecker2.java
rename to springloaded/src/main/java/org/springsource/loaded/ConstantPoolChecker2.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/Constants.java b/springloaded/src/main/java/org/springsource/loaded/Constants.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/Constants.java
rename to springloaded/src/main/java/org/springsource/loaded/Constants.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ConstructorCopier.java b/springloaded/src/main/java/org/springsource/loaded/ConstructorCopier.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ConstructorCopier.java
rename to springloaded/src/main/java/org/springsource/loaded/ConstructorCopier.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/CurrentLiveVersion.java b/springloaded/src/main/java/org/springsource/loaded/CurrentLiveVersion.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/CurrentLiveVersion.java
rename to springloaded/src/main/java/org/springsource/loaded/CurrentLiveVersion.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/DispatcherBuilder.java b/springloaded/src/main/java/org/springsource/loaded/DispatcherBuilder.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/DispatcherBuilder.java
rename to springloaded/src/main/java/org/springsource/loaded/DispatcherBuilder.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/EmptyClassVisitor.java b/springloaded/src/main/java/org/springsource/loaded/EmptyClassVisitor.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/EmptyClassVisitor.java
rename to springloaded/src/main/java/org/springsource/loaded/EmptyClassVisitor.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ExactTypePattern.java b/springloaded/src/main/java/org/springsource/loaded/ExactTypePattern.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ExactTypePattern.java
rename to springloaded/src/main/java/org/springsource/loaded/ExactTypePattern.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ExecutorBuilder.java b/springloaded/src/main/java/org/springsource/loaded/ExecutorBuilder.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ExecutorBuilder.java
rename to springloaded/src/main/java/org/springsource/loaded/ExecutorBuilder.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/FieldDelta.java b/springloaded/src/main/java/org/springsource/loaded/FieldDelta.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/FieldDelta.java
rename to springloaded/src/main/java/org/springsource/loaded/FieldDelta.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/FieldMember.java b/springloaded/src/main/java/org/springsource/loaded/FieldMember.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/FieldMember.java
rename to springloaded/src/main/java/org/springsource/loaded/FieldMember.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/FieldReaderWriter.java b/springloaded/src/main/java/org/springsource/loaded/FieldReaderWriter.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/FieldReaderWriter.java
rename to springloaded/src/main/java/org/springsource/loaded/FieldReaderWriter.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/FileChangeListener.java b/springloaded/src/main/java/org/springsource/loaded/FileChangeListener.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/FileChangeListener.java
rename to springloaded/src/main/java/org/springsource/loaded/FileChangeListener.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/GlobalConfiguration.java b/springloaded/src/main/java/org/springsource/loaded/GlobalConfiguration.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/GlobalConfiguration.java
rename to springloaded/src/main/java/org/springsource/loaded/GlobalConfiguration.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ISMgr.java b/springloaded/src/main/java/org/springsource/loaded/ISMgr.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ISMgr.java
rename to springloaded/src/main/java/org/springsource/loaded/ISMgr.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/IncrementalTypeDescriptor.java b/springloaded/src/main/java/org/springsource/loaded/IncrementalTypeDescriptor.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/IncrementalTypeDescriptor.java
rename to springloaded/src/main/java/org/springsource/loaded/IncrementalTypeDescriptor.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/InterfaceExtractor.java b/springloaded/src/main/java/org/springsource/loaded/InterfaceExtractor.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/InterfaceExtractor.java
rename to springloaded/src/main/java/org/springsource/loaded/InterfaceExtractor.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/IsReloadableTypePlugin.java b/springloaded/src/main/java/org/springsource/loaded/IsReloadableTypePlugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/IsReloadableTypePlugin.java
rename to springloaded/src/main/java/org/springsource/loaded/IsReloadableTypePlugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/LoadtimeInstrumentationPlugin.java b/springloaded/src/main/java/org/springsource/loaded/LoadtimeInstrumentationPlugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/LoadtimeInstrumentationPlugin.java
rename to springloaded/src/main/java/org/springsource/loaded/LoadtimeInstrumentationPlugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/MethodCopier.java b/springloaded/src/main/java/org/springsource/loaded/MethodCopier.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/MethodCopier.java
rename to springloaded/src/main/java/org/springsource/loaded/MethodCopier.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/MethodDelta.java b/springloaded/src/main/java/org/springsource/loaded/MethodDelta.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/MethodDelta.java
rename to springloaded/src/main/java/org/springsource/loaded/MethodDelta.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/MethodInvokerRewriter.java b/springloaded/src/main/java/org/springsource/loaded/MethodInvokerRewriter.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/MethodInvokerRewriter.java
rename to springloaded/src/main/java/org/springsource/loaded/MethodInvokerRewriter.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/MethodMember.java b/springloaded/src/main/java/org/springsource/loaded/MethodMember.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/MethodMember.java
rename to springloaded/src/main/java/org/springsource/loaded/MethodMember.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/NameRegistry.java b/springloaded/src/main/java/org/springsource/loaded/NameRegistry.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/NameRegistry.java
rename to springloaded/src/main/java/org/springsource/loaded/NameRegistry.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/Plugin.java b/springloaded/src/main/java/org/springsource/loaded/Plugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/Plugin.java
rename to springloaded/src/main/java/org/springsource/loaded/Plugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/Plugins.java b/springloaded/src/main/java/org/springsource/loaded/Plugins.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/Plugins.java
rename to springloaded/src/main/java/org/springsource/loaded/Plugins.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/PrefixTypePattern.java b/springloaded/src/main/java/org/springsource/loaded/PrefixTypePattern.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/PrefixTypePattern.java
rename to springloaded/src/main/java/org/springsource/loaded/PrefixTypePattern.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/QuickVisitor.java b/springloaded/src/main/java/org/springsource/loaded/QuickVisitor.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/QuickVisitor.java
rename to springloaded/src/main/java/org/springsource/loaded/QuickVisitor.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/RTH.java b/springloaded/src/main/java/org/springsource/loaded/RTH.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/RTH.java
rename to springloaded/src/main/java/org/springsource/loaded/RTH.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ReflectionFieldReaderWriter.java b/springloaded/src/main/java/org/springsource/loaded/ReflectionFieldReaderWriter.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ReflectionFieldReaderWriter.java
rename to springloaded/src/main/java/org/springsource/loaded/ReflectionFieldReaderWriter.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ReloadEventProcessorPlugin.java b/springloaded/src/main/java/org/springsource/loaded/ReloadEventProcessorPlugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ReloadEventProcessorPlugin.java
rename to springloaded/src/main/java/org/springsource/loaded/ReloadEventProcessorPlugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ReloadException.java b/springloaded/src/main/java/org/springsource/loaded/ReloadException.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ReloadException.java
rename to springloaded/src/main/java/org/springsource/loaded/ReloadException.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ReloadableType.java b/springloaded/src/main/java/org/springsource/loaded/ReloadableType.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ReloadableType.java
rename to springloaded/src/main/java/org/springsource/loaded/ReloadableType.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/SSMgr.java b/springloaded/src/main/java/org/springsource/loaded/SSMgr.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/SSMgr.java
rename to springloaded/src/main/java/org/springsource/loaded/SSMgr.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/SpringLoaded.java b/springloaded/src/main/java/org/springsource/loaded/SpringLoaded.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/SpringLoaded.java
rename to springloaded/src/main/java/org/springsource/loaded/SpringLoaded.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/SystemClassReflectionInvestigator.java b/springloaded/src/main/java/org/springsource/loaded/SystemClassReflectionInvestigator.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/SystemClassReflectionInvestigator.java
rename to springloaded/src/main/java/org/springsource/loaded/SystemClassReflectionInvestigator.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/SystemClassReflectionRewriter.java b/springloaded/src/main/java/org/springsource/loaded/SystemClassReflectionRewriter.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/SystemClassReflectionRewriter.java
rename to springloaded/src/main/java/org/springsource/loaded/SystemClassReflectionRewriter.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/SystemPropertyConfiguredIsReloadableTypePlugin.java b/springloaded/src/main/java/org/springsource/loaded/SystemPropertyConfiguredIsReloadableTypePlugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/SystemPropertyConfiguredIsReloadableTypePlugin.java
rename to springloaded/src/main/java/org/springsource/loaded/SystemPropertyConfiguredIsReloadableTypePlugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/TypeDelta.java b/springloaded/src/main/java/org/springsource/loaded/TypeDelta.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/TypeDelta.java
rename to springloaded/src/main/java/org/springsource/loaded/TypeDelta.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/TypeDescriptor.java b/springloaded/src/main/java/org/springsource/loaded/TypeDescriptor.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/TypeDescriptor.java
rename to springloaded/src/main/java/org/springsource/loaded/TypeDescriptor.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/TypeDescriptorExtractor.java b/springloaded/src/main/java/org/springsource/loaded/TypeDescriptorExtractor.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/TypeDescriptorExtractor.java
rename to springloaded/src/main/java/org/springsource/loaded/TypeDescriptorExtractor.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/TypeDiffComputer.java b/springloaded/src/main/java/org/springsource/loaded/TypeDiffComputer.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/TypeDiffComputer.java
rename to springloaded/src/main/java/org/springsource/loaded/TypeDiffComputer.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/TypePattern.java b/springloaded/src/main/java/org/springsource/loaded/TypePattern.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/TypePattern.java
rename to springloaded/src/main/java/org/springsource/loaded/TypePattern.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/TypeRegistry.java b/springloaded/src/main/java/org/springsource/loaded/TypeRegistry.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/TypeRegistry.java
rename to springloaded/src/main/java/org/springsource/loaded/TypeRegistry.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/TypeRewriter.java b/springloaded/src/main/java/org/springsource/loaded/TypeRewriter.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/TypeRewriter.java
rename to springloaded/src/main/java/org/springsource/loaded/TypeRewriter.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/UnableToLoadClassException.java b/springloaded/src/main/java/org/springsource/loaded/UnableToLoadClassException.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/UnableToLoadClassException.java
rename to springloaded/src/main/java/org/springsource/loaded/UnableToLoadClassException.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/UnableToReloadEventProcessorPlugin.java b/springloaded/src/main/java/org/springsource/loaded/UnableToReloadEventProcessorPlugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/UnableToReloadEventProcessorPlugin.java
rename to springloaded/src/main/java/org/springsource/loaded/UnableToReloadEventProcessorPlugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/Utils.java b/springloaded/src/main/java/org/springsource/loaded/Utils.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/Utils.java
rename to springloaded/src/main/java/org/springsource/loaded/Utils.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/__DynamicallyDispatchable.java b/springloaded/src/main/java/org/springsource/loaded/__DynamicallyDispatchable.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/__DynamicallyDispatchable.java
rename to springloaded/src/main/java/org/springsource/loaded/__DynamicallyDispatchable.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/CglibPlugin.java b/springloaded/src/main/java/org/springsource/loaded/agent/CglibPlugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/CglibPlugin.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/CglibPlugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/CglibPluginCapturing.java b/springloaded/src/main/java/org/springsource/loaded/agent/CglibPluginCapturing.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/CglibPluginCapturing.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/CglibPluginCapturing.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/ClassPreProcessorAgentAdapter.java b/springloaded/src/main/java/org/springsource/loaded/agent/ClassPreProcessorAgentAdapter.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/ClassPreProcessorAgentAdapter.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/ClassPreProcessorAgentAdapter.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/ClassVisitingConstructorAppender.java b/springloaded/src/main/java/org/springsource/loaded/agent/ClassVisitingConstructorAppender.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/ClassVisitingConstructorAppender.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/ClassVisitingConstructorAppender.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/FalseReturner.java b/springloaded/src/main/java/org/springsource/loaded/agent/FalseReturner.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/FalseReturner.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/FalseReturner.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/FileSystemWatcher.java b/springloaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcher.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/FileSystemWatcher.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcher.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/GrailsPlugin.java b/springloaded/src/main/java/org/springsource/loaded/agent/GrailsPlugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/GrailsPlugin.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/GrailsPlugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/GroovyPlugin.java b/springloaded/src/main/java/org/springsource/loaded/agent/GroovyPlugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/GroovyPlugin.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/GroovyPlugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/Impossible.java b/springloaded/src/main/java/org/springsource/loaded/agent/Impossible.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/Impossible.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/Impossible.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/JVMPlugin.java b/springloaded/src/main/java/org/springsource/loaded/agent/JVMPlugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/JVMPlugin.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/JVMPlugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/ModifyDefineInClassLoaderForClassArtifactsType.java b/springloaded/src/main/java/org/springsource/loaded/agent/ModifyDefineInClassLoaderForClassArtifactsType.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/ModifyDefineInClassLoaderForClassArtifactsType.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/ModifyDefineInClassLoaderForClassArtifactsType.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/NonFinalizer.java b/springloaded/src/main/java/org/springsource/loaded/agent/NonFinalizer.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/NonFinalizer.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/NonFinalizer.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/PluginUtils.java b/springloaded/src/main/java/org/springsource/loaded/agent/PluginUtils.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/PluginUtils.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/PluginUtils.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/ReloadDecision.java b/springloaded/src/main/java/org/springsource/loaded/agent/ReloadDecision.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/ReloadDecision.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/ReloadDecision.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java b/springloaded/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/SpringLoadedAgent.java b/springloaded/src/main/java/org/springsource/loaded/agent/SpringLoadedAgent.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/SpringLoadedAgent.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/SpringLoadedAgent.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java b/springloaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/agent/SpringPlugin.java b/springloaded/src/main/java/org/springsource/loaded/agent/SpringPlugin.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/agent/SpringPlugin.java
rename to springloaded/src/main/java/org/springsource/loaded/agent/SpringPlugin.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/infra/SLFormatter.java b/springloaded/src/main/java/org/springsource/loaded/infra/SLFormatter.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/infra/SLFormatter.java
rename to springloaded/src/main/java/org/springsource/loaded/infra/SLFormatter.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/infra/UsedByGeneratedCode.java b/springloaded/src/main/java/org/springsource/loaded/infra/UsedByGeneratedCode.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/infra/UsedByGeneratedCode.java
rename to springloaded/src/main/java/org/springsource/loaded/infra/UsedByGeneratedCode.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/jvm/JVM.java b/springloaded/src/main/java/org/springsource/loaded/jvm/JVM.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/jvm/JVM.java
rename to springloaded/src/main/java/org/springsource/loaded/jvm/JVM.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/pluginhelpers/EmptyCtor.java b/springloaded/src/main/java/org/springsource/loaded/pluginhelpers/EmptyCtor.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/pluginhelpers/EmptyCtor.java
rename to springloaded/src/main/java/org/springsource/loaded/pluginhelpers/EmptyCtor.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/DynamicLookup.java b/springloaded/src/main/java/org/springsource/loaded/ri/DynamicLookup.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/DynamicLookup.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/DynamicLookup.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/Exceptions.java b/springloaded/src/main/java/org/springsource/loaded/ri/Exceptions.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/Exceptions.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/Exceptions.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/FieldLookup.java b/springloaded/src/main/java/org/springsource/loaded/ri/FieldLookup.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/FieldLookup.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/FieldLookup.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/GetDeclaredFieldLookup.java b/springloaded/src/main/java/org/springsource/loaded/ri/GetDeclaredFieldLookup.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/GetDeclaredFieldLookup.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/GetDeclaredFieldLookup.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/GetDeclaredMethodLookup.java b/springloaded/src/main/java/org/springsource/loaded/ri/GetDeclaredMethodLookup.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/GetDeclaredMethodLookup.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/GetDeclaredMethodLookup.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/GetFieldLookup.java b/springloaded/src/main/java/org/springsource/loaded/ri/GetFieldLookup.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/GetFieldLookup.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/GetFieldLookup.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/GetMethodLookup.java b/springloaded/src/main/java/org/springsource/loaded/ri/GetMethodLookup.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/GetMethodLookup.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/GetMethodLookup.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/GetMethodsLookup.java b/springloaded/src/main/java/org/springsource/loaded/ri/GetMethodsLookup.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/GetMethodsLookup.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/GetMethodsLookup.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/Invoker.java b/springloaded/src/main/java/org/springsource/loaded/ri/Invoker.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/Invoker.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/Invoker.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/JavaClassMethodProvider.java b/springloaded/src/main/java/org/springsource/loaded/ri/JavaClassMethodProvider.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/JavaClassMethodProvider.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/JavaClassMethodProvider.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/JavaMethodCache.java b/springloaded/src/main/java/org/springsource/loaded/ri/JavaMethodCache.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/JavaMethodCache.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/JavaMethodCache.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/JavaMethodInvoker.java b/springloaded/src/main/java/org/springsource/loaded/ri/JavaMethodInvoker.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/JavaMethodInvoker.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/JavaMethodInvoker.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/MethodProvider.java b/springloaded/src/main/java/org/springsource/loaded/ri/MethodProvider.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/MethodProvider.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/MethodProvider.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/OriginalClassInvoker.java b/springloaded/src/main/java/org/springsource/loaded/ri/OriginalClassInvoker.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/OriginalClassInvoker.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/OriginalClassInvoker.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/ReflectiveInterceptor.java b/springloaded/src/main/java/org/springsource/loaded/ri/ReflectiveInterceptor.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/ReflectiveInterceptor.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/ReflectiveInterceptor.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/ReloadableTypeMethodProvider.java b/springloaded/src/main/java/org/springsource/loaded/ri/ReloadableTypeMethodProvider.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/ReloadableTypeMethodProvider.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/ReloadableTypeMethodProvider.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/ReloadedTypeInvoker.java b/springloaded/src/main/java/org/springsource/loaded/ri/ReloadedTypeInvoker.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/ReloadedTypeInvoker.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/ReloadedTypeInvoker.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/StaticLookup.java b/springloaded/src/main/java/org/springsource/loaded/ri/StaticLookup.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/StaticLookup.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/StaticLookup.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/ri/TypeDescriptorMethodProvider.java b/springloaded/src/main/java/org/springsource/loaded/ri/TypeDescriptorMethodProvider.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/ri/TypeDescriptorMethodProvider.java
rename to springloaded/src/main/java/org/springsource/loaded/ri/TypeDescriptorMethodProvider.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java b/springloaded/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java
rename to springloaded/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java
diff --git a/springloaded-core/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java b/springloaded/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java
similarity index 100%
rename from springloaded-core/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java
rename to springloaded/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/perf/test/PerformanceTests.java b/springloaded/src/test/java/org/springsource/loaded/perf/test/PerformanceTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/perf/test/PerformanceTests.java
rename to springloaded/src/test/java/org/springsource/loaded/perf/test/PerformanceTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/perf/test/WeavingPerformanceTests.java b/springloaded/src/test/java/org/springsource/loaded/perf/test/WeavingPerformanceTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/perf/test/WeavingPerformanceTests.java
rename to springloaded/src/test/java/org/springsource/loaded/perf/test/WeavingPerformanceTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/AbstractReflectionTests.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/AbstractReflectionTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/AbstractReflectionTests.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/AbstractReflectionTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/BridgeMethodTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/BridgeMethodTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/BridgeMethodTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/BridgeMethodTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationsTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetAnnotationsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorsTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetConstructorsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetDeclaredMethodsTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetDeclaredMethodsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetDeclaredMethodsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetDeclaredMethodsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldsTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetFieldsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodsTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetMethodsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetModifiersTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetModifiersTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassGetModifiersTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassGetModifiersTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassNewInstanceTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassNewInstanceTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassNewInstanceTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassNewInstanceTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassReflectionTests.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ClassReflectionTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ClassReflectionTests.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ClassReflectionTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorAdHocTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ConstructorAdHocTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorAdHocTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ConstructorAdHocTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationsTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ConstructorGetAnnotationsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorNewInstanceTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/ConstructorNewInstanceTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/ConstructorNewInstanceTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/ConstructorNewInstanceTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldAdHocTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/FieldAdHocTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldAdHocTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/FieldAdHocTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAndSetTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAndSetTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAndSetTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAndSetTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationsTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/FieldGetAnnotationsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldSetAccessTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/FieldSetAccessTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/FieldSetAccessTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/FieldSetAccessTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGenericsAndVarArgsTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/MethodGenericsAndVarArgsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGenericsAndVarArgsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/MethodGenericsAndVarArgsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationsTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/MethodGetAnnotationsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetParamAnnotationsTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/MethodGetParamAnnotationsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodGetParamAnnotationsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/MethodGetParamAnnotationsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodInvokeTest.java b/springloaded/src/test/java/org/springsource/loaded/ri/test/MethodInvokeTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/ri/test/MethodInvokeTest.java
rename to springloaded/src/test/java/org/springsource/loaded/ri/test/MethodInvokeTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/CatcherTests.java b/springloaded/src/test/java/org/springsource/loaded/test/CatcherTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/CatcherTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/CatcherTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/CglibProxyTests.java b/springloaded/src/test/java/org/springsource/loaded/test/CglibProxyTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/CglibProxyTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/CglibProxyTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/ClassRenamerTests.java b/springloaded/src/test/java/org/springsource/loaded/test/ClassRenamerTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/ClassRenamerTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/ClassRenamerTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/CodeGenerationTests.java b/springloaded/src/test/java/org/springsource/loaded/test/CodeGenerationTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/CodeGenerationTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/CodeGenerationTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/CrossLoaderTests.java b/springloaded/src/test/java/org/springsource/loaded/test/CrossLoaderTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/CrossLoaderTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/CrossLoaderTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/DebuggingTests.java b/springloaded/src/test/java/org/springsource/loaded/test/DebuggingTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/DebuggingTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/DebuggingTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/DispatcherBuilderTests.java b/springloaded/src/test/java/org/springsource/loaded/test/DispatcherBuilderTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/DispatcherBuilderTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/DispatcherBuilderTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/EnumTests.java b/springloaded/src/test/java/org/springsource/loaded/test/EnumTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/EnumTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/EnumTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/ExecutorBuilderTests.java b/springloaded/src/test/java/org/springsource/loaded/test/ExecutorBuilderTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/ExecutorBuilderTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/ExecutorBuilderTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/FieldReloadingTests.java b/springloaded/src/test/java/org/springsource/loaded/test/FieldReloadingTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/FieldReloadingTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/FieldReloadingTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/FileSystemWatcherTests.java b/springloaded/src/test/java/org/springsource/loaded/test/FileSystemWatcherTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/FileSystemWatcherTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/FileSystemWatcherTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/GroovyBenchmarkTests.java b/springloaded/src/test/java/org/springsource/loaded/test/GroovyBenchmarkTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/GroovyBenchmarkTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/GroovyBenchmarkTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/GroovyTests.java b/springloaded/src/test/java/org/springsource/loaded/test/GroovyTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/GroovyTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/GroovyTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/IncrementalTypeDescriptorTests.java b/springloaded/src/test/java/org/springsource/loaded/test/IncrementalTypeDescriptorTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/IncrementalTypeDescriptorTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/IncrementalTypeDescriptorTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/InnerClassesTests.java b/springloaded/src/test/java/org/springsource/loaded/test/InnerClassesTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/InnerClassesTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/InnerClassesTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/InterfaceExtractorTest.java b/springloaded/src/test/java/org/springsource/loaded/test/InterfaceExtractorTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/InterfaceExtractorTest.java
rename to springloaded/src/test/java/org/springsource/loaded/test/InterfaceExtractorTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/JavaMicroBenchmarkTests.java b/springloaded/src/test/java/org/springsource/loaded/test/JavaMicroBenchmarkTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/JavaMicroBenchmarkTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/JavaMicroBenchmarkTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/MethodInvokerRewriterTests.java b/springloaded/src/test/java/org/springsource/loaded/test/MethodInvokerRewriterTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/MethodInvokerRewriterTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/MethodInvokerRewriterTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/NameRegistryTests.java b/springloaded/src/test/java/org/springsource/loaded/test/NameRegistryTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/NameRegistryTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/NameRegistryTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/PluginTests.java b/springloaded/src/test/java/org/springsource/loaded/test/PluginTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/PluginTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/PluginTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/ProxyTests.java b/springloaded/src/test/java/org/springsource/loaded/test/ProxyTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/ProxyTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/ProxyTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/ReflectiveReflectionTests.java b/springloaded/src/test/java/org/springsource/loaded/test/ReflectiveReflectionTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/ReflectiveReflectionTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/ReflectiveReflectionTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/ReloadableTypeTests.java b/springloaded/src/test/java/org/springsource/loaded/test/ReloadableTypeTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/ReloadableTypeTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/ReloadableTypeTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/ReloadingJVM.java b/springloaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
rename to springloaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/ReloadingJVMCommandProcess.java b/springloaded/src/test/java/org/springsource/loaded/test/ReloadingJVMCommandProcess.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/ReloadingJVMCommandProcess.java
rename to springloaded/src/test/java/org/springsource/loaded/test/ReloadingJVMCommandProcess.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/ScenarioTests.java b/springloaded/src/test/java/org/springsource/loaded/test/ScenarioTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/ScenarioTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/ScenarioTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java b/springloaded/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/SpringLoadedTestsInSeparateJVM.java b/springloaded/src/test/java/org/springsource/loaded/test/SpringLoadedTestsInSeparateJVM.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/SpringLoadedTestsInSeparateJVM.java
rename to springloaded/src/test/java/org/springsource/loaded/test/SpringLoadedTestsInSeparateJVM.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/SystemClassReflectionRewriterTests.java b/springloaded/src/test/java/org/springsource/loaded/test/SystemClassReflectionRewriterTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/SystemClassReflectionRewriterTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/SystemClassReflectionRewriterTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/Target.java b/springloaded/src/test/java/org/springsource/loaded/test/Target.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/Target.java
rename to springloaded/src/test/java/org/springsource/loaded/test/Target.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/TestController.java b/springloaded/src/test/java/org/springsource/loaded/test/TestController.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/TestController.java
rename to springloaded/src/test/java/org/springsource/loaded/test/TestController.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/TestInfrastructureTests.java b/springloaded/src/test/java/org/springsource/loaded/test/TestInfrastructureTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/TestInfrastructureTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/TestInfrastructureTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/TestUtils.java b/springloaded/src/test/java/org/springsource/loaded/test/TestUtils.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/TestUtils.java
rename to springloaded/src/test/java/org/springsource/loaded/test/TestUtils.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/TypeDeltaTests.java b/springloaded/src/test/java/org/springsource/loaded/test/TypeDeltaTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/TypeDeltaTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/TypeDeltaTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/TypeDescriptorExtractorTests.java b/springloaded/src/test/java/org/springsource/loaded/test/TypeDescriptorExtractorTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/TypeDescriptorExtractorTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/TypeDescriptorExtractorTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/TypeDescriptorTests.java b/springloaded/src/test/java/org/springsource/loaded/test/TypeDescriptorTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/TypeDescriptorTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/TypeDescriptorTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/TypePatternTests.java b/springloaded/src/test/java/org/springsource/loaded/test/TypePatternTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/TypePatternTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/TypePatternTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/TypeRegistryTests.java b/springloaded/src/test/java/org/springsource/loaded/test/TypeRegistryTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/TypeRegistryTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/TypeRegistryTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/TypeRewriterTests.java b/springloaded/src/test/java/org/springsource/loaded/test/TypeRewriterTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/TypeRewriterTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/TypeRewriterTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/UtilsTests.java b/springloaded/src/test/java/org/springsource/loaded/test/UtilsTests.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/UtilsTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/UtilsTests.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/infra/FakeMethodVisitor.java b/springloaded/src/test/java/org/springsource/loaded/test/infra/FakeMethodVisitor.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/infra/FakeMethodVisitor.java
rename to springloaded/src/test/java/org/springsource/loaded/test/infra/FakeMethodVisitor.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/infra/IResult.java b/springloaded/src/test/java/org/springsource/loaded/test/infra/IResult.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/infra/IResult.java
rename to springloaded/src/test/java/org/springsource/loaded/test/infra/IResult.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/infra/Result.java b/springloaded/src/test/java/org/springsource/loaded/test/infra/Result.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/infra/Result.java
rename to springloaded/src/test/java/org/springsource/loaded/test/infra/Result.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/infra/ResultException.java b/springloaded/src/test/java/org/springsource/loaded/test/infra/ResultException.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/infra/ResultException.java
rename to springloaded/src/test/java/org/springsource/loaded/test/infra/ResultException.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/infra/RewriteReflectUtilsDefineClass.java b/springloaded/src/test/java/org/springsource/loaded/test/infra/RewriteReflectUtilsDefineClass.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/infra/RewriteReflectUtilsDefineClass.java
rename to springloaded/src/test/java/org/springsource/loaded/test/infra/RewriteReflectUtilsDefineClass.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/infra/SubLoader.java b/springloaded/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
rename to springloaded/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java b/springloaded/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
rename to springloaded/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/infra/TestClassLoader.java b/springloaded/src/test/java/org/springsource/loaded/test/infra/TestClassLoader.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/infra/TestClassLoader.java
rename to springloaded/src/test/java/org/springsource/loaded/test/infra/TestClassLoader.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java b/springloaded/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
rename to springloaded/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/ChoiceGenerationTest.java b/springloaded/src/test/java/org/springsource/loaded/testgen/ChoiceGenerationTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/ChoiceGenerationTest.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/ChoiceGenerationTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/ExecutionContextsTest.java b/springloaded/src/test/java/org/springsource/loaded/testgen/ExecutionContextsTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/ExecutionContextsTest.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/ExecutionContextsTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/ExploreAllChoicesRunner.java b/springloaded/src/test/java/org/springsource/loaded/testgen/ExploreAllChoicesRunner.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/ExploreAllChoicesRunner.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/ExploreAllChoicesRunner.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/FieldGetMethod.java b/springloaded/src/test/java/org/springsource/loaded/testgen/FieldGetMethod.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/FieldGetMethod.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/FieldGetMethod.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/GeneratedTest.java b/springloaded/src/test/java/org/springsource/loaded/testgen/GeneratedTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/GeneratedTest.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/GeneratedTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/GenerativeSpringLoadedTest.java b/springloaded/src/test/java/org/springsource/loaded/testgen/GenerativeSpringLoadedTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/GenerativeSpringLoadedTest.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/GenerativeSpringLoadedTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/GenerativeTest.java b/springloaded/src/test/java/org/springsource/loaded/testgen/GenerativeTest.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/GenerativeTest.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/GenerativeTest.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/IChoiceGenerator.java b/springloaded/src/test/java/org/springsource/loaded/testgen/IChoiceGenerator.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/IChoiceGenerator.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/IChoiceGenerator.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/IClassProvider.java b/springloaded/src/test/java/org/springsource/loaded/testgen/IClassProvider.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/IClassProvider.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/IClassProvider.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/InvokerGenerator.java b/springloaded/src/test/java/org/springsource/loaded/testgen/InvokerGenerator.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/InvokerGenerator.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/InvokerGenerator.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/JustJavaClassProvider.java b/springloaded/src/test/java/org/springsource/loaded/testgen/JustJavaClassProvider.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/JustJavaClassProvider.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/JustJavaClassProvider.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/PredictResult.java b/springloaded/src/test/java/org/springsource/loaded/testgen/PredictResult.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/PredictResult.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/PredictResult.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/RejectedChoice.java b/springloaded/src/test/java/org/springsource/loaded/testgen/RejectedChoice.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/RejectedChoice.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/RejectedChoice.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/SignatureFinder.java b/springloaded/src/test/java/org/springsource/loaded/testgen/SignatureFinder.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/SignatureFinder.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/SignatureFinder.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/SpringLoadedClassProvider.java b/springloaded/src/test/java/org/springsource/loaded/testgen/SpringLoadedClassProvider.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/SpringLoadedClassProvider.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/SpringLoadedClassProvider.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/SystematicChoiceGenerator.java b/springloaded/src/test/java/org/springsource/loaded/testgen/SystematicChoiceGenerator.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/SystematicChoiceGenerator.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/SystematicChoiceGenerator.java
diff --git a/springloaded-core/src/test/java/org/springsource/loaded/testgen/ToStringComparator.java b/springloaded/src/test/java/org/springsource/loaded/testgen/ToStringComparator.java
similarity index 100%
rename from springloaded-core/src/test/java/org/springsource/loaded/testgen/ToStringComparator.java
rename to springloaded/src/test/java/org/springsource/loaded/testgen/ToStringComparator.java
diff --git a/testdata-plugin/build.gradle b/testdata-plugin/build.gradle
index db9a0fa..243fdfa 100644
--- a/testdata-plugin/build.gradle
+++ b/testdata-plugin/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-	compile project(":springloaded-core")
+	compile project(":springloaded")
 }
 
 sourceSets {